From f4e59ee82c5947496d1810d53483c5a0afd57fe8 Mon Sep 17 00:00:00 2001 From: stupidon Date: Sat, 5 Mar 2016 13:58:52 +0100 Subject: - added more details in the listServers, listImages, listFlavors functions - updated all functions to provide basic error-handling - defined updateServer and deleteServer --- server/core/Compute.php | 111 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 93 insertions(+), 18 deletions(-) (limited to 'server/core/Compute.php') diff --git a/server/core/Compute.php b/server/core/Compute.php index a5b8375..4a50f4a 100644 --- a/server/core/Compute.php +++ b/server/core/Compute.php @@ -12,11 +12,11 @@ class compute protected $libClass; - public function __construct($app) - { - $this->app = $app; - $this->libClass = $app->getLibClass("Compute"); - } + public function __construct($app) + { + $this->app = $app; + $this->libClass = $app->getLibClass("Compute"); + } /** * Execute an action * @@ -41,13 +41,26 @@ class compute $servers[$server->id] = Array(); $server->flavor->retrieve(); $server->image->retrieve(); + $server->retrieve(); $servers[$server->id]["id"] = $server->id; $servers[$server->id]["name"] = $server->name; - $servers[$server->id]["imageId"] = $server->image->id; - $servers[$server->id]["flavorId"] = $server->flavor->id; - $servers[$server->id]["status"] = $server->status; + $servers[$server->id]["image"] = $server->image; $servers[$server->id]["ram"] = $server->flavor->ram; $servers[$server->id]["disk"] = $server->flavor->disk; + $servers[$server->id]["flavor"] = $server->flavor; + $servers[$server->id]["status"] = $server->status; + $servers[$server->id]["created"] = $server->created; + $servers[$server->id]["updated"] = $server->updated; + $servers[$server->id]["ipv4"] = $server->ipv4; + $servers[$server->id]["ipv6"] = $server->ipv6; + $servers[$server->id]["progress"] = $server->progress; + $servers[$server->id]["hostId"] = $server->hostId; + $servers[$server->id]["tenantId"] = $server->tenantId; + $servers[$server->id]["userId"] = $server->userId; + $servers[$server->id]["taskState"] = $server->taskState; + $servers[$server->id]["addresses"] = $server->addresses; + $servers[$server->id]["links"] = $server->links; + $servers[$server->id]["metadata"] = $server->metadata; } $this->app->setOutput("Servers", $servers); return; @@ -62,8 +75,13 @@ class compute $flavors = Array(); foreach($flavorList as $flavor){ $flavors[$flavor->id] = Array(); + $flavor->retrieve(); $flavors[$flavor->id]["id"] = $flavor->id; $flavors[$flavor->id]["name"] = $flavor->name; + $flavors[$flavor->id]["ram"] = $flavor->ram; + $flavors[$flavor->id]["disk"] = $flavor->disk; + $flavors[$flavor->id]["vcpus"] = $flavor->vcpus; + $flavors[$flavor->id]["links"] = $flavor->links; } $this->app->setOutput("Flavors", $flavors); return; @@ -78,8 +96,17 @@ class compute $images = Array(); foreach($imageList as $image){ $images[$image->id] = Array(); + $image->retrieve(); $images[$image->id]["id"] = $image->id; $images[$image->id]["name"] = $image->name; + $images[$image->id]["status"] = $image->status; + $images[$image->id]["created"] = $image->created; + $images[$image->id]["updated"] = $image->updated; + $images[$image->id]["minDisk"] = $image->minDisk; + $images[$image->id]["minRam"] = $image->minRam; + $images[$image->id]["progress"] = $image->progress; + $images[$image->id]["links"] = $image->links; + $images[$image->id]["metadata"] = $image->metadata; } $this->app->setOutput("Images", $images); return; @@ -87,11 +114,18 @@ class compute /** * Create server. * @return array - * + */ public function createServer() { - - $server = $this->libClass->createServer(); + $name = $this->app->getPostParam("name"); + $imageId = $this->app->getPostParam("imageId"); + $flavorId = $this->app->getPostParam("flavorId"); + if(!isset($name) || !isset($imageId) || !isset($flavorId)){ + $this->app->setOutput("Error", "No, we don't let you create a server without a name OR image ID OR flavor ID."); + return; + } + $opt = array('name' => $name, 'imageId' => $imageId, 'flavorId' => $flavorId); + $server = $this->libClass->createServer($opt); } */ /** @@ -101,6 +135,10 @@ class compute public function getServer() { $serverId = $this->app->getPostParam("serverId"); + if(!isset($serverId)){ + $this->app->setOutput("Error", "Server ID is missing, son!"); + return; + } $opt = array('id' => $serverId); $server = $this->libClass->getServer($opt); $server->retrieve(); @@ -114,6 +152,10 @@ class compute public function getFlavor() { $flavorId = $this->app->getPostParam("flavorId"); + if(!isset($serverId)){ + $this->app->setOutput("Error", "Flavor ID is missing, son!"); + return; + } $opt = array('id' => $flavorId); $flavor = $this->libClass->getFlavor($opt); $flavor->retrieve(); @@ -127,23 +169,56 @@ class compute public function getImage() { $imageId = $this->app->getPostParam("imageId"); + if(!isset($serverId)){ + $this->app->setOutput("Error", "Image ID is missing, son!"); + return; + } $opt = array('id' => $imageId); $image = $this->libClass->getImage($opt); $image->retrieve(); $this->app->setOutput("MyImage", $image); return; } - /* working on tests - - public function update() + public function updateServer() { - $image = $this->app->getServer(array $options = []); - + $serverId = $this->app->getPostParam("serverId"); + $newName = $this->app->getPostParam("newName"); + $newIpv4 = $this->app->getPostParam("newIpv4"); + $newIpv6 = $this->app->getPostParam("newIpv6"); + if(!isset($serverId)|| !(isset($newName) || isset($newIpv4) || isset($newIpv6)) ){ + $this->app->setOutput("Error", "You'll have to provide server ID and the new attribute(IP(v4/v6)/Name) you desire to update!"); + return; + } + $opt = array('id' => $serverId); + $server = $this->libClass->getServer($opt); + if (isset($newName)){ + if(isset($newIpv4)){ + if(isset($newIpv6){ + $attr = array('name' => $newName, 'accessIPv4' => $newIPv4, 'accessIPv6' => $newIpv6); + } + $attr = array('name' => $newName, 'accessIPv4' => $newIPv4); + } + $attr = array('name' => $newName); + } + $server->update($attr); + $this->app->setOutput("Success", $serverId." has been updated successfully."); + return; } - public function delete() + */ + public function deleteServer() { - //TODO + $serverId = $this->app->getPostParam("serverId"); + if(!isset($serverId)){ + $this->app->setOutput("Error", "Server ID is missing, son!"); + return; + } + $opt = array('id' => $serverId); + $server = $this->libClass->getServer($opt); + $server->delete(); + $this->app->setOutput("Success", $serverId." has been deleted successfully."); + return; } + /* public function changePassword($newPassword) { //TODO -- cgit v1.2.3 From c43e532f766c3f97a34e6fad3dd990f7992e710b Mon Sep 17 00:00:00 2001 From: stupidon Date: Sat, 5 Mar 2016 14:05:52 +0100 Subject: added createServer and corrected certain minor bugs --- server/core/Compute.php | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) (limited to 'server/core/Compute.php') diff --git a/server/core/Compute.php b/server/core/Compute.php index 4a50f4a..8524c86 100644 --- a/server/core/Compute.php +++ b/server/core/Compute.php @@ -111,24 +111,7 @@ class compute $this->app->setOutput("Images", $images); return; } - /** - * Create server. - * @return array - */ - public function createServer() - { - $name = $this->app->getPostParam("name"); - $imageId = $this->app->getPostParam("imageId"); - $flavorId = $this->app->getPostParam("flavorId"); - if(!isset($name) || !isset($imageId) || !isset($flavorId)){ - $this->app->setOutput("Error", "No, we don't let you create a server without a name OR image ID OR flavor ID."); - return; - } - $opt = array('name' => $name, 'imageId' => $imageId, 'flavorId' => $flavorId); - $server = $this->libClass->createServer($opt); - } - */ - /** + /** * Get server details. * @return array */ @@ -179,6 +162,27 @@ class compute $this->app->setOutput("MyImage", $image); return; } + /** + * Create server. + * @return array + */ + public function createServer() + { + $name = $this->app->getPostParam("name"); + $imageId = $this->app->getPostParam("imageId"); + $flavorId = $this->app->getPostParam("flavorId"); + if(!isset($name) || !isset($imageId) || !isset($flavorId)){ + $this->app->setOutput("Error", "No, we don't let you create a server without a name OR image ID OR flavor ID."); + return; + } + $opt = array('name' => $name, 'imageId' => $imageId, 'flavorId' => $flavorId); + $server = $this->libClass->createServer($opt); + } + + /** + * update a server + * @return void + */ public function updateServer() { $serverId = $this->app->getPostParam("serverId"); @@ -204,6 +208,9 @@ class compute $this->app->setOutput("Success", $serverId." has been updated successfully."); return; } + /** + * Delete a server + * @return void */ public function deleteServer() { -- cgit v1.2.3 From dad2e1de334b6c8d9e579a0f75272d8661ed2aa3 Mon Sep 17 00:00:00 2001 From: stupidon Date: Sat, 5 Mar 2016 14:12:27 +0100 Subject: corrected syntax errors --- server/core/Compute.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'server/core/Compute.php') diff --git a/server/core/Compute.php b/server/core/Compute.php index 8524c86..d134b94 100644 --- a/server/core/Compute.php +++ b/server/core/Compute.php @@ -200,9 +200,9 @@ class compute if(isset($newIpv6){ $attr = array('name' => $newName, 'accessIPv4' => $newIPv4, 'accessIPv6' => $newIpv6); } - $attr = array('name' => $newName, 'accessIPv4' => $newIPv4); + else $attr = array('name' => $newName, 'accessIPv4' => $newIPv4); } - $attr = array('name' => $newName); + else $attr = array('name' => $newName); } $server->update($attr); $this->app->setOutput("Success", $serverId." has been updated successfully."); -- cgit v1.2.3 From eb37fe6b4868b280a8173c57500e1cfd3f77c7e7 Mon Sep 17 00:00:00 2001 From: stupidon Date: Sun, 6 Mar 2016 13:50:17 +0100 Subject: syntax correction --- server/core/Compute.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server/core/Compute.php') diff --git a/server/core/Compute.php b/server/core/Compute.php index d134b94..f02eb8b 100644 --- a/server/core/Compute.php +++ b/server/core/Compute.php @@ -197,7 +197,7 @@ class compute $server = $this->libClass->getServer($opt); if (isset($newName)){ if(isset($newIpv4)){ - if(isset($newIpv6){ + if(isset($newIpv6)){ $attr = array('name' => $newName, 'accessIPv4' => $newIPv4, 'accessIPv6' => $newIpv6); } else $attr = array('name' => $newName, 'accessIPv4' => $newIPv4); -- cgit v1.2.3 From 3da0e2d81c544a85cb940eef8c39f82cecbf8155 Mon Sep 17 00:00:00 2001 From: stupidon Date: Tue, 15 Mar 2016 22:04:03 +0100 Subject: opencloud changes --- server/core/Compute.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'server/core/Compute.php') diff --git a/server/core/Compute.php b/server/core/Compute.php index f02eb8b..64a88aa 100644 --- a/server/core/Compute.php +++ b/server/core/Compute.php @@ -1,7 +1,6 @@ Date: Tue, 15 Mar 2016 22:39:05 +0100 Subject: defined rest of the server functions --- server/core/Compute.php | 106 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 95 insertions(+), 11 deletions(-) (limited to 'server/core/Compute.php') diff --git a/server/core/Compute.php b/server/core/Compute.php index 64a88aa..37fc8ad 100644 --- a/server/core/Compute.php +++ b/server/core/Compute.php @@ -224,31 +224,115 @@ class compute $this->app->setOutput("Success", $serverId." has been deleted successfully."); return; } - /* - public function changePassword($newPassword) + /** + * Change the password of a server + * @return void + */ + public function changePassword() { - //TODO + $serverId = $this->app->getPostParam("serverId"); + $password = $this->app->getPostParam("newPassword"); + if(!isset($serverId) || !isset($password)){ + $this->app->setOutput("Error", "Server ID or new password missing."); + return; + } + $opt = array('id' => $serverId); + $server = $this->libClass->getServer($opt); + $server->changePassword($password); + $this->app->setOutput("Success", "Password for ".$serverId." has been updated successfully."); + return; } - public function reboot($type = Enum::REBOOT_SOFT) + /** + * Reboot a server + * @return void + */ + public function reboot() { - //TODO + $serverId = $this->app->getPostParam("serverId"); + if(!isset($serverId)){ + $this->app->setOutput("Error", "Server ID is missing, son!"); + return; + } + $opt = array('id' => $serverId); + $server = $this->libClass->getServer($opt); + $server->reboot(); + $this->app->setOutput("Success", $serverId." has been deleted successfully."); + return; } - public function rebuild(array $options) + /** + * Rebuild a server + * @return void + */ + public function rebuild() { - //TODO + $serverId = $this->app->getPostParam("serverId"); + $imageId = $this->app->getPostParam("imageId"); + $newName = $this->app->getPostParam("newName"); + $adminPass = $this->app->getPostParam("adminPass"); + if(!isset($serverId)|| !isset($imageId) || isset($newName) || isset($adminPass)) ){ + $this->app->setOutput("Error", "You'll have to provide server ID and the new image, name and admin password!"); + return; + } + $opt = array('id' => $serverId); + $server = $this->libClass->getServer($opt); + $attr = array('imageId' => $imageId, 'name' => $newName, 'adminPass' => $adminPass); + $server->rebuild($attr); + $this->app->setOutput("Success", $serverId." has been rebuilt successfully with the new image."); + return; } - public function resize($flavorId) + /** + * Resize a server + * A call to this method has to be followed by either confirmResize or revertResize + * @return void + */ + public function resize() { - //TODO + $serverId = $this->app->getPostParam("serverId"); + $newFlavorId = $this->app->getPostParam("newFlavorId"); + if(!isset($serverId)|| !isset($flavorId)){ + $this->app->setOutput("Error", "You'll have to provide server ID and the new flavor ID!"); + return; + } + $opt = array('id' => $serverId); + $server = $this->libClass->getServer($opt); + $server->resize($newFlavorId); + return; } + /** + * Confirm resize operation on a server + * @return void + */ public function confirmResize() { - //TODO + $serverId = $this->app->getPostParam("serverId"); + if(!isset($serverId)){ + $this->app->setOutput("Error", "Server ID is missing!"); + return; + } + $opt = array('id' => $serverId); + $server = $this->libClass->getServer($opt); + $server->confirmResize(); + $this->app->setOutput("Success", $serverId." has been resized successfully as the new flavor."); + return; } + /** + * Revert resize operation on a server + * @return void + */ public function revertResize() { - //TODO + $serverId = $this->app->getPostParam("serverId"); + if(!isset($serverId)){ + $this->app->setOutput("Error", "Server ID is missing!"); + return; + } + $opt = array('id' => $serverId); + $server = $this->libClass->getServer($opt); + $server->revertResize(); + $this->app->setOutput("Success", $serverId." : resize operation has been reverted to the old flavor."); + return; } + /* public function createImage(array $options) { //TODO -- cgit v1.2.3 From 11dc33c440f97410a2358f7e615d2adc5e69f072 Mon Sep 17 00:00:00 2001 From: EoleDev Date: Tue, 15 Mar 2016 23:45:19 +0100 Subject: Error / Conflict Correction --- server/core/Compute.php | 2 +- server/core/Image.php | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) mode change 100644 => 100755 server/core/Compute.php mode change 100644 => 100755 server/core/Image.php (limited to 'server/core/Compute.php') diff --git a/server/core/Compute.php b/server/core/Compute.php old mode 100644 new mode 100755 index 37fc8ad..b658580 --- a/server/core/Compute.php +++ b/server/core/Compute.php @@ -269,7 +269,7 @@ class compute $imageId = $this->app->getPostParam("imageId"); $newName = $this->app->getPostParam("newName"); $adminPass = $this->app->getPostParam("adminPass"); - if(!isset($serverId)|| !isset($imageId) || isset($newName) || isset($adminPass)) ){ + if(!isset($serverId)|| !isset($imageId) || isset($newName) || isset($adminPass)) { $this->app->setOutput("Error", "You'll have to provide server ID and the new image, name and admin password!"); return; } diff --git a/server/core/Image.php b/server/core/Image.php old mode 100644 new mode 100755 index f2af5cc..d37c828 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -70,12 +70,7 @@ class image implements Core{ * options for the image creation * **/ -<<<<<<< HEAD - private function createImage(array $opt){ - -======= private function createImage(){ ->>>>>>> develop $opt = $this->app->getPostParam("opt"); @@ -408,15 +403,9 @@ class image implements Core{ * @param string $id * identifier of the image **/ -<<<<<<< HEAD - private function downloadImage($id){ -<<<<<<< HEAD -======= -======= private function downloadImage(){ ->>>>>>> develop $id = $this->app->getPostParam("id"); ->>>>>>> develop + if(!isset($id)){ $this->app->setOutput("Error", "Incorrect parameter"); } -- cgit v1.2.3 From 3372268aa1fc8ecca9e9a82e50ca59c6865c015d Mon Sep 17 00:00:00 2001 From: stupidon Date: Tue, 22 Mar 2016 16:55:59 +0100 Subject: completed error management and all functions of Compute module --- server/core/Compute.php | 314 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 285 insertions(+), 29 deletions(-) (limited to 'server/core/Compute.php') diff --git a/server/core/Compute.php b/server/core/Compute.php index 37fc8ad..370f5a0 100644 --- a/server/core/Compute.php +++ b/server/core/Compute.php @@ -34,6 +34,7 @@ class compute */ public function listServers() { + try{ $serverList = $this->libClass->listServers(true); $servers = Array(); foreach($serverList as $server){ @@ -62,6 +63,22 @@ class compute $servers[$server->id]["metadata"] = $server->metadata; } $this->app->setOutput("Servers", $servers); + } + catch(BadResponseError $e){ + $this->app->getErrorInstance()->BadResponseHandler($e); + } + catch(UserInputError $e){ + $this->app->getErrorInstance()->UserInputHandler($e); + } + catch(BaseError $e){ + $this->app->getErrorInstance()->BaseErrorHandler($e); + } + catch(NotImplementedError $e){ + $this->app->getErrorInstance()->NotImplementedHandler($e); + } + catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } return; } /** @@ -70,6 +87,7 @@ class compute */ public function listFlavors() { + try{ $flavorList = $this->libClass->listFlavors(); $flavors = Array(); foreach($flavorList as $flavor){ @@ -83,6 +101,22 @@ class compute $flavors[$flavor->id]["links"] = $flavor->links; } $this->app->setOutput("Flavors", $flavors); + } + catch(BadResponseError $e){ + $this->app->getErrorInstance()->BadResponseHandler($e); + } + catch(UserInputError $e){ + $this->app->getErrorInstance()->UserInputHandler($e); + } + catch(BaseError $e){ + $this->app->getErrorInstance()->BaseErrorHandler($e); + } + catch(NotImplementedError $e){ + $this->app->getErrorInstance()->NotImplementedHandler($e); + } + catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } return; } /** @@ -91,7 +125,8 @@ class compute */ public function listImages() { - $imageList = $this->libClass->listImages(); + try{ + $imageList = $this->libClass->listImages(); $images = Array(); foreach($imageList as $image){ $images[$image->id] = Array(); @@ -108,6 +143,22 @@ class compute $images[$image->id]["metadata"] = $image->metadata; } $this->app->setOutput("Images", $images); + } + catch(BadResponseError $e){ + $this->app->getErrorInstance()->BadResponseHandler($e); + } + catch(UserInputError $e){ + $this->app->getErrorInstance()->UserInputHandler($e); + } + catch(BaseError $e){ + $this->app->getErrorInstance()->BaseErrorHandler($e); + } + catch(NotImplementedError $e){ + $this->app->getErrorInstance()->NotImplementedHandler($e); + } + catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } return; } /** @@ -116,7 +167,8 @@ class compute */ public function getServer() { - $serverId = $this->app->getPostParam("serverId"); + try{ + $serverId = $this->app->getPostParam("serverId"); if(!isset($serverId)){ $this->app->setOutput("Error", "Server ID is missing, son!"); return; @@ -125,6 +177,22 @@ class compute $server = $this->libClass->getServer($opt); $server->retrieve(); $this->app->setOutput("MyServer", $server); + } + catch(BadResponseError $e){ + $this->app->getErrorInstance()->BadResponseHandler($e); + } + catch(UserInputError $e){ + $this->app->getErrorInstance()->UserInputHandler($e); + } + catch(BaseError $e){ + $this->app->getErrorInstance()->BaseErrorHandler($e); + } + catch(NotImplementedError $e){ + $this->app->getErrorInstance()->NotImplementedHandler($e); + } + catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } return; } /** @@ -133,6 +201,7 @@ class compute */ public function getFlavor() { + try{ $flavorId = $this->app->getPostParam("flavorId"); if(!isset($serverId)){ $this->app->setOutput("Error", "Flavor ID is missing, son!"); @@ -142,6 +211,22 @@ class compute $flavor = $this->libClass->getFlavor($opt); $flavor->retrieve(); $this->app->setOutput("MyFlavor", $flavor); + } + catch(BadResponseError $e){ + $this->app->getErrorInstance()->BadResponseHandler($e); + } + catch(UserInputError $e){ + $this->app->getErrorInstance()->UserInputHandler($e); + } + catch(BaseError $e){ + $this->app->getErrorInstance()->BaseErrorHandler($e); + } + catch(NotImplementedError $e){ + $this->app->getErrorInstance()->NotImplementedHandler($e); + } + catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } return; } /** @@ -150,6 +235,7 @@ class compute */ public function getImage() { + try{ $imageId = $this->app->getPostParam("imageId"); if(!isset($serverId)){ $this->app->setOutput("Error", "Image ID is missing, son!"); @@ -159,6 +245,22 @@ class compute $image = $this->libClass->getImage($opt); $image->retrieve(); $this->app->setOutput("MyImage", $image); + } + catch(BadResponseError $e){ + $this->app->getErrorInstance()->BadResponseHandler($e); + } + catch(UserInputError $e){ + $this->app->getErrorInstance()->UserInputHandler($e); + } + catch(BaseError $e){ + $this->app->getErrorInstance()->BaseErrorHandler($e); + } + catch(NotImplementedError $e){ + $this->app->getErrorInstance()->NotImplementedHandler($e); + } + catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } return; } /** @@ -167,6 +269,7 @@ class compute */ public function createServer() { + try{ $name = $this->app->getPostParam("name"); $imageId = $this->app->getPostParam("imageId"); $flavorId = $this->app->getPostParam("flavorId"); @@ -176,6 +279,23 @@ class compute } $opt = array('name' => $name, 'imageId' => $imageId, 'flavorId' => $flavorId); $server = $this->libClass->createServer($opt); + } + catch(BadResponseError $e){ + $this->app->getErrorInstance()->BadResponseHandler($e); + } + catch(UserInputError $e){ + $this->app->getErrorInstance()->UserInputHandler($e); + } + catch(BaseError $e){ + $this->app->getErrorInstance()->BaseErrorHandler($e); + } + catch(NotImplementedError $e){ + $this->app->getErrorInstance()->NotImplementedHandler($e); + } + catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } + return; } /** @@ -184,6 +304,7 @@ class compute */ public function updateServer() { + try{ $serverId = $this->app->getPostParam("serverId"); $newName = $this->app->getPostParam("newName"); $newIpv4 = $this->app->getPostParam("newIpv4"); @@ -205,6 +326,22 @@ class compute } $server->update($attr); $this->app->setOutput("Success", $serverId." has been updated successfully."); + } + catch(BadResponseError $e){ + $this->app->getErrorInstance()->BadResponseHandler($e); + } + catch(UserInputError $e){ + $this->app->getErrorInstance()->UserInputHandler($e); + } + catch(BaseError $e){ + $this->app->getErrorInstance()->BaseErrorHandler($e); + } + catch(NotImplementedError $e){ + $this->app->getErrorInstance()->NotImplementedHandler($e); + } + catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } return; } /** @@ -213,6 +350,7 @@ class compute */ public function deleteServer() { + try{ $serverId = $this->app->getPostParam("serverId"); if(!isset($serverId)){ $this->app->setOutput("Error", "Server ID is missing, son!"); @@ -222,6 +360,22 @@ class compute $server = $this->libClass->getServer($opt); $server->delete(); $this->app->setOutput("Success", $serverId." has been deleted successfully."); + } + catch(BadResponseError $e){ + $this->app->getErrorInstance()->BadResponseHandler($e); + } + catch(UserInputError $e){ + $this->app->getErrorInstance()->UserInputHandler($e); + } + catch(BaseError $e){ + $this->app->getErrorInstance()->BaseErrorHandler($e); + } + catch(NotImplementedError $e){ + $this->app->getErrorInstance()->NotImplementedHandler($e); + } + catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } return; } /** @@ -230,6 +384,7 @@ class compute */ public function changePassword() { + try{ $serverId = $this->app->getPostParam("serverId"); $password = $this->app->getPostParam("newPassword"); if(!isset($serverId) || !isset($password)){ @@ -240,6 +395,22 @@ class compute $server = $this->libClass->getServer($opt); $server->changePassword($password); $this->app->setOutput("Success", "Password for ".$serverId." has been updated successfully."); + } + catch(BadResponseError $e){ + $this->app->getErrorInstance()->BadResponseHandler($e); + } + catch(UserInputError $e){ + $this->app->getErrorInstance()->UserInputHandler($e); + } + catch(BaseError $e){ + $this->app->getErrorInstance()->BaseErrorHandler($e); + } + catch(NotImplementedError $e){ + $this->app->getErrorInstance()->NotImplementedHandler($e); + } + catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } return; } /** @@ -248,6 +419,7 @@ class compute */ public function reboot() { + try{ $serverId = $this->app->getPostParam("serverId"); if(!isset($serverId)){ $this->app->setOutput("Error", "Server ID is missing, son!"); @@ -257,6 +429,22 @@ class compute $server = $this->libClass->getServer($opt); $server->reboot(); $this->app->setOutput("Success", $serverId." has been deleted successfully."); + } + catch(BadResponseError $e){ + $this->app->getErrorInstance()->BadResponseHandler($e); + } + catch(UserInputError $e){ + $this->app->getErrorInstance()->UserInputHandler($e); + } + catch(BaseError $e){ + $this->app->getErrorInstance()->BaseErrorHandler($e); + } + catch(NotImplementedError $e){ + $this->app->getErrorInstance()->NotImplementedHandler($e); + } + catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } return; } /** @@ -265,6 +453,7 @@ class compute */ public function rebuild() { + try{ $serverId = $this->app->getPostParam("serverId"); $imageId = $this->app->getPostParam("imageId"); $newName = $this->app->getPostParam("newName"); @@ -278,6 +467,22 @@ class compute $attr = array('imageId' => $imageId, 'name' => $newName, 'adminPass' => $adminPass); $server->rebuild($attr); $this->app->setOutput("Success", $serverId." has been rebuilt successfully with the new image."); + } + catch(BadResponseError $e){ + $this->app->getErrorInstance()->BadResponseHandler($e); + } + catch(UserInputError $e){ + $this->app->getErrorInstance()->UserInputHandler($e); + } + catch(BaseError $e){ + $this->app->getErrorInstance()->BaseErrorHandler($e); + } + catch(NotImplementedError $e){ + $this->app->getErrorInstance()->NotImplementedHandler($e); + } + catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } return; } /** @@ -287,6 +492,7 @@ class compute */ public function resize() { + try{ $serverId = $this->app->getPostParam("serverId"); $newFlavorId = $this->app->getPostParam("newFlavorId"); if(!isset($serverId)|| !isset($flavorId)){ @@ -296,6 +502,22 @@ class compute $opt = array('id' => $serverId); $server = $this->libClass->getServer($opt); $server->resize($newFlavorId); + } + catch(BadResponseError $e){ + $this->app->getErrorInstance()->BadResponseHandler($e); + } + catch(UserInputError $e){ + $this->app->getErrorInstance()->UserInputHandler($e); + } + catch(BaseError $e){ + $this->app->getErrorInstance()->BaseErrorHandler($e); + } + catch(NotImplementedError $e){ + $this->app->getErrorInstance()->NotImplementedHandler($e); + } + catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } return; } /** @@ -304,6 +526,7 @@ class compute */ public function confirmResize() { + try{ $serverId = $this->app->getPostParam("serverId"); if(!isset($serverId)){ $this->app->setOutput("Error", "Server ID is missing!"); @@ -313,6 +536,22 @@ class compute $server = $this->libClass->getServer($opt); $server->confirmResize(); $this->app->setOutput("Success", $serverId." has been resized successfully as the new flavor."); + } + catch(BadResponseError $e){ + $this->app->getErrorInstance()->BadResponseHandler($e); + } + catch(UserInputError $e){ + $this->app->getErrorInstance()->UserInputHandler($e); + } + catch(BaseError $e){ + $this->app->getErrorInstance()->BaseErrorHandler($e); + } + catch(NotImplementedError $e){ + $this->app->getErrorInstance()->NotImplementedHandler($e); + } + catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } return; } /** @@ -321,6 +560,7 @@ class compute */ public function revertResize() { + try{ $serverId = $this->app->getPostParam("serverId"); if(!isset($serverId)){ $this->app->setOutput("Error", "Server ID is missing!"); @@ -330,37 +570,53 @@ class compute $server = $this->libClass->getServer($opt); $server->revertResize(); $this->app->setOutput("Success", $serverId." : resize operation has been reverted to the old flavor."); + } + catch(BadResponseError $e){ + $this->app->getErrorInstance()->BadResponseHandler($e); + } + catch(UserInputError $e){ + $this->app->getErrorInstance()->UserInputHandler($e); + } + catch(BaseError $e){ + $this->app->getErrorInstance()->BaseErrorHandler($e); + } + catch(NotImplementedError $e){ + $this->app->getErrorInstance()->NotImplementedHandler($e); + } + catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } return; } - /* - public function createImage(array $options) - { - //TODO - } public function listAddresses(array $options = []) { - //TODO - } - public function getMetadata() - { - //TODO - } - public function resetMetadata(array $metadata) - { - //TODO - } - public function mergeMetadata(array $metadata) - { - //TODO - } - public function getMetadataItem($key) - { - //TODO - } - public function deleteMetadataItem($key) - { - //TODO + try{ + $serverId = $this->app->getPostParam("serverId"); + if(!isset($serverId)){ + $this->app->setOutput("Error", "Server ID is missing!"); + return; + } + $opt = array('id' => $serverId); + $server = $this->libClass->getServer($opt); + $addresses = $server->listAddresses(); + $this->app->setOutput("Addresses", $addresses); + } + catch(BadResponseError $e){ + $this->app->getErrorInstance()->BadResponseHandler($e); + } + catch(UserInputError $e){ + $this->app->getErrorInstance()->UserInputHandler($e); + } + catch(BaseError $e){ + $this->app->getErrorInstance()->BaseErrorHandler($e); + } + catch(NotImplementedError $e){ + $this->app->getErrorInstance()->NotImplementedHandler($e); + } + catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } + return; } -*/ } -- cgit v1.2.3 From 7a61955d8566ec14fbabcfa5b3eab13d3631352f Mon Sep 17 00:00:00 2001 From: stupidon Date: Tue, 22 Mar 2016 17:05:39 +0100 Subject: indentation and comments --- server/core/Compute.php | 411 ++++++++++++++++++++++++------------------------ 1 file changed, 208 insertions(+), 203 deletions(-) (limited to 'server/core/Compute.php') diff --git a/server/core/Compute.php b/server/core/Compute.php index 370f5a0..4d94705 100644 --- a/server/core/Compute.php +++ b/server/core/Compute.php @@ -35,34 +35,34 @@ class compute public function listServers() { try{ - $serverList = $this->libClass->listServers(true); - $servers = Array(); - foreach($serverList as $server){ - $servers[$server->id] = Array(); - $server->flavor->retrieve(); - $server->image->retrieve(); - $server->retrieve(); - $servers[$server->id]["id"] = $server->id; - $servers[$server->id]["name"] = $server->name; - $servers[$server->id]["image"] = $server->image; - $servers[$server->id]["ram"] = $server->flavor->ram; - $servers[$server->id]["disk"] = $server->flavor->disk; - $servers[$server->id]["flavor"] = $server->flavor; - $servers[$server->id]["status"] = $server->status; - $servers[$server->id]["created"] = $server->created; - $servers[$server->id]["updated"] = $server->updated; - $servers[$server->id]["ipv4"] = $server->ipv4; - $servers[$server->id]["ipv6"] = $server->ipv6; - $servers[$server->id]["progress"] = $server->progress; - $servers[$server->id]["hostId"] = $server->hostId; - $servers[$server->id]["tenantId"] = $server->tenantId; - $servers[$server->id]["userId"] = $server->userId; - $servers[$server->id]["taskState"] = $server->taskState; - $servers[$server->id]["addresses"] = $server->addresses; - $servers[$server->id]["links"] = $server->links; - $servers[$server->id]["metadata"] = $server->metadata; - } - $this->app->setOutput("Servers", $servers); + $serverList = $this->libClass->listServers(true); + $servers = Array(); + foreach($serverList as $server){ + $servers[$server->id] = Array(); + $server->flavor->retrieve(); + $server->image->retrieve(); + $server->retrieve(); + $servers[$server->id]["id"] = $server->id; + $servers[$server->id]["name"] = $server->name; + $servers[$server->id]["image"] = $server->image; + $servers[$server->id]["ram"] = $server->flavor->ram; + $servers[$server->id]["disk"] = $server->flavor->disk; + $servers[$server->id]["flavor"] = $server->flavor; + $servers[$server->id]["status"] = $server->status; + $servers[$server->id]["created"] = $server->created; + $servers[$server->id]["updated"] = $server->updated; + $servers[$server->id]["ipv4"] = $server->ipv4; + $servers[$server->id]["ipv6"] = $server->ipv6; + $servers[$server->id]["progress"] = $server->progress; + $servers[$server->id]["hostId"] = $server->hostId; + $servers[$server->id]["tenantId"] = $server->tenantId; + $servers[$server->id]["userId"] = $server->userId; + $servers[$server->id]["taskState"] = $server->taskState; + $servers[$server->id]["addresses"] = $server->addresses; + $servers[$server->id]["links"] = $server->links; + $servers[$server->id]["metadata"] = $server->metadata; + } + $this->app->setOutput("Servers", $servers); } catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -77,7 +77,7 @@ class compute $this->app->getErrorInstance()->NotImplementedHandler($e); } catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); + $this->app->getErrorInstance()->OtherException($e); } return; } @@ -88,17 +88,17 @@ class compute public function listFlavors() { try{ - $flavorList = $this->libClass->listFlavors(); - $flavors = Array(); - foreach($flavorList as $flavor){ - $flavors[$flavor->id] = Array(); - $flavor->retrieve(); - $flavors[$flavor->id]["id"] = $flavor->id; - $flavors[$flavor->id]["name"] = $flavor->name; - $flavors[$flavor->id]["ram"] = $flavor->ram; - $flavors[$flavor->id]["disk"] = $flavor->disk; - $flavors[$flavor->id]["vcpus"] = $flavor->vcpus; - $flavors[$flavor->id]["links"] = $flavor->links; + $flavorList = $this->libClass->listFlavors(); + $flavors = Array(); + foreach($flavorList as $flavor){ + $flavors[$flavor->id] = Array(); + $flavor->retrieve(); + $flavors[$flavor->id]["id"] = $flavor->id; + $flavors[$flavor->id]["name"] = $flavor->name; + $flavors[$flavor->id]["ram"] = $flavor->ram; + $flavors[$flavor->id]["disk"] = $flavor->disk; + $flavors[$flavor->id]["vcpus"] = $flavor->vcpus; + $flavors[$flavor->id]["links"] = $flavor->links; } $this->app->setOutput("Flavors", $flavors); } @@ -115,7 +115,7 @@ class compute $this->app->getErrorInstance()->NotImplementedHandler($e); } catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); + $this->app->getErrorInstance()->OtherException($e); } return; } @@ -126,21 +126,21 @@ class compute public function listImages() { try{ - $imageList = $this->libClass->listImages(); - $images = Array(); - foreach($imageList as $image){ - $images[$image->id] = Array(); - $image->retrieve(); - $images[$image->id]["id"] = $image->id; - $images[$image->id]["name"] = $image->name; - $images[$image->id]["status"] = $image->status; - $images[$image->id]["created"] = $image->created; - $images[$image->id]["updated"] = $image->updated; - $images[$image->id]["minDisk"] = $image->minDisk; - $images[$image->id]["minRam"] = $image->minRam; - $images[$image->id]["progress"] = $image->progress; - $images[$image->id]["links"] = $image->links; - $images[$image->id]["metadata"] = $image->metadata; + $imageList = $this->libClass->listImages(); + $images = Array(); + foreach($imageList as $image){ + $images[$image->id] = Array(); + $image->retrieve(); + $images[$image->id]["id"] = $image->id; + $images[$image->id]["name"] = $image->name; + $images[$image->id]["status"] = $image->status; + $images[$image->id]["created"] = $image->created; + $images[$image->id]["updated"] = $image->updated; + $images[$image->id]["minDisk"] = $image->minDisk; + $images[$image->id]["minRam"] = $image->minRam; + $images[$image->id]["progress"] = $image->progress; + $images[$image->id]["links"] = $image->links; + $images[$image->id]["metadata"] = $image->metadata; } $this->app->setOutput("Images", $images); } @@ -157,7 +157,7 @@ class compute $this->app->getErrorInstance()->NotImplementedHandler($e); } catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); + $this->app->getErrorInstance()->OtherException($e); } return; } @@ -168,15 +168,15 @@ class compute public function getServer() { try{ - $serverId = $this->app->getPostParam("serverId"); - if(!isset($serverId)){ - $this->app->setOutput("Error", "Server ID is missing, son!"); - return; - } - $opt = array('id' => $serverId); - $server = $this->libClass->getServer($opt); - $server->retrieve(); - $this->app->setOutput("MyServer", $server); + $serverId = $this->app->getPostParam("serverId"); + if(!isset($serverId)){ + $this->app->setOutput("Error", "Server ID is missing, son!"); + return; + } + $opt = array('id' => $serverId); + $server = $this->libClass->getServer($opt); + $server->retrieve(); + $this->app->setOutput("MyServer", $server); } catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -191,7 +191,7 @@ class compute $this->app->getErrorInstance()->NotImplementedHandler($e); } catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); + $this->app->getErrorInstance()->OtherException($e); } return; } @@ -202,15 +202,15 @@ class compute public function getFlavor() { try{ - $flavorId = $this->app->getPostParam("flavorId"); - if(!isset($serverId)){ - $this->app->setOutput("Error", "Flavor ID is missing, son!"); - return; - } - $opt = array('id' => $flavorId); - $flavor = $this->libClass->getFlavor($opt); - $flavor->retrieve(); - $this->app->setOutput("MyFlavor", $flavor); + $flavorId = $this->app->getPostParam("flavorId"); + if(!isset($serverId)){ + $this->app->setOutput("Error", "Flavor ID is missing, son!"); + return; + } + $opt = array('id' => $flavorId); + $flavor = $this->libClass->getFlavor($opt); + $flavor->retrieve(); + $this->app->setOutput("MyFlavor", $flavor); } catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -225,7 +225,7 @@ class compute $this->app->getErrorInstance()->NotImplementedHandler($e); } catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); + $this->app->getErrorInstance()->OtherException($e); } return; } @@ -236,15 +236,15 @@ class compute public function getImage() { try{ - $imageId = $this->app->getPostParam("imageId"); - if(!isset($serverId)){ - $this->app->setOutput("Error", "Image ID is missing, son!"); - return; - } - $opt = array('id' => $imageId); - $image = $this->libClass->getImage($opt); - $image->retrieve(); - $this->app->setOutput("MyImage", $image); + $imageId = $this->app->getPostParam("imageId"); + if(!isset($serverId)){ + $this->app->setOutput("Error", "Image ID is missing, son!"); + return; + } + $opt = array('id' => $imageId); + $image = $this->libClass->getImage($opt); + $image->retrieve(); + $this->app->setOutput("MyImage", $image); } catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -259,7 +259,7 @@ class compute $this->app->getErrorInstance()->NotImplementedHandler($e); } catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); + $this->app->getErrorInstance()->OtherException($e); } return; } @@ -270,15 +270,15 @@ class compute public function createServer() { try{ - $name = $this->app->getPostParam("name"); - $imageId = $this->app->getPostParam("imageId"); - $flavorId = $this->app->getPostParam("flavorId"); - if(!isset($name) || !isset($imageId) || !isset($flavorId)){ - $this->app->setOutput("Error", "No, we don't let you create a server without a name OR image ID OR flavor ID."); - return; - } - $opt = array('name' => $name, 'imageId' => $imageId, 'flavorId' => $flavorId); - $server = $this->libClass->createServer($opt); + $name = $this->app->getPostParam("name"); + $imageId = $this->app->getPostParam("imageId"); + $flavorId = $this->app->getPostParam("flavorId"); + if(!isset($name) || !isset($imageId) || !isset($flavorId)){ + $this->app->setOutput("Error", "No, we don't let you create a server without a name OR image ID OR flavor ID."); + return; + } + $opt = array('name' => $name, 'imageId' => $imageId, 'flavorId' => $flavorId); + $server = $this->libClass->createServer($opt); } catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -293,7 +293,7 @@ class compute $this->app->getErrorInstance()->NotImplementedHandler($e); } catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); + $this->app->getErrorInstance()->OtherException($e); } return; } @@ -305,27 +305,27 @@ class compute public function updateServer() { try{ - $serverId = $this->app->getPostParam("serverId"); - $newName = $this->app->getPostParam("newName"); - $newIpv4 = $this->app->getPostParam("newIpv4"); - $newIpv6 = $this->app->getPostParam("newIpv6"); - if(!isset($serverId)|| !(isset($newName) || isset($newIpv4) || isset($newIpv6)) ){ - $this->app->setOutput("Error", "You'll have to provide server ID and the new attribute(IP(v4/v6)/Name) you desire to update!"); - return; - } - $opt = array('id' => $serverId); - $server = $this->libClass->getServer($opt); - if (isset($newName)){ - if(isset($newIpv4)){ - if(isset($newIpv6)){ - $attr = array('name' => $newName, 'accessIPv4' => $newIPv4, 'accessIPv6' => $newIpv6); - } - else $attr = array('name' => $newName, 'accessIPv4' => $newIPv4); + $serverId = $this->app->getPostParam("serverId"); + $newName = $this->app->getPostParam("newName"); + $newIpv4 = $this->app->getPostParam("newIpv4"); + $newIpv6 = $this->app->getPostParam("newIpv6"); + if(!isset($serverId)|| !(isset($newName) || isset($newIpv4) || isset($newIpv6)) ){ + $this->app->setOutput("Error", "You'll have to provide server ID and the new attribute(IP(v4/v6)/Name) you desire to update!"); + return; } - else $attr = array('name' => $newName); - } - $server->update($attr); - $this->app->setOutput("Success", $serverId." has been updated successfully."); + $opt = array('id' => $serverId); + $server = $this->libClass->getServer($opt); + if (isset($newName)){ + if(isset($newIpv4)){ + if(isset($newIpv6)){ + $attr = array('name' => $newName, 'accessIPv4' => $newIPv4, 'accessIPv6' => $newIpv6); + } + else $attr = array('name' => $newName, 'accessIPv4' => $newIPv4); + } + else $attr = array('name' => $newName); + } + $server->update($attr); + $this->app->setOutput("Success", $serverId." has been updated successfully."); } catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -340,7 +340,7 @@ class compute $this->app->getErrorInstance()->NotImplementedHandler($e); } catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); + $this->app->getErrorInstance()->OtherException($e); } return; } @@ -351,15 +351,15 @@ class compute public function deleteServer() { try{ - $serverId = $this->app->getPostParam("serverId"); - if(!isset($serverId)){ - $this->app->setOutput("Error", "Server ID is missing, son!"); - return; - } - $opt = array('id' => $serverId); - $server = $this->libClass->getServer($opt); - $server->delete(); - $this->app->setOutput("Success", $serverId." has been deleted successfully."); + $serverId = $this->app->getPostParam("serverId"); + if(!isset($serverId)){ + $this->app->setOutput("Error", "Server ID is missing, son!"); + return; + } + $opt = array('id' => $serverId); + $server = $this->libClass->getServer($opt); + $server->delete(); + $this->app->setOutput("Success", $serverId." has been deleted successfully."); } catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -374,7 +374,7 @@ class compute $this->app->getErrorInstance()->NotImplementedHandler($e); } catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); + $this->app->getErrorInstance()->OtherException($e); } return; } @@ -385,16 +385,16 @@ class compute public function changePassword() { try{ - $serverId = $this->app->getPostParam("serverId"); - $password = $this->app->getPostParam("newPassword"); - if(!isset($serverId) || !isset($password)){ - $this->app->setOutput("Error", "Server ID or new password missing."); - return; - } - $opt = array('id' => $serverId); - $server = $this->libClass->getServer($opt); - $server->changePassword($password); - $this->app->setOutput("Success", "Password for ".$serverId." has been updated successfully."); + $serverId = $this->app->getPostParam("serverId"); + $password = $this->app->getPostParam("newPassword"); + if(!isset($serverId) || !isset($password)){ + $this->app->setOutput("Error", "Server ID or new password missing."); + return; + } + $opt = array('id' => $serverId); + $server = $this->libClass->getServer($opt); + $server->changePassword($password); + $this->app->setOutput("Success", "Password for ".$serverId." has been updated successfully."); } catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -409,7 +409,7 @@ class compute $this->app->getErrorInstance()->NotImplementedHandler($e); } catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); + $this->app->getErrorInstance()->OtherException($e); } return; } @@ -420,15 +420,15 @@ class compute public function reboot() { try{ - $serverId = $this->app->getPostParam("serverId"); - if(!isset($serverId)){ - $this->app->setOutput("Error", "Server ID is missing, son!"); - return; - } - $opt = array('id' => $serverId); - $server = $this->libClass->getServer($opt); - $server->reboot(); - $this->app->setOutput("Success", $serverId." has been deleted successfully."); + $serverId = $this->app->getPostParam("serverId"); + if(!isset($serverId)){ + $this->app->setOutput("Error", "Server ID is missing, son!"); + return; + } + $opt = array('id' => $serverId); + $server = $this->libClass->getServer($opt); + $server->reboot(); + $this->app->setOutput("Success", $serverId." has been deleted successfully."); } catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -443,7 +443,7 @@ class compute $this->app->getErrorInstance()->NotImplementedHandler($e); } catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); + $this->app->getErrorInstance()->OtherException($e); } return; } @@ -454,19 +454,19 @@ class compute public function rebuild() { try{ - $serverId = $this->app->getPostParam("serverId"); - $imageId = $this->app->getPostParam("imageId"); - $newName = $this->app->getPostParam("newName"); - $adminPass = $this->app->getPostParam("adminPass"); - if(!isset($serverId)|| !isset($imageId) || isset($newName) || isset($adminPass)) ){ - $this->app->setOutput("Error", "You'll have to provide server ID and the new image, name and admin password!"); - return; - } - $opt = array('id' => $serverId); - $server = $this->libClass->getServer($opt); - $attr = array('imageId' => $imageId, 'name' => $newName, 'adminPass' => $adminPass); - $server->rebuild($attr); - $this->app->setOutput("Success", $serverId." has been rebuilt successfully with the new image."); + $serverId = $this->app->getPostParam("serverId"); + $imageId = $this->app->getPostParam("imageId"); + $newName = $this->app->getPostParam("newName"); + $adminPass = $this->app->getPostParam("adminPass"); + if(!isset($serverId)|| !isset($imageId) || isset($newName) || isset($adminPass)) ){ + $this->app->setOutput("Error", "You'll have to provide server ID and the new image, name and admin password!"); + return; + } + $opt = array('id' => $serverId); + $server = $this->libClass->getServer($opt); + $attr = array('imageId' => $imageId, 'name' => $newName, 'adminPass' => $adminPass); + $server->rebuild($attr); + $this->app->setOutput("Success", $serverId." has been rebuilt successfully with the new image."); } catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -481,7 +481,7 @@ class compute $this->app->getErrorInstance()->NotImplementedHandler($e); } catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); + $this->app->getErrorInstance()->OtherException($e); } return; } @@ -493,15 +493,15 @@ class compute public function resize() { try{ - $serverId = $this->app->getPostParam("serverId"); - $newFlavorId = $this->app->getPostParam("newFlavorId"); - if(!isset($serverId)|| !isset($flavorId)){ - $this->app->setOutput("Error", "You'll have to provide server ID and the new flavor ID!"); - return; - } - $opt = array('id' => $serverId); - $server = $this->libClass->getServer($opt); - $server->resize($newFlavorId); + $serverId = $this->app->getPostParam("serverId"); + $newFlavorId = $this->app->getPostParam("newFlavorId"); + if(!isset($serverId)|| !isset($flavorId)){ + $this->app->setOutput("Error", "You'll have to provide server ID and the new flavor ID!"); + return; + } + $opt = array('id' => $serverId); + $server = $this->libClass->getServer($opt); + $server->resize($newFlavorId); } catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -516,7 +516,7 @@ class compute $this->app->getErrorInstance()->NotImplementedHandler($e); } catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); + $this->app->getErrorInstance()->OtherException($e); } return; } @@ -527,15 +527,15 @@ class compute public function confirmResize() { try{ - $serverId = $this->app->getPostParam("serverId"); - if(!isset($serverId)){ - $this->app->setOutput("Error", "Server ID is missing!"); - return; - } - $opt = array('id' => $serverId); - $server = $this->libClass->getServer($opt); - $server->confirmResize(); - $this->app->setOutput("Success", $serverId." has been resized successfully as the new flavor."); + $serverId = $this->app->getPostParam("serverId"); + if(!isset($serverId)){ + $this->app->setOutput("Error", "Server ID is missing!"); + return; + } + $opt = array('id' => $serverId); + $server = $this->libClass->getServer($opt); + $server->confirmResize(); + $this->app->setOutput("Success", $serverId." has been resized successfully as the new flavor."); } catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -550,7 +550,7 @@ class compute $this->app->getErrorInstance()->NotImplementedHandler($e); } catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); + $this->app->getErrorInstance()->OtherException($e); } return; } @@ -561,15 +561,15 @@ class compute public function revertResize() { try{ - $serverId = $this->app->getPostParam("serverId"); - if(!isset($serverId)){ - $this->app->setOutput("Error", "Server ID is missing!"); - return; - } - $opt = array('id' => $serverId); - $server = $this->libClass->getServer($opt); - $server->revertResize(); - $this->app->setOutput("Success", $serverId." : resize operation has been reverted to the old flavor."); + $serverId = $this->app->getPostParam("serverId"); + if(!isset($serverId)){ + $this->app->setOutput("Error", "Server ID is missing!"); + return; + } + $opt = array('id' => $serverId); + $server = $this->libClass->getServer($opt); + $server->revertResize(); + $this->app->setOutput("Success", $serverId." : resize operation has been reverted to the old flavor."); } catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -584,22 +584,27 @@ class compute $this->app->getErrorInstance()->NotImplementedHandler($e); } catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); + $this->app->getErrorInstance()->OtherException($e); } return; } + /** + * List private and public addresses of a server + * @return void + */ + public function listAddresses(array $options = []) { try{ - $serverId = $this->app->getPostParam("serverId"); - if(!isset($serverId)){ - $this->app->setOutput("Error", "Server ID is missing!"); - return; - } - $opt = array('id' => $serverId); - $server = $this->libClass->getServer($opt); - $addresses = $server->listAddresses(); - $this->app->setOutput("Addresses", $addresses); + $serverId = $this->app->getPostParam("serverId"); + if(!isset($serverId)){ + $this->app->setOutput("Error", "Server ID is missing!"); + return; + } + $opt = array('id' => $serverId); + $server = $this->libClass->getServer($opt); + $addresses = $server->listAddresses(); + $this->app->setOutput("Addresses", $addresses); } catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -614,7 +619,7 @@ class compute $this->app->getErrorInstance()->NotImplementedHandler($e); } catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); + $this->app->getErrorInstance()->OtherException($e); } return; } -- cgit v1.2.3