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') 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') 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') 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') 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 78a4f8574fb074fef30b2a646c052f68743ee37e Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Wed, 9 Mar 2016 14:31:14 +0100 Subject: modif in image constructor --- server/core/Image.php | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'server/core') diff --git a/server/core/Image.php b/server/core/Image.php index ddd8390..426cf9d 100644 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -43,18 +43,8 @@ class image implements Core{ if(!isset($app)){ $this->app->setOutput("Error", "Incorrect parameter"); } - try{ - $this->app = $app; - $this->libClass = $app->getLibClass("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); - } + $this->app = $app; + $this->libClass = $app->getLibClass("Image"); } -- cgit v1.2.3 From 73c33feded940dcfc542b54394cd1e3efd9ba9d7 Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Wed, 9 Mar 2016 14:35:08 +0100 Subject: modifs on Image constructor --- server/core/Image.php | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'server/core') diff --git a/server/core/Image.php b/server/core/Image.php index ddd8390..426cf9d 100644 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -43,18 +43,8 @@ class image implements Core{ if(!isset($app)){ $this->app->setOutput("Error", "Incorrect parameter"); } - try{ - $this->app = $app; - $this->libClass = $app->getLibClass("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); - } + $this->app = $app; + $this->libClass = $app->getLibClass("Image"); } -- cgit v1.2.3 From c8d1eeda92d2c4720dc495313a1006ec81510693 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Mar 2016 15:21:46 +0100 Subject: MAJ Library --- server/core/App.php | 8 ++++---- server/core/ErrorManagement.php | 10 +++++----- server/core/Identity.php | 2 +- server/core/LibOverride/genTokenOptions.php | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'server/core') diff --git a/server/core/App.php b/server/core/App.php index edb75f6..ceda7c9 100755 --- a/server/core/App.php +++ b/server/core/App.php @@ -3,10 +3,10 @@ include_once("core/Plugin_Api.php"); include_once("core/LibOverride/genTokenOptions.php"); include_once("core/ErrorManagement.php"); -use OpenStack\Common\Error\BadResponseError; -use OpenStack\Common\Error\BaseError; -use OpenStack\Common\Error\NotImplementedError; -use OpenStack\Common\Error\UserInputError; +use OpenCloud\Common\Error\BadResponseError; +use OpenCloud\Common\Error\BaseError; +use OpenCloud\Common\Error\NotImplementedError; +use OpenCloud\Common\Error\UserInputError; class App{ diff --git a/server/core/ErrorManagement.php b/server/core/ErrorManagement.php index 6bff61f..4ba3493 100755 --- a/server/core/ErrorManagement.php +++ b/server/core/ErrorManagement.php @@ -1,9 +1,9 @@ \ No newline at end of file +?> diff --git a/server/core/Identity.php b/server/core/Identity.php index 2638985..7100c9f 100755 --- a/server/core/Identity.php +++ b/server/core/Identity.php @@ -9,7 +9,7 @@ * * @todo Complete the functions and finish the descriptions */ -use OpenStack\Common\Error; +use OpenCloud\Common\Error; /** * Identity Class of the back-end application diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php index 50826ed..18d880f 100755 --- a/server/core/LibOverride/genTokenOptions.php +++ b/server/core/LibOverride/genTokenOptions.php @@ -1,12 +1,12 @@ Date: Wed, 9 Mar 2016 15:26:01 +0100 Subject: solve syntax error --- server/core/Image.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server/core') diff --git a/server/core/Image.php b/server/core/Image.php index 426cf9d..b21073b 100644 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -68,7 +68,7 @@ class image implements Core{ * options for the image creation * **/ - private function createImage(array $opt){ + private function createImage(){ $opt = $this->app->getPostParam("opt"); if(!isset($opt)){ -- cgit v1.2.3 From aee0bda9d47f9d279ff9b5b4a4a263fc5613863e Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Wed, 9 Mar 2016 15:39:43 +0100 Subject: correct errors --- server/core/Image.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'server/core') diff --git a/server/core/Image.php b/server/core/Image.php index b21073b..f509cd6 100644 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -353,7 +353,7 @@ class image implements Core{ * @param string $file_name * path of the image **/ - private function uploadImage($id, $file_name){ + private function uploadImage(){ $id = $this->app->getPostParam("id"); $file_name = $this->app->getPostParam("file_name"); @@ -389,7 +389,7 @@ class image implements Core{ * @param string $id * identifier of the image **/ - private function downloadImage($id){ + private function downloadImage(){ $id = $this->app->getPostParam("id"); if(!isset($id)){ $this->app->setOutput("Error", "Incorrect parameter"); @@ -590,7 +590,7 @@ class image implements Core{ * @param string $status * new status for the member **/ - private function updateMemberImage($image_id, $member_id, $status){ + private function updateMemberImage(){ $image_id = $this->app->getPostParam("image_id"); $member_id = $this->app->getPostParam("member_id"); $status = $this->app->getPostParam("status"); -- cgit v1.2.3