From e01936a73e75350a40fafd80995b1525a11c9da1 Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Thu, 17 Mar 2016 09:46:32 +0100 Subject: add commentaries, update error management and correct some mistakes in Image.php, resolve conflict in AppTestClass.php --- server/core/Image.php | 279 ++++++++++++++++++++++++-------------------------- 1 file changed, 133 insertions(+), 146 deletions(-) (limited to 'server/core/Image.php') diff --git a/server/core/Image.php b/server/core/Image.php index d37c828..f309943 100755 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -9,15 +9,13 @@ * * @todo Complete the functions with errors detection and finish the descriptions */ -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; include("CoreInterface.php"); - /** * Image Class of the back-end application * @@ -37,13 +35,11 @@ class image implements Core{ * * @param App $app the main app object * - * @throws [Type] [] - * * @return Image */ public function __construct($app){ if(!isset($app)){ - $this->app->setOutput("Error", "Incorrect parameter"); + $this->app->setOutput("Error", "Incorrect parameter app"); } $this->app = $app; $this->libClass = $app->getLibClass("Image"); @@ -58,47 +54,46 @@ class image implements Core{ * @return void */ public function action($action){ - - $this->{$action.""}(); - + $this->{$action.""}(); } /** - * Details about an image + * Create a new image * - * @param array $opt - * options for the image creation + * @param array $opt Options for the image creation (name is required, others are optionals) * - **/ + * @return Image + */ private function createImage(){ $opt = $this->app->getPostParam("opt"); - if(!isset($opt)){ - $this->app->setOutput("Error", "Incorrect parameter"); + $this->app->setOutput("Error", "Incorrect parameter opt"); } - try{ - // VOIR SI MAUVAIS TYPE $options = Array(); - if(isset($opt['name'])){ // if the image name already exists -> error + + // Check the image name + if(isset($opt['name'])){ $imagesList = listImage(); - if(isset($images)){ + if(isset($imagesList)){ foreach($imagesList as $image){ - if(strcmp($image->name, $opt['name']) == 0){ - + if(strcmp($image->name, $opt['name']) == 0){ // if the image name already exists -> error + $this->app->setOutput("Error", "Image name already exists"); } } } } else{ - $this->app->setOutput("Error", "Image name already exists"); + $this->app->setOutput("Error", "Missing parameter 'name' for the new image"); } + + // Check optionals arguments if(isset($opt['id'])){ // UUID : nnnnnnnn-nnnn-nnnn-nnnn-nnnnnnnnnnnn if($this->libClass->getImage($opt['id']) != null){ // if the id already exists -> error - + $this->app->setOutput("Error", "Image id already exists"); } $options['id'] = $opt['id']; } @@ -131,11 +126,11 @@ class image implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ - $this->app->getErrorInstance->UserInputHandler($e); + $this->app->getErrorInstance()->UserInputHandler($e); }catch(BaseError $e){ - $this->app->getErrorInstance->BaseErrorHandler($e); + $this->app->getErrorInstance()->BaseErrorHandler($e); }catch(NotImplementedError $e){ - $this->app->getErrorInstance->NotImplementedHandler($e); + $this->app->getErrorInstance()->NotImplementedHandler($e); } $this->app->setOutput("Images", $image); @@ -144,7 +139,7 @@ class image implements Core{ /** * List the images of the server * - * @return the list with all images on the server + * @return List of Image */ private function listImage(){ try{ @@ -156,11 +151,11 @@ class image implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ - $this->app->getErrorInstance->UserInputHandler($e); + $this->app->getErrorInstance()->UserInputHandler($e); }catch(BaseError $e){ - $this->app->getErrorInstance->BaseErrorHandler($e); + $this->app->getErrorInstance()->BaseErrorHandler($e); }catch(NotImplementedError $e){ - $this->app->getErrorInstance->NotImplementedHandler($e); + $this->app->getErrorInstance()->NotImplementedHandler($e); } $this->app->setOutput("Images", $result); @@ -170,10 +165,10 @@ class image implements Core{ /** * Details about an image * - * @param string $id - * identifier of the image - * - **/ + * @param String $id Identifier of the image + * + * @return Image + */ private function detailsImage(){ $id = $this->app->getPostParam("id"); if(!isset($id)){ @@ -186,29 +181,26 @@ class image implements Core{ if($image == null){ // if the image don't exists -> error $this->app->setOutput("Error", "Image doesn't exist"); } - $this->app->setOutput("Images", $image); - }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ - $this->app->getErrorInstance->UserInputHandler($e); + $this->app->getErrorInstance()->UserInputHandler($e); }catch(BaseError $e){ - $this->app->getErrorInstance->BaseErrorHandler($e); + $this->app->getErrorInstance()->BaseErrorHandler($e); }catch(NotImplementedError $e){ - $this->app->getErrorInstance->NotImplementedHandler($e); + $this->app->getErrorInstance()->NotImplementedHandler($e); } } /** - * Details about an image + * Update informations about an image * - * @param string $id - * id of the image - * - * @param array $opt - * options for the image creation - **/ + * @param String $id id of the image + * @param array $opt Options for the image creation + * + * @return Image + */ private function updateImage(){ $id = $this->app->getPostParam("id"); @@ -254,11 +246,11 @@ class image implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ - $this->app->getErrorInstance->UserInputHandler($e); + $this->app->getErrorInstance()->UserInputHandler($e); }catch(BaseError $e){ - $this->app->getErrorInstance->BaseErrorHandler($e); + $this->app->getErrorInstance()->BaseErrorHandler($e); }catch(NotImplementedError $e){ - $this->app->getErrorInstance->NotImplementedHandler($e); + $this->app->getErrorInstance()->NotImplementedHandler($e); } $this->app->setOutput("Images", $image); } @@ -266,9 +258,10 @@ class image implements Core{ /** * Delete an image * - * @param string $id - * identifier of the image - **/ + * @param String $id Identifier of the image + * + * @return void + */ private function deleteImage(){ // si protected = true, demander de le mettre a false // vérifier existence image @@ -280,27 +273,28 @@ class image implements Core{ try{ $service = $this->libClass; $image = $this->libClass->getImage($id); - if($image == null){ // if the image don't exists -> error + if($image == null){ // if the image doesn't exists -> error $this->app->setOutput("Error", "Image doesn't exist"); } $image->delete(); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ - $this->app->getErrorInstance->UserInputHandler($e); + $this->app->getErrorInstance()->UserInputHandler($e); }catch(BaseError $e){ - $this->app->getErrorInstance->BaseErrorHandler($e); + $this->app->getErrorInstance()->BaseErrorHandler($e); }catch(NotImplementedError $e){ - $this->app->getErrorInstance->NotImplementedHandler($e); + $this->app->getErrorInstance()->NotImplementedHandler($e); } } /** * Resactive an image * - * @param string $id - * identifier of the image - **/ + * @param String $id Identifier of the image + * + * @return void + */ private function reactivateImage(){ $id = $this->app->getPostParam("id"); @@ -308,7 +302,6 @@ class image implements Core{ $this->app->setOutput("Error", "Incorrect parameter"); } try{ - // vérifier existence image $service = $this->libClass; $image = $service->getImage($id); if($image == null){ // if the image don't exists -> error @@ -318,20 +311,21 @@ class image implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ - $this->app->getErrorInstance->UserInputHandler($e); + $this->app->getErrorInstance()->UserInputHandler($e); }catch(BaseError $e){ - $this->app->getErrorInstance->BaseErrorHandler($e); + $this->app->getErrorInstance()->BaseErrorHandler($e); }catch(NotImplementedError $e){ - $this->app->getErrorInstance->NotImplementedHandler($e); + $this->app->getErrorInstance()->NotImplementedHandler($e); } } /** * Desactive an image * - * @param string $id - * identifier of the image - **/ + * @param String $id Identifier of the image + * + * @return void + */ private function desactivateImage(){ $id = $this->app->getPostParam("id"); @@ -349,23 +343,22 @@ class image implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ - $this->app->getErrorInstance->UserInputHandler($e); + $this->app->getErrorInstance()->UserInputHandler($e); }catch(BaseError $e){ - $this->app->getErrorInstance->BaseErrorHandler($e); + $this->app->getErrorInstance()->BaseErrorHandler($e); }catch(NotImplementedError $e){ - $this->app->getErrorInstance->NotImplementedHandler($e); + $this->app->getErrorInstance()->NotImplementedHandler($e); } } /** * Upload an image * - * @param string $id - * identifier of the image - * - * @param string $file_name - * path of the image - **/ + * @param String $id Identifier of the image + * @param String $file_name Path of the image + * + * @return void + */ private function uploadImage(){ $id = $this->app->getPostParam("id"); $file_name = $this->app->getPostParam("file_name"); @@ -375,7 +368,7 @@ class image implements Core{ $this->app->setOutput("Error", "Incorrect id parameter"); } if(!isset($file_name)){ - $this->app->setOutput("Error", "Incorrect file_name parameter"); + $this->app->setOutput("Error", "Incorrect file name parameter"); } try{ // vérifier existence image @@ -389,25 +382,26 @@ class image implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ - $this->app->getErrorInstance->UserInputHandler($e); + $this->app->getErrorInstance()->UserInputHandler($e); }catch(BaseError $e){ - $this->app->getErrorInstance->BaseErrorHandler($e); + $this->app->getErrorInstance()->BaseErrorHandler($e); }catch(NotImplementedError $e){ - $this->app->getErrorInstance->NotImplementedHandler($e); + $this->app->getErrorInstance()->NotImplementedHandler($e); } } /** * Download an image * - * @param string $id - * identifier of the image - **/ + * @param String $id Identifier of the image + * + * @return Stream + */ private function downloadImage(){ $id = $this->app->getPostParam("id"); if(!isset($id)){ - $this->app->setOutput("Error", "Incorrect parameter"); + $this->app->setOutput("Error", "Incorrect id parameter"); } try{ // vérifier existence image @@ -420,11 +414,11 @@ class image implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ - $this->app->getErrorInstance->UserInputHandler($e); + $this->app->getErrorInstance()->UserInputHandler($e); }catch(BaseError $e){ - $this->app->getErrorInstance->BaseErrorHandler($e); + $this->app->getErrorInstance()->BaseErrorHandler($e); }catch(NotImplementedError $e){ - $this->app->getErrorInstance->NotImplementedHandler($e); + $this->app->getErrorInstance()->NotImplementedHandler($e); } $this->app->setOutput("Images", $stream); } @@ -432,21 +426,20 @@ class image implements Core{ /** * Add a member to image * - * @param string $image_id - * identifier of the image - * - * @param string $member_id - * identifier of the member - **/ + * @param String $image_id Identifier of the image + * @param String $member_id Identifier of the member + * + * @return Member + */ private function addMemberImage(){ $image_id = $this->app->getPostParam("image_id"); $member_id = $this->app->getPostParam("member_id"); if(!isset($image_id)){ - $this->app->setOutput("Error", "Incorrect parameter image_id"); + $this->app->setOutput("Error", "Incorrect image id parameter"); } if(!isset($member_id)){ - $this->app->setOutput("Error", "Incorrect parameter member_id"); + $this->app->setOutput("Error", "Incorrect member id parameter"); } try{ $service = $this->libClass; @@ -456,14 +449,15 @@ class image implements Core{ $this->app->setOutput("Error", "Image doesn't exist"); } $member_id = $image->addMember($member_id); + $this->app->setOutput("Images", $member_id); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ - $this->app->getErrorInstance->UserInputHandler($e); + $this->app->getErrorInstance()->UserInputHandler($e); }catch(BaseError $e){ - $this->app->getErrorInstance->BaseErrorHandler($e); + $this->app->getErrorInstance()->BaseErrorHandler($e); }catch(NotImplementedError $e){ - $this->app->getErrorInstance->NotImplementedHandler($e); + $this->app->getErrorInstance()->NotImplementedHandler($e); } } @@ -471,18 +465,19 @@ class image implements Core{ /** * List members of an image * - * @param string $image_id - * identifier of the image - **/ + * @param String $image_id identifier of the image + * + * @return List of Member + */ private function listMemberImage(){ $image_id = $this->app->getPostParam("image_id"); $member_id = $this->app->getPostParam("member_id"); if(!isset($image_id)){ - $this->app->setOutput("Error", "Incorrect parameter image_id"); + $this->app->setOutput("Error", "Incorrect image id parameter"); } if(!isset($member_id)){ - $this->app->setOutput("Error", "Incorrect parameter member_id"); + $this->app->setOutput("Error", "Incorrect member id parameter"); } try{ // vérifier existence image @@ -492,44 +487,40 @@ class image implements Core{ $this->app->setOutput("Error", "Image doesn't exist"); } $members = $image->listMembers(); - if($member == null){ // if the image don't exists -> error + if($members == null){ // if the image don't exists -> error $this->app->setOutput("Error", "No member"); } }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ - $this->app->getErrorInstance->UserInputHandler($e); + $this->app->getErrorInstance()->UserInputHandler($e); }catch(BaseError $e){ - $this->app->getErrorInstance->BaseErrorHandler($e); + $this->app->getErrorInstance()->BaseErrorHandler($e); }catch(NotImplementedError $e){ - $this->app->getErrorInstance->NotImplementedHandler($e); + $this->app->getErrorInstance()->NotImplementedHandler($e); } - $this->app->setOutput("Images", $member); + $this->app->setOutput("Images", $members); } /** * Show details of a member of an image * - * @param string $image_id - * identifier of the image + * @param String $image_id Identifier of the image + * @param String $member_id Identifier of the member * - * @param string $member_id - * identifier of the member - **/ + * @return Member + */ private function detailMemberImage(){ $image_id = $this->app->getPostParam("image_id"); $member_id = $this->app->getPostParam("member_id"); if(!isset($image_id)){ - $this->app->setOutput("Error", "Incorrect parameter image_id"); + $this->app->setOutput("Error", "Incorrect image id parameter"); } if(!isset($member_id)){ - $this->app->setOutput("Error", "Incorrect parameter member_id"); + $this->app->setOutput("Error", "Incorrect member id parameter"); } try{ - // vérifier existence image - // on doit être le proprio de l'image - // vérifier membre existe $service = $this->libClass; $image = $service->getImage($id); @@ -544,11 +535,11 @@ class image implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ - $this->app->getErrorInstance->UserInputHandler($e); + $this->app->getErrorInstance()->UserInputHandler($e); }catch(BaseError $e){ - $this->app->getErrorInstance->BaseErrorHandler($e); + $this->app->getErrorInstance()->BaseErrorHandler($e); }catch(NotImplementedError $e){ - $this->app->getErrorInstance->NotImplementedHandler($e); + $this->app->getErrorInstance()->NotImplementedHandler($e); } $this->app->setOutput("Images", $member); } @@ -556,21 +547,20 @@ class image implements Core{ /** * Remove a member of an image * - * @param string $image_id - * identifier of the image - * - * @param string $member_id - * identifier of the member - **/ + * @param String $image_id Identifier of the image + * @param String $member_id Identifier of the member + * + * @return void + */ private function removeMemberImage(){ $image_id = $this->app->getPostParam("image_id"); $member_id = $this->app->getPostParam("member_id"); if(!isset($image_id)){ - $this->app->setOutput("Error", "Incorrect parameter image_id"); + $this->app->setOutput("Error", "Incorrect image id parameter"); } if(!isset($member_id)){ - $this->app->setOutput("Error", "Incorrect parameter member_id"); + $this->app->setOutput("Error", "Incorrect member id parameter"); } try{ $service = $this->libClass; @@ -587,25 +577,22 @@ class image implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ - $this->app->getErrorInstance->UserInputHandler($e); + $this->app->getErrorInstance()->UserInputHandler($e); }catch(BaseError $e){ - $this->app->getErrorInstance->BaseErrorHandler($e); + $this->app->getErrorInstance()->BaseErrorHandler($e); }catch(NotImplementedError $e){ - $this->app->getErrorInstance->NotImplementedHandler($e); + $this->app->getErrorInstance()->NotImplementedHandler($e); } } /** * Update a member of an image * - * @param string $image_id - * identifier of the image - * - * @param string $member_id - * identifier of the member + * @param String $image_id Identifier of the image + * @param String $member_id Identifier of the member + * @param String $status New status for the member * - * @param string $status - * new status for the member + * @return void **/ private function updateMemberImage(){ $image_id = $this->app->getPostParam("image_id"); @@ -613,10 +600,10 @@ class image implements Core{ $status = $this->app->getPostParam("status"); if(!isset($image_id)){ - $this->app->setOutput("Error", "Incorrect parameter image_id"); + $this->app->setOutput("Error", "Incorrect image id parameter"); } if(!isset($member_id)){ - $this->app->setOutput("Error", "Incorrect parameter member_id"); + $this->app->setOutput("Error", "Incorrect member id parameter"); } try{ $service = $this->libClass; @@ -633,11 +620,11 @@ class image implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ - $this->app->getErrorInstance->UserInputHandler($e); + $this->app->getErrorInstance()->UserInputHandler($e); }catch(BaseError $e){ - $this->app->getErrorInstance->BaseErrorHandler($e); + $this->app->getErrorInstance()->BaseErrorHandler($e); }catch(NotImplementedError $e){ - $this->app->getErrorInstance->NotImplementedHandler($e); + $this->app->getErrorInstance()->NotImplementedHandler($e); } } -- cgit v1.2.3 From fe0eb3a9e259b4fe09df364f0660ebc62185f9dd Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Thu, 17 Mar 2016 11:34:56 +0100 Subject: add exception management, correct mistakes in error management in Image.php and add function to simplify parameters using in tests --- server/Test/AppTestClass.php | 8 +- server/Test/imageTests.php | 68 ++--- server/core/ErrorManagement.php | 4 + server/core/Image.php | 549 ++++++++++++++++++++++------------------ 4 files changed, 339 insertions(+), 290 deletions(-) (limited to 'server/core/Image.php') diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php index 5e8efc7..e1631c5 100755 --- a/server/Test/AppTestClass.php +++ b/server/Test/AppTestClass.php @@ -89,10 +89,16 @@ class AppTest{ } public function getPostParam($name){ - + return $this->postParams[$name]; } + + public function setPostParam($name, $value){ + + $this->postParams[$name] = $value; + + } public function setOutput($key, $out){ diff --git a/server/Test/imageTests.php b/server/Test/imageTests.php index 3af12fc..883387d 100644 --- a/server/Test/imageTests.php +++ b/server/Test/imageTests.php @@ -14,55 +14,39 @@ $opt['minDisk'] = 1; $opt['protected'] = false; $opt['minRam'] = 10; -//$new_image = $image->createImage($opt); +//$App->setPostParam('id', 'sdfihlus154dfhj'); +$err = $image->action("createImage"); + //Liste des images $image->action("listImage"); -//$images = $image->listImage(); $im = $App->show(); -$images = json_decode($im, true)["Images"]; -if(isset($images)){ - echo "Images présentes :"; - echo "
"; - foreach($images as $i){ - echo $i['name']; - echo "
"; - } +$images = json_decode($im, true)["Images"]; +$recup; + +echo "Images présentes :"; +echo "
"; +foreach($images as $i){ + $recup = $i; + echo $recup['name']; echo "
"; + //echo $recup['id']; + } +echo "
"; +echo "Erreur capturée: "; +echo "
"; + + /* + //$App->setPostParam('id', $recup['id']); + $App->setPostParam('id', 'sdfihlus154dfhj'); + $err = $image->action("detailsImage"); + $temp = $App->show(); + $ret = json_decode($temp, true)["Images"]; + echo $ret['id']; + */ + //$App->getPostParam("id"); - if(isset($list)){ - foreach ($list as $l) { - echo $l; - echo "
"; - } -} -} -else{ - echo "Aucune image présente\n"; -} - - - -// Détails Image -//$details = $image->imageDetails($id_image); - -//$image->deleteImage('123456'); - -//$image->desactivateImage($id_image); -//$image->reactivateImage($id_image); - -//$file_name = "/home/yogg/Downloads/TinyCore-6.4.1.iso"; -//$image->uploadImage($id_image, $file_name); - -//$image->downloadImage($id_image); -/* -$opt_update = Array(); -$opt_update['name'] = "Test"; -$opt_update['tags'] = null; -$update = $image->updateImage($id_image, $opt_update); -echo $update->name; -*/ ?> \ No newline at end of file diff --git a/server/core/ErrorManagement.php b/server/core/ErrorManagement.php index 4ba3493..ff66339 100755 --- a/server/core/ErrorManagement.php +++ b/server/core/ErrorManagement.php @@ -32,6 +32,10 @@ Class errorManagement{ public function UserInputHandler($error){ } + + public function OtherException($error){ + $this->app->setOutput("Error", $error->getMessage); + } } diff --git a/server/core/Image.php b/server/core/Image.php index f309943..71e19ce 100755 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -131,6 +131,8 @@ class image implements Core{ $this->app->getErrorInstance()->BaseErrorHandler($e); }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); } $this->app->setOutput("Images", $image); @@ -156,6 +158,8 @@ class image implements Core{ $this->app->getErrorInstance()->BaseErrorHandler($e); }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); } $this->app->setOutput("Images", $result); @@ -171,26 +175,33 @@ class image implements Core{ */ private function detailsImage(){ $id = $this->app->getPostParam("id"); + if(!isset($id)){ $this->app->setOutput("Error", "Incorrect id parameter"); - } - try{ - $service = $this->libClass; - $image = $service->getImage($id); - if($image == null){ // if the image don't exists -> error - $this->app->setOutput("Error", "Image doesn't exist"); - } - $this->app->setOutput("Images", $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); - } + else{ + try{ + $service = $this->libClass; + $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + $this->app->setOutput("Error", "Image doesn't exist"); + } + else{ + echo 'toto'; + $this->app->setOutput("Images", $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); + } + } } /** @@ -209,50 +220,53 @@ class image implements Core{ if(!isset($id)){ $this->app->setOutput("Error", "Incorrect id parameter"); } - if(!isset($opt)){ + else if(!isset($opt)){ $this->app->setOutput("Error", "Incorrect opt parameter"); } + else{ + try{ + //vérifier existence image + $service = $this->libClass; + $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + $this->app->setOutput("Error", "Image doesn't exist"); + } - try{ - //vérifier existence image - $service = $this->libClass; - $image = $service->getImage($id); - if($image == null){ // if the image don't exists -> error - $this->app->setOutput("Error", "Image doesn't exist"); - } - - $options = Array(); + $options = Array(); - // Voir vérification des types - if(isset($opt['name'])){ //string - $options['name'] = $opt['name']; - } - if(isset($opt['minDisk'])){ //int - $options['minDisk'] = $opt['minDisk']; - } - if(isset($opt['minRam'])){ // int - $options['minRam'] = $opt['minRam']; - } - if(isset($opt['protected'])){ // boolean - $options['protected'] = $opt['protected']; - } - if(isset($opt['visibility'])){ // public, private - $options['visibility'] = $opt['visibility']; - } - if(isset($opt['tags'])){ // list - $options['tags'] = $opt['tags']; - } - $image->update($options); - }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->setOutput("Images", $image); + // Voir vérification des types + if(isset($opt['name'])){ //string + $options['name'] = $opt['name']; + } + if(isset($opt['minDisk'])){ //int + $options['minDisk'] = $opt['minDisk']; + } + if(isset($opt['minRam'])){ // int + $options['minRam'] = $opt['minRam']; + } + if(isset($opt['protected'])){ // boolean + $options['protected'] = $opt['protected']; + } + if(isset($opt['visibility'])){ // public, private + $options['visibility'] = $opt['visibility']; + } + if(isset($opt['tags'])){ // list + $options['tags'] = $opt['tags']; + } + $image->update($options); + }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); + } + $this->app->setOutput("Images", $image); + } } /** @@ -269,23 +283,26 @@ class image implements Core{ if(!isset($id)){ $this->app->setOutput("Error", "Image doesn't exist"); } - - try{ - $service = $this->libClass; - $image = $this->libClass->getImage($id); - if($image == null){ // if the image doesn't exists -> error - $this->app->setOutput("Error", "Image doesn't exist"); - } - $image->delete(); - }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); - } + else{ + try{ + $service = $this->libClass; + $image = $this->libClass->getImage($id); + if($image == null){ // if the image doesn't exists -> error + $this->app->setOutput("Error", "Image doesn't exist"); + } + $image->delete(); + }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); + } + } } /** @@ -301,22 +318,27 @@ class image implements Core{ if(!isset($id)){ $this->app->setOutput("Error", "Incorrect parameter"); } - try{ - $service = $this->libClass; - $image = $service->getImage($id); - if($image == null){ // if the image don't exists -> error - $this->app->setOutput("Error", "Image doesn't exist"); - } - $image->reactivate(); - }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); - } + else + { + try{ + $service = $this->libClass; + $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + $this->app->setOutput("Error", "Image doesn't exist"); + } + $image->reactivate(); + }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); + } + } } /** @@ -332,23 +354,28 @@ class image implements Core{ if(!isset($id)){ $this->app->setOutput("Error", "Incorrect parameter"); } - try{ - // vérifier existence image - $service = $this->libClass; - $image = $service->getImage($id); - if($image == null){ // if the image don't exists -> error - $this->app->setOutput("Error", "Image doesn't exist"); - } - $image->deactivate(); - }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); - } + else + { + try{ + // vérifier existence image + $service = $this->libClass; + $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + $this->app->setOutput("Error", "Image doesn't exist"); + } + $image->deactivate(); + }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); + } + } } /** @@ -367,26 +394,30 @@ class image implements Core{ if(!isset($id)){ $this->app->setOutput("Error", "Incorrect id parameter"); } - if(!isset($file_name)){ + else if(!isset($file_name)){ $this->app->setOutput("Error", "Incorrect file name parameter"); } - try{ - // vérifier existence image - $service = $this->libClass; - $image = $service->getImage($id); - if($image == null){ // if the image don't exists -> error - $this->app->setOutput("Error", "Image doesn't exist"); - } - $stream = \GuzzleHttp\Psr7\stream_for(fopen($file_name, 'r')); - $image->uploadData($stream); - }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); + else{ + try{ + // vérifier existence image + $service = $this->libClass; + $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + $this->app->setOutput("Error", "Image doesn't exist"); + } + $stream = \GuzzleHttp\Psr7\stream_for(fopen($file_name, 'r')); + $image->uploadData($stream); + }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); + } } } @@ -403,24 +434,28 @@ class image implements Core{ if(!isset($id)){ $this->app->setOutput("Error", "Incorrect id parameter"); } - try{ - // vérifier existence image - $service = $this->libClass; - $image = $service->getImage($id); - if($image == null){ // if the image don't exists -> error - $this->app->setOutput("Error", "Image doesn't exist"); - } - $stream = $image->downloadData(); - }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->setOutput("Images", $stream); + else{ + try{ + // vérifier existence image + $service = $this->libClass; + $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + $this->app->setOutput("Error", "Image doesn't exist"); + } + $stream = $image->downloadData(); + }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); + } + $this->app->setOutput("Images", $stream); + } } /** @@ -438,27 +473,31 @@ class image implements Core{ if(!isset($image_id)){ $this->app->setOutput("Error", "Incorrect image id parameter"); } - if(!isset($member_id)){ + else if(!isset($member_id)){ $this->app->setOutput("Error", "Incorrect member id parameter"); } - try{ - $service = $this->libClass; + else{ + try{ + $service = $this->libClass; - $image = $service->getImage($id); - if($image == null){ // if the image don't exists -> error - $this->app->setOutput("Error", "Image doesn't exist"); - } - $member_id = $image->addMember($member_id); - $this->app->setOutput("Images", $member_id); - }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); - } + $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + $this->app->setOutput("Error", "Image doesn't exist"); + } + $member_id = $image->addMember($member_id); + $this->app->setOutput("Images", $member_id); + }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); + } + } } @@ -476,30 +515,34 @@ class image implements Core{ if(!isset($image_id)){ $this->app->setOutput("Error", "Incorrect image id parameter"); } - if(!isset($member_id)){ + else if(!isset($member_id)){ $this->app->setOutput("Error", "Incorrect member id parameter"); } - try{ - // vérifier existence image - $service = $this->libClass; - $image = $service->getImage($image_id); - if($image == null){ // if the image don't exists -> error - $this->app->setOutput("Error", "Image doesn't exist"); - } - $members = $image->listMembers(); - if($members == null){ // if the image don't exists -> error - $this->app->setOutput("Error", "No member"); - } - }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->setOutput("Images", $members); + else{ + try{ + // vérifier existence image + $service = $this->libClass; + $image = $service->getImage($image_id); + if($image == null){ // if the image don't exists -> error + $this->app->setOutput("Error", "Image doesn't exist"); + } + $members = $image->listMembers(); + if($members == null){ // if the image don't exists -> error + $this->app->setOutput("Error", "No member"); + } + }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); + } + $this->app->setOutput("Images", $members); + } } /** @@ -517,31 +560,35 @@ class image implements Core{ if(!isset($image_id)){ $this->app->setOutput("Error", "Incorrect image id parameter"); } - if(!isset($member_id)){ + else if(!isset($member_id)){ $this->app->setOutput("Error", "Incorrect member id parameter"); } - try{ - $service = $this->libClass; + else{ + try{ + $service = $this->libClass; - $image = $service->getImage($id); - if($image == null){ // if the image don't exists -> error - $this->app->setOutput("Error", "Image doesn't exist"); - } + $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + $this->app->setOutput("Error", "Image doesn't exist"); + } - $member = $image->getMember($member_id); - if($member == null){ // if the member don't exists -> error - $this->app->setOutput("Error", "Member doesn't exist"); - } - }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->setOutput("Images", $member); + $member = $image->getMember($member_id); + if($member == null){ // if the member don't exists -> error + $this->app->setOutput("Error", "Member doesn't exist"); + } + }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); + } + $this->app->setOutput("Images", $member); + } } /** @@ -559,30 +606,34 @@ class image implements Core{ if(!isset($image_id)){ $this->app->setOutput("Error", "Incorrect image id parameter"); } - if(!isset($member_id)){ + else if(!isset($member_id)){ $this->app->setOutput("Error", "Incorrect member id parameter"); } - try{ - $service = $this->libClass; - - $image = $service->getImage($id); - if($image == null){ // if the image don't exists -> error - $this->app->setOutput("Error", "Image doesn't exist"); - } - $member = $image->getMember($member_id); - if($member == null){ // if the image don't exists -> error - $this->app->setOutput("Error", "Member doesn't exist"); - } - $member->delete(); - }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); - } + else{ + try{ + $service = $this->libClass; + + $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + $this->app->setOutput("Error", "Image doesn't exist"); + } + $member = $image->getMember($member_id); + if($member == null){ // if the image don't exists -> error + $this->app->setOutput("Error", "Member doesn't exist"); + } + $member->delete(); + }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); + } + } } /** @@ -602,30 +653,34 @@ class image implements Core{ if(!isset($image_id)){ $this->app->setOutput("Error", "Incorrect image id parameter"); } - if(!isset($member_id)){ + else if(!isset($member_id)){ $this->app->setOutput("Error", "Incorrect member id parameter"); } - try{ - $service = $this->libClass; + else{ + try{ + $service = $this->libClass; - $image = $service->getImage($id); - if($image == null){ // if the image don't exists -> error - $this->app->setOutput("Error", "Image doesn't exist"); - } - $member = $image->getMember($member_id); - if($member == null){ // if the member don't exists -> error - $this->app->setOutput("Error", "Member doesn't exist"); - } - $member->updateStatus($status); - }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); - } + $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + $this->app->setOutput("Error", "Image doesn't exist"); + } + $member = $image->getMember($member_id); + if($member == null){ // if the member don't exists -> error + $this->app->setOutput("Error", "Member doesn't exist"); + } + $member->updateStatus($status); + }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); + } + } } } -- cgit v1.2.3 From e9c7477ff0acedf9b49e508e1543395bbcbf7533 Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Sun, 27 Mar 2016 19:24:03 +0200 Subject: Modifications in error management and correct error in Image.php --- server/Test/AppTestClass.php | 8 ++-- server/Test/imageTests.php | 95 +++++++++++++++++++++++++++++++---------- server/core/App.php | 15 ++++--- server/core/ErrorManagement.php | 37 ++++++++++++++-- server/core/Image.php | 8 ++-- 5 files changed, 124 insertions(+), 39 deletions(-) (limited to 'server/core/Image.php') diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php index 3f8abbe..a663514 100755 --- a/server/Test/AppTestClass.php +++ b/server/Test/AppTestClass.php @@ -89,9 +89,11 @@ class AppTest{ } public function getPostParam($name){ - - return $this->postParams[$name]; - + if(isset($this->postParams[$name])){ + return $this->postParams[$name]; + }else{ + $this->setOutput("Error", "Missing parameter ".$name); + } } public function setPostParam($name, $value){ diff --git a/server/Test/imageTests.php b/server/Test/imageTests.php index d86c664..4adec08 100644 --- a/server/Test/imageTests.php +++ b/server/Test/imageTests.php @@ -6,6 +6,9 @@ include_once("../core/Compute.php"); $image = new Image($App); $compute = new Compute($App); +// Création image +/* +echo "Création image :
"; $opt = Array(); $opt['name'] = "Test"; $opt['tags'] = ['test', 'openstack']; @@ -16,28 +19,86 @@ $opt['minDisk'] = 1; $opt['protected'] = false; $opt['minRam'] = 10; -//$App->setPostParam('id', 'sdfihlus154dfhj'); -//$err = $image->action("createImage"); +$App->setPostParam('opt', $opt); +$image->action("createImage"); +$retCreate = json_decode($App->show(), true)["Images"]; +$idNew = $retCreate['id']; +*/ +/* +// Delete Image +$App->setPostParam('id', $idNew); +$image->action("deleteImage"); +*/ -//Liste des images +// Liste images $image->action("listImage"); $im = $App->show(); $images = json_decode($im, true)["Images"]; -echo "Images présentes :"; -echo "
"; +echo "List images :
"; foreach($images as $i){ - $recup = $i; - echo $recup['name']; + echo $i['name']."
"; // Nom + echo $i['status']."
"; // Status + $id = $i['id']; // Id + echo $id."
"; + foreach ($i['tags'] as $tag) { // Tags + echo $tag."
"; + } echo "
"; - //echo $recup['id']; - } + } + + +// Details images +echo "Détail image :
"; +$App->setPostParam('id', $id); +$image->action("detailsImage"); +$retDetails = json_decode($App->show(), true)["Images"]; +echo $retDetails['id']."
"; +echo "
"; + + +/* +// Download image +$App->setPostParam('id', $id); +$image->action("downloadImage"); +*/ + + +// Desactivate Images +echo "Desactivate image :
"; +echo $id."
"; +$App->setPostParam('id', $id); +$err = $image->action("desactivateImage"); echo "
"; + +/* +// Resactivate Images +echo $id."
"; +$App->setPostParam('id', $id); +$err = $image->action("resactivateImage"); +*/ + + +/* +// Details images +echo "Update image :
"; +$optUpdate = Array(); +$optUpdate['tags'] = ['ciros', 'testUpdate']; +$App->setPostParam('id', $id); +$App->setPostParam('opt', $optUpdate); +$image->action("updateImage"); +$retDetails = json_decode($App->show(), true)["Images"]; +foreach ($retDetails['tags'] as $tag) { // Tags + echo $tag."
"; +} +*/ + + +/* echo "Flavors: "; echo "
"; - $compute->action("listFlavors"); $flavors = json_decode($App->show(), true)["Flavors"]; @@ -49,17 +110,5 @@ foreach($flavors as $f){ echo "vcpus=".$f['vcpus']; echo "
"; } - -/* -$App->setPostParam('id', 354); -$err = $image->action("deleteImage"); -$temp = $App->show(); -$ret = json_decode($temp, true)["Images"]; -echo $ret['id']; -*/ - - - - - +*/ ?> \ No newline at end of file diff --git a/server/core/App.php b/server/core/App.php index 10813bd..48bb9ab 100755 --- a/server/core/App.php +++ b/server/core/App.php @@ -112,15 +112,20 @@ class App{ } public function getPostParam($name){ - - return $this->postParams[$name]; + + if(isset($this->postParams[$name])){ + return $this->postParams[$name]; + }else{ + $this->setOutput("Error", "Missing parameter ".$name); + } } - public function setPostParam($name, $value){ - - $this->postParams[$name]= $value; + + public function setPostParam($param, $value){ + $this->postParams[$param] = $value; + } public function setOutput($key, $out){ diff --git a/server/core/ErrorManagement.php b/server/core/ErrorManagement.php index 3257dd3..e7cb83e 100755 --- a/server/core/ErrorManagement.php +++ b/server/core/ErrorManagement.php @@ -18,19 +18,48 @@ Class errorManagement{ } public function BaseErrorHandler($error){ - + $this->app->setOutput("Error", "BaseError"); } public function BadResponseHandler($error){ - $this->app->setOutput("Error", "Erreur Interne, Merci de contacter un administrateur!"); + $statusCode = $error->getResponse()->getStatusCode(); + switch ($statusCode) { + case 400: + $this->app->setOutput("Error", "Invalid input."); + break; + + case 401: + $this->app->setOutput("Error", "Authentification failed."); + break; + + case 403: + $this->app->setOutput("Error", "Operation forbidden."); + break; + + case 404: + $this->app->setOutput("Error", "Ressource not found."); + break; + + case 500: + $this->app->setOutput("Error", "Internal server error, please contact an administrator."); + break; + + case 503: + $this->app->setOutput("Error", "Service unvailable for the moment."); + break; + + default: + $this->app->setOutput("Error", "Unknow error, please contact an administrator."); + break; + } } public function NotImplementedHandler($error){ - $this->app->setOutput("Error", "Erreur Interne, Merci de contacter un administrateur!"); + $this->app->setOutput("Error", "Internal error (not implemented yet), please contact an administrator"); } public function UserInputHandler($error){ - + $this->app->setOutput("Error", "UserInputError"); } public function OtherException($error){ diff --git a/server/core/Image.php b/server/core/Image.php index 71e19ce..e9736a2 100755 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -76,7 +76,7 @@ class image implements Core{ // Check the image name if(isset($opt['name'])){ - $imagesList = listImage(); + $imagesList = $this->listImage(); if(isset($imagesList)){ foreach($imagesList as $image){ if(strcmp($image->name, $opt['name']) == 0){ // if the image name already exists -> error @@ -84,7 +84,7 @@ class image implements Core{ } } } - + $options['name'] = $opt['name']; } else{ $this->app->setOutput("Error", "Missing parameter 'name' for the new image"); @@ -118,7 +118,7 @@ class image implements Core{ if(isset($opt['protected'])){ // boolean $options['protected'] = $opt['protected']; } - if(isset($opt['properties'])){ // type dict ? + if(isset($opt['properties'])){ // type dict $options['properties'] = $opt['properties']; } @@ -187,7 +187,6 @@ class image implements Core{ $this->app->setOutput("Error", "Image doesn't exist"); } else{ - echo 'toto'; $this->app->setOutput("Images", $image); } }catch(BadResponseError $e){ @@ -326,6 +325,7 @@ class image implements Core{ if($image == null){ // if the image don't exists -> error $this->app->setOutput("Error", "Image doesn't exist"); } + $image->reactivate(); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); -- cgit v1.2.3 From 19d84e2ae4c6710aac2236df4f135409ef519fc8 Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Sun, 27 Mar 2016 19:40:36 +0200 Subject: Update commentaries --- server/core/Automating.php | 15 +++++++---- server/core/ErrorManagement.php | 55 ++++++++++++++++++++++++++++++++++++++--- server/core/Image.php | 4 +-- 3 files changed, 64 insertions(+), 10 deletions(-) (limited to 'server/core/Image.php') diff --git a/server/core/Automating.php b/server/core/Automating.php index 2665541..065cf5e 100644 --- a/server/core/Automating.php +++ b/server/core/Automating.php @@ -1,11 +1,11 @@ {$action.""}(); } - + /** + * Create a new image on a new server + * + * @param $error the error triggered + * + * @return Image the new image created + */ private function createImageOnNewServer(){ try{ $image = new Image($this->app); @@ -87,9 +93,8 @@ class automating implements Core{ }catch(Exception $e){ $this->app->getErrorInstance()->OtherException($e); } + $this->app->setOutput("Auto", $res); } - - } ?> \ No newline at end of file diff --git a/server/core/ErrorManagement.php b/server/core/ErrorManagement.php index e7cb83e..be7080b 100755 --- a/server/core/ErrorManagement.php +++ b/server/core/ErrorManagement.php @@ -1,4 +1,13 @@ app = $args; } + /** + * Put an error message corresponding to a base error in the output + * + * @param $error the error triggered + * + * @return String BaseError message + */ public function BaseErrorHandler($error){ $this->app->setOutput("Error", "BaseError"); } + /** + * Put an error message corresponding to a bad response in function of the status code in the output + * + * @param $error the error triggered + * + * @return String Error message + */ public function BadResponseHandler($error){ $statusCode = $error->getResponse()->getStatusCode(); switch ($statusCode) { @@ -54,19 +83,39 @@ Class errorManagement{ } } + /** + * Put an error message corresponding to a not implemented yet error in the output + * + * @param $error the error triggered + * + * @return String internal error message + */ public function NotImplementedHandler($error){ $this->app->setOutput("Error", "Internal error (not implemented yet), please contact an administrator"); } + /** + * Put an error message corresponding to a user input error in the output + * + * @param $error the error triggered + * + * @return String User input error message + */ public function UserInputHandler($error){ $this->app->setOutput("Error", "UserInputError"); } + /** + * Put an error message corresponding to an other error in the output + * + * @param $error the error triggered + * + * @return String error message + */ public function OtherException($error){ $this->app->setOutput("Error", $error->getMessage()); } - } ?> diff --git a/server/core/Image.php b/server/core/Image.php index e9736a2..c595135 100755 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -5,7 +5,7 @@ * @version 1.0 Initialisation of this file * @since 1.0 Core application's file * -* @author Yogg 'yogg at epsina . com' +* @author Evan Pisani 'yogg at epsina . com' * * @todo Complete the functions with errors detection and finish the descriptions */ @@ -19,7 +19,7 @@ include("CoreInterface.php"); /** * Image Class of the back-end application * -* ADD CLASS DESCRIPTION +* Management of images * */ class image implements Core{ -- cgit v1.2.3 From a7bf9306d3844acd160034bb5c64e1ca7ef77ddc Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Sun, 3 Apr 2016 11:15:52 +0200 Subject: Test --- client/js/controllers/image/upload.js | 2 +- client/js/services/Image.js | 12 ++++++------ client/partials/image/upload.html | 14 +++++++++----- server/core/Image.php | 9 +++++---- server/vendor/php-opencloud/openstack | 2 +- 5 files changed, 22 insertions(+), 17 deletions(-) (limited to 'server/core/Image.php') diff --git a/client/js/controllers/image/upload.js b/client/js/controllers/image/upload.js index eca9406..d9587d0 100644 --- a/client/js/controllers/image/upload.js +++ b/client/js/controllers/image/upload.js @@ -56,5 +56,5 @@ mainApp.controller('uploadImageCtrl', ['$scope', 'Image', 'Loading', 'Identity', }; - + $scope.token=Identity.getToken(); }]); diff --git a/client/js/services/Image.js b/client/js/services/Image.js index d6c9fed..4947a1d 100644 --- a/client/js/services/Image.js +++ b/client/js/services/Image.js @@ -47,11 +47,11 @@ mainApp.factory('Image',[ '$http', 'Identity', function($http, Identity){ var uploadImage=function(fileToUpload, callback) { var form_data = new FormData(); form_data.append('file', fileToUpload); - console.log(fileToUpload) - form_data.append("task" , "image") - form_data.append("token" , Identity.getToken()) - form_data.append('action',"uploadImage") - form_data.append('id','6564') + console.log(fileToUpload); + form_data.append("task" , "image"); + form_data.append("token" , Identity.getToken()); + form_data.append('action',"uploadImage"); + form_data.append('id','6564'); form_data.append('file_name', fileToUpload); $.ajax({ @@ -68,7 +68,7 @@ mainApp.factory('Image',[ '$http', 'Identity', function($http, Identity){ processData:false, // To send DOMDocument or non processed data file it is set to false success: function(data) // A function to be called if request succeeds { - alert("success") + alert("success"); } }); diff --git a/client/partials/image/upload.html b/client/partials/image/upload.html index 72a8e01..3120fe9 100644 --- a/client/partials/image/upload.html +++ b/client/partials/image/upload.html @@ -12,11 +12,15 @@
- - - Choose a file to upload: - - +
+ + + + + + + +
diff --git a/server/core/Image.php b/server/core/Image.php index c595135..59f7aed 100755 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -389,8 +389,9 @@ class image implements Core{ private function uploadImage(){ $id = $this->app->getPostParam("id"); $file_name = $this->app->getPostParam("file_name"); - - + $file = $this->app->getPostParam("file"); + error_log(print_r($file, true), 0); + if(!isset($id)){ $this->app->setOutput("Error", "Incorrect id parameter"); } @@ -405,7 +406,7 @@ class image implements Core{ if($image == null){ // if the image don't exists -> error $this->app->setOutput("Error", "Image doesn't exist"); } - $stream = \GuzzleHttp\Psr7\stream_for(fopen($file_name, 'r')); + $stream = \GuzzleHttp\Psr7\stream_for($file); $image->uploadData($stream); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -684,4 +685,4 @@ class image implements Core{ } } -?> \ No newline at end of file +?> diff --git a/server/vendor/php-opencloud/openstack b/server/vendor/php-opencloud/openstack index 6162642..e140ef5 160000 --- a/server/vendor/php-opencloud/openstack +++ b/server/vendor/php-opencloud/openstack @@ -1 +1 @@ -Subproject commit 61626420361a1dab3ed6f9455e1057bda18cc335 +Subproject commit e140ef5ee8f47c5ffa126a581d9e03700a5cdc2f -- cgit v1.2.3 From aa26e5f959b0b38fa43035a700cc72b5ac85e7a3 Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Sun, 17 Apr 2016 11:44:32 +0200 Subject: modif upload --- server/core/Image.php | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'server/core/Image.php') diff --git a/server/core/Image.php b/server/core/Image.php index c595135..fdf4e3a 100755 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -224,7 +224,6 @@ class image implements Core{ } else{ try{ - //vérifier existence image $service = $this->libClass; $image = $service->getImage($id); if($image == null){ // if the image don't exists -> error @@ -276,8 +275,6 @@ class image implements Core{ * @return void */ private function deleteImage(){ - // si protected = true, demander de le mettre a false - // vérifier existence image $id = $this->app->getPostParam("id"); if(!isset($id)){ $this->app->setOutput("Error", "Image doesn't exist"); @@ -357,7 +354,6 @@ class image implements Core{ else { try{ - // vérifier existence image $service = $this->libClass; $image = $service->getImage($id); if($image == null){ // if the image don't exists -> error @@ -389,8 +385,9 @@ class image implements Core{ private function uploadImage(){ $id = $this->app->getPostParam("id"); $file_name = $this->app->getPostParam("file_name"); - - + $file = $this->app->getPostParam("file"); + error_log(print_r($file, true), 0); + if(!isset($id)){ $this->app->setOutput("Error", "Incorrect id parameter"); } @@ -399,13 +396,12 @@ class image implements Core{ } else{ try{ - // vérifier existence image $service = $this->libClass; $image = $service->getImage($id); if($image == null){ // if the image don't exists -> error $this->app->setOutput("Error", "Image doesn't exist"); } - $stream = \GuzzleHttp\Psr7\stream_for(fopen($file_name, 'r')); + $stream = \GuzzleHttp\Psr7\stream_for($file); $image->uploadData($stream); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -436,7 +432,6 @@ class image implements Core{ } else{ try{ - // vérifier existence image $service = $this->libClass; $image = $service->getImage($id); if($image == null){ // if the image don't exists -> error @@ -520,7 +515,6 @@ class image implements Core{ } else{ try{ - // vérifier existence image $service = $this->libClass; $image = $service->getImage($image_id); if($image == null){ // if the image don't exists -> error -- cgit v1.2.3 From 5263cf00a253891396c442fe5be29762fb8be50d Mon Sep 17 00:00:00 2001 From: EoleDev Date: Tue, 26 Apr 2016 20:42:31 +0200 Subject: Refactoring of comments beginning --- server/config.inc.php | 22 +- server/core/App.php | 164 +++- server/core/Automating.php | 9 +- server/core/Compute.php | 550 +++++------ server/core/CoreInterface.php | 10 +- server/core/ErrorManagement.php | 66 +- server/core/Identity.php | 1413 ++++++++++----------------- server/core/Image.php | 222 ++--- server/core/LibOverride/genTokenOptions.php | 104 +- server/core/Network.php | 318 +++--- server/core/NetworkLayer3.php | 156 +-- server/index.php | 136 +-- server/init.php | 89 +- 13 files changed, 1525 insertions(+), 1734 deletions(-) (limited to 'server/core/Image.php') diff --git a/server/config.inc.php b/server/config.inc.php index aa10504..4a4e494 100755 --- a/server/config.inc.php +++ b/server/config.inc.php @@ -1,11 +1,21 @@ diff --git a/server/core/App.php b/server/core/App.php index 114d945..3a027d7 100755 --- a/server/core/App.php +++ b/server/core/App.php @@ -1,21 +1,53 @@ tokenPost = NULL; @@ -27,6 +59,13 @@ class App{ } + /** + * Set the class var $tokenPost and load the token + * into the genTokenOptions Class + * + * @param String $token token to be set + * + */ public function setToken($token){ $this->tokenPost = $token; @@ -34,42 +73,59 @@ class App{ } + /** + * Check the expiration of the token + * + * @return Boolean if the token is not expired + */ public function checkToken(){ return $this->tokenClass->checkToken(); } + /** + * Get the service Class given the name in parameter + * + * @param String $service Name of the service + * + * @return Core object + */ public function getLibClass($service){ switch($service){ - case "Identity": - if($this->tokenPost == NULL) $this->tokenClass->genIdentityToken(); - $opt = $this->tokenClass->getOptions($service); - return $this->openstack->identityV3($opt); - break; - case "Image": - if($this->tokenPost == NULL) $this->tokenClass->genImageToken(); - $opt = $this->tokenClass->getOptions($service); - return $this->openstack->imagesV2($opt); - break; - case "Network": - if($this->tokenPost == NULL) $this->tokenClass->genNetworkToken(); - $opt = $this->tokenClass->getOptions($service); - return $this->openstack->networkingV2($opt); - break; - case "Compute": - if($this->tokenPost == NULL) $this->tokenClass->genComputeToken(); - $opt = $this->tokenClass->getOptions($service); - return $this->openstack->computeV2($opt); - break; - case "NetworkLayer3": - if($this->tokenPost == NULL) $this->tokenClass->genNetworkToken(); - $opt = $this->tokenClass->getOptions('Network'); - return $this->openstack->networkingV2ExtLayer3($opt); - break; + case "Identity": + if($this->tokenPost == NULL) $this->tokenClass->genIdentityToken(); + $opt = $this->tokenClass->getOptions($service); + return $this->openstack->identityV3($opt); + break; + case "Image": + if($this->tokenPost == NULL) $this->tokenClass->genImageToken(); + $opt = $this->tokenClass->getOptions($service); + return $this->openstack->imagesV2($opt); + break; + case "Network": + if($this->tokenPost == NULL) $this->tokenClass->genNetworkToken(); + $opt = $this->tokenClass->getOptions($service); + return $this->openstack->networkingV2($opt); + break; + case "Compute": + if($this->tokenPost == NULL) $this->tokenClass->genComputeToken(); + $opt = $this->tokenClass->getOptions($service); + return $this->openstack->computeV2($opt); + break; + case "NetworkLayer3": + if($this->tokenPost == NULL) $this->tokenClass->genNetworkToken(); + $opt = $this->tokenClass->getOptions('Network'); + return $this->openstack->networkingV2ExtLayer3($opt); + break; } } + /** + * Generate the token for the different services in OpenStack + * + * @return NULL + */ public function authenticate(){ try{ @@ -81,16 +137,21 @@ class App{ $this->setOutput("token", $this->tokenClass->getBackup()); }catch(BadResponseError $e){ $this->errorClass->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->errorClass->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->errorClass->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->errorClass->NotImplementedHandler($e); - } + } } + /** + * Revoke the openstack services' token + * + * @return NULL + */ public function deauthenticate(){ try{ @@ -103,16 +164,23 @@ class App{ $this->setOutput("deauthenticate", "Ok"); }catch(BadResponseError $e){ $this->errorClass->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->errorClass->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->errorClass->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->errorClass->NotImplementedHandler($e); - } + } } + /** + * Retrieve a post parameter given its name + * + * @param String $name Expected post parameter's name + * + * @return Object Post value + */ public function getPostParam($name){ if(isset($this->postParams[$name])){ @@ -123,28 +191,52 @@ class App{ } - + /** + * Set a post parameter for automating task + * + * @param String $param Name for the Post entry + * @param Object $value Value for the Post entry + * + * @return NULL + */ public function setPostParam($param, $value){ $this->postParams[$param] = $value; - + } + /** + * Set a new output message + * + * @param String $key Array key for the message + * @param Array $out Message's value + * + * @return NULL + */ public function setOutput($key, $out){ $this->output[$key] = $out; } + /** + * Retrieve the errorManagement instance Object + * + * @return errorManagement object + */ public function getErrorInstance(){ return $this->errorClass; } + /** + * Output the messages to be send to the client + * + * @return NULl + */ public function show(){ echo json_encode($this->output); - //error_log(var_dump(json_encode($this->output), true), 0); } } diff --git a/server/core/Automating.php b/server/core/Automating.php index fb42702..2d8db00 100755 --- a/server/core/Automating.php +++ b/server/core/Automating.php @@ -5,9 +5,8 @@ * @version 1.0 Initialisation of this file * @since 1.0 Core application's file * -* @author Evan Pisani 'yogg at epsina . com' et bhupi +* @author Evan Pisani 'yogg at epsina . com', bhupi * -* @todo Complete the functions with errors detection and finish the descriptions */ include("Image.php"); @@ -44,10 +43,10 @@ class automating{ * * @param String $action name of another function of this class * - * @return void + * @return NULL */ public function action($action){ - $this->{$action.""}(); + $this->{$action.""}(); } /** @@ -58,7 +57,7 @@ class automating{ * @param String $serverName name ofthe new server * @param String $flavor kind of server * - * @return void + * @return NULL */ private function createPublicServer() { diff --git a/server/core/Compute.php b/server/core/Compute.php index 4a7fe6c..e466b52 100755 --- a/server/core/Compute.php +++ b/server/core/Compute.php @@ -4,170 +4,170 @@ use OpenCloud\Common\Error; class compute { - /** @var App $app protected, contains the main app object */ - protected $app; + /** @var App $app protected, contains the main app object */ + protected $app; - /** @var OpenStack\Identity $libClass protected, contains the library Compute object */ - protected $libClass; + /** @var OpenStack\Identity $libClass protected, contains the library Compute object */ + 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 * * @param String $action name of another function of this class * - * @return void + * @return NULL */ public function action($action){ - $this->{$action.""}(); + $this->{$action.""}(); } - /** - * List servers. - * @return array - */ - public function listServers() - { + /** + * List servers. + * @return array + */ + 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; + $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); - } + } 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; - } - /** - * List flavors. - * @return array - */ - public function listFlavors() - { + } + return; + } + /** + * List flavors. + * @return array + */ + 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; - } - $this->app->setOutput("Flavors", $flavors); + $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); } 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; - } - /** - * List images. - * @return array - */ - public function listImages() - { - try{ + } + return; + } + /** + * List images. + * @return array + */ + 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; - } - $this->app->setOutput("Images", $images); + $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); } 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; - } - /** - * Get server details. - * @return array - */ - public function getServer() - { - try{ + } + return; + } + /** + * Get server details. + * @return array + */ + public function getServer() + { + try{ $serverId = $this->app->getPostParam("serverId"); if(!isset($serverId)){ $this->app->setOutput("Error", "Server ID is missing!"); @@ -180,27 +180,27 @@ class compute } 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; - } - /** - * Get flavor details. - * @return array - */ - public function getFlavor() - { + } + return; + } + /** + * Get flavor details. + * @return array + */ + public function getFlavor() + { try{ $flavorId = $this->app->getPostParam("flavorId"); if(!isset($serverId)){ @@ -214,27 +214,27 @@ class compute } 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; - } - /** - * Get image details. - * @return array - */ - public function getImage() - { + } + return; + } + /** + * Get image details. + * @return array + */ + public function getImage() + { try{ $imageId = $this->app->getPostParam("imageId"); if(!isset($serverId)){ @@ -248,27 +248,27 @@ class compute } 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; - } - /** - * Create server. - * @return array - */ - public function createServer() - { + } + return; + } + /** + * Create server. + * @return array + */ + public function createServer() + { try{ $name = $this->app->getPostParam("name"); $imageId = $this->app->getPostParam("imageId"); @@ -282,28 +282,28 @@ class compute } 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; - } - + } + /** * update a server - * @return void + * @return NULL */ - public function updateServer() - { + public function updateServer() + { try{ $serverId = $this->app->getPostParam("serverId"); $newName = $this->app->getPostParam("newName"); @@ -329,27 +329,27 @@ class compute } 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; - } + } + return; + } /** * Delete a server - * @return void + * @return NULL */ - public function deleteServer() - { + public function deleteServer() + { try{ $serverId = $this->app->getPostParam("serverId"); if(!isset($serverId)){ @@ -363,27 +363,27 @@ class compute } 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; - } + } + return; + } /** * Change the password of a server - * @return void + * @return NULL */ - public function changePassword() - { + public function changePassword() + { try{ $serverId = $this->app->getPostParam("serverId"); $password = $this->app->getPostParam("newPassword"); @@ -398,27 +398,27 @@ class compute } 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; - } - /** + } + /** * Reboot a server - * @return void + * @return NULL */ - public function reboot() - { + public function reboot() + { try{ $serverId = $this->app->getPostParam("serverId"); if(!isset($serverId)){ @@ -432,74 +432,74 @@ class compute } 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; - } - /** + } + return; + } + /** * Rebuild a server - * @return void + * @return NULL */ - public function rebuild() - { - $serverId = $this->app->getPostParam("serverId"); - $imageId = $this->app->getPostParam("imageId"); - $newName = $this->app->getPostParam("newName"); - $adminPass = $this->app->getPostParam("adminPass"); + public function rebuild() + { + $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; - 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; + 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."); } - $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); + } + 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; } - 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; - } - } - /** + } + /** * Resize a server * A call to this method has to be followed by either confirmResize or revertResize - * @return void + * @return NULL */ - public function resize() - { + public function resize() + { try{ $serverId = $this->app->getPostParam("serverId"); $newFlavorId = $this->app->getPostParam("newFlavorId"); @@ -513,27 +513,27 @@ class compute } 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; - } - /** + } + return; + } + /** * Confirm resize operation on a server - * @return void + * @return NULL */ - public function confirmResize() - { + public function confirmResize() + { try{ $serverId = $this->app->getPostParam("serverId"); if(!isset($serverId)){ @@ -547,27 +547,27 @@ class compute } 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; - } - /** + } + return; + } + /** * Revert resize operation on a server - * @return void + * @return NULL */ - public function revertResize() - { + public function revertResize() + { try{ $serverId = $this->app->getPostParam("serverId"); if(!isset($serverId)){ @@ -581,28 +581,28 @@ class compute } 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; - } + } + return; + } /** * List private and public addresses of a server - * @return void + * @return NULL */ - - public function listAddresses(array $options = []) - { + + public function listAddresses(array $options = []) + { try{ $serverId = $this->app->getPostParam("serverId"); if(!isset($serverId)){ @@ -616,20 +616,20 @@ class compute } 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; - } + } + return; + } } - + diff --git a/server/core/CoreInterface.php b/server/core/CoreInterface.php index ed0d959..6c2313b 100755 --- a/server/core/CoreInterface.php +++ b/server/core/CoreInterface.php @@ -1,5 +1,13 @@ app->setOutput("Error", "BaseError"); @@ -46,49 +46,49 @@ Class errorManagement{ /** * Put an error message corresponding to a bad response in function of the status code in the output * - * @param $error the error triggered + * @param Exception $error the exception triggered * - * @return String Error message + * @return NULL */ public function BadResponseHandler($error){ $statusCode = $error->getResponse()->getStatusCode(); switch ($statusCode) { - case 400: - $this->app->setOutput("Error", "Invalid input."); - break; + case 400: + $this->app->setOutput("Error", "Invalid input."); + break; - case 401: - $this->app->setOutput("Error", "Authentification failed."); - break; + case 401: + $this->app->setOutput("Error", "Authentification failed."); + break; - case 403: - $this->app->setOutput("Error", "Operation forbidden."); - break; + case 403: + $this->app->setOutput("Error", "Operation forbidden."); + break; - case 404: - $this->app->setOutput("Error", "Ressource not found."); - break; + case 404: + $this->app->setOutput("Error", "Ressource not found."); + break; - case 500: - $this->app->setOutput("Error", "Internal server error, please contact an administrator."); - break; + case 500: + $this->app->setOutput("Error", "Internal server error, please contact an administrator."); + break; - case 503: - $this->app->setOutput("Error", "Service unvailable for the moment."); - break; + case 503: + $this->app->setOutput("Error", "Service unvailable for the moment."); + break; - default: - $this->app->setOutput("Error", "Unknow error, please contact an administrator."); - break; + default: + $this->app->setOutput("Error", "Unknow error, please contact an administrator."); + break; } } /** * Put an error message corresponding to a not implemented yet error in the output * - * @param $error the error triggered + * @param Exception $error the exception triggered * - * @return String internal error message + * @return NULL */ public function NotImplementedHandler($error){ $this->app->setOutput("Error", "Internal error (not implemented yet), please contact an administrator"); @@ -97,9 +97,9 @@ Class errorManagement{ /** * Put an error message corresponding to a user input error in the output * - * @param $error the error triggered + * @param Exception $error the exception triggered * - * @return String User input error message + * @return NULL */ public function UserInputHandler($error){ $this->app->setOutput("Error", "UserInputError"); @@ -108,9 +108,9 @@ Class errorManagement{ /** * Put an error message corresponding to an other error in the output * - * @param $error the error triggered + * @param Exception $error the exception triggered * - * @return String error message + * @return NULL */ public function OtherException($error){ $this->app->setOutput("Error", $error->getMessage()); diff --git a/server/core/Identity.php b/server/core/Identity.php index 464522a..f6179b0 100755 --- a/server/core/Identity.php +++ b/server/core/Identity.php @@ -7,15 +7,13 @@ * * @author Eole 'eoledev at outlook . fr' * -* @todo Complete the functions and finish the descriptions */ use OpenCloud\Common\Error; - + /** * Identity Class of the back-end application * -* This class allow the communication between the front-end application and -* the library which allow to send requests to an Openstack instance. +* This class implements the management for the identity request * */ class identity implements Core{ @@ -31,8 +29,6 @@ class identity implements Core{ * * @param App $app the main app object * - * @throws [Type] [] - * * @return identity */ public function __construct($app){ @@ -47,11 +43,11 @@ class identity implements Core{ * * @param String $action name of another function of this class * - * @return void + * @return NULL */ public function action($action){ - $this->{$action.""}(); + $this->{$action.""}(); } /** @@ -65,7 +61,7 @@ class identity implements Core{ * @param String $type Required Type of credential : ec2, cert... * @param String $userId Required Id of the user which own the credential * - * @return void + * @return NULL */ private function addCredential(){ @@ -88,22 +84,22 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * List the credentials for a given user. * - * @return void + * @return NULL */ private function listCredentials(){ try{ @@ -114,15 +110,15 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } @@ -131,7 +127,7 @@ class identity implements Core{ * * @param String $credentialId Required credential id for which it retrieve the details * - * @return void + * @return NULL */ private function showCredential(){ $credentId = $this->app->getPostParam("credentialId"); @@ -149,15 +145,15 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } @@ -168,7 +164,7 @@ class identity implements Core{ * @param JsonString $blob Required credentials information with this structure for ec2: "{\"access\":\"181920\",\"secret\":\"secretKey\"}" * @param String $type Required Type of credential : ec2, cert... * - * @return void + * @return NULL */ private function updateCredential(){ @@ -194,15 +190,15 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** @@ -210,7 +206,7 @@ class identity implements Core{ * * @param String $credentialId Required credential id to delete * - * @return void + * @return NULL */ private function deleteCredential(){ @@ -229,16 +225,16 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } - + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } + }- /** @@ -248,7 +244,7 @@ class identity implements Core{ * @param String $enabled Optional Domain enabled or not : value true or false * @param String $name Required Domain Name * - * @return void + * @return NULL */ private function addDomain(){ @@ -262,13 +258,13 @@ class identity implements Core{ } if(isset($enabled) && isset($description)) - $opt = array('description' => $description, 'enabled' => $enabled, 'name' => $name); + $opt = array('description' => $description, 'enabled' => $enabled, 'name' => $name); elseif(isset($enabled)) - $opt = array('enabled' => $enabled, 'name' => $name); + $opt = array('enabled' => $enabled, 'name' => $name); elseif(isset($description)) - $opt = array('description' => $description, 'name' => $name); + $opt = array('description' => $description, 'name' => $name); else - $opt = array('name' => $name); + $opt = array('name' => $name); try{ @@ -278,22 +274,22 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Retrieve the different domain's list. * - * @return void + * @return NULL */ private function listDomains(){ @@ -305,15 +301,15 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } @@ -322,7 +318,7 @@ class identity implements Core{ * * @param String $domainId Required Domain id for which it retrieve the details * - * @return void + * @return NULL */ private function showDomain(){ @@ -341,15 +337,15 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** @@ -360,7 +356,7 @@ class identity implements Core{ * @param String $enabled Optional Domain enabled or not : value true or false * @param String $name Required Domain Name * - * @return void + * @return NULL */ private function updateDomain(){ @@ -374,17 +370,17 @@ class identity implements Core{ return; } - + try{ $domain = $this->libClass->getDomain($domId); if(isset($name)) - $domain->name = $name; + $domain->name = $name; if(isset($enabled)) - $domain->enabled = $enabled; + $domain->enabled = $enabled; if(isset($description)) - $domain->description = $description; + $domain->description = $description; $domain->update(); @@ -392,15 +388,15 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** @@ -408,7 +404,7 @@ class identity implements Core{ * * @param String $domainId Required Domain id to delete * - * @return void + * @return NULL */ private function deleteDomain(){ @@ -427,23 +423,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Retrieve the different roles of a given user in a domain. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function listRolesDomainUser(){ @@ -464,23 +458,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Grant a role to a given user in a domain. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function grantRoleDomainUser(){ $domId = $this->app->getPostParam("domainId"); @@ -496,31 +488,29 @@ class identity implements Core{ $domain = $this->libClass->getDomain($domId); $domain->grantUserRole([ - 'userId' => $userId, - 'roleId' => $roleId, + 'userId' => $userId, + 'roleId' => $roleId, ]); //TODO parse answer }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Verify that a user has a given role in a domain. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function checkRoleDomainUser(){ $domId = $this->app->getPostParam("domainId"); @@ -545,23 +535,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Delete a role for a given user in a domain. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function revokeRoleDomainUser(){ $domId = $this->app->getPostParam("domainId"); @@ -577,31 +565,29 @@ class identity implements Core{ $domain = $this->libClass->getDomain($domId); $domain->revokeUserRole([ - 'userId' => $userId, - 'roleId' => $roleId, + 'userId' => $userId, + 'roleId' => $roleId, ]); //TODO parse answer }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Retrieve the roles of a given group in a domain. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function listRolesDomainGroup(){ $domId = $this->app->getPostParam("domainId"); @@ -622,23 +608,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Add a role to a given group in a domain. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function grantRoleDomainGroup(){ $domId = $this->app->getPostParam("domainId"); @@ -654,31 +638,29 @@ class identity implements Core{ $domain = $this->libClass->getDomain($domId); $domain->grantGroupRole([ - 'groupId' => $groupId, - 'roleId' => $roleId, + 'groupId' => $groupId, + 'roleId' => $roleId, ]); //TODO parse answer }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Verify that a role is associated with a given group in a domain. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function checkRoleDomainGroup(){ $domId = $this->app->getPostParam("domainId"); @@ -703,29 +685,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Delete a role for a given group in a domain. * - * A *description*, that can span multiple lines, to go _in-depth_ into the details of this element - * and to provide some background information or textual references. - * - * @param string $myArgument With a *description* of this argument, these may also - * span multiple lines. - * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function revokeRoleDomainGroup(){ $domId = $this->app->getPostParam("domainId"); @@ -741,8 +715,8 @@ class identity implements Core{ $domain = $this->libClass->getDomain($roleId); $domain->revokeGroupRole([ - 'groupId' => $groupId, - 'roleId' => $roleId, + 'groupId' => $groupId, + 'roleId' => $roleId, ]); @@ -750,23 +724,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Add an endpoint to the Openstack instance * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function addEndpoint(){ $servId = $this->app->getPostParam("serviceId"); @@ -781,34 +753,32 @@ class identity implements Core{ try{ $endpoint = $this->libClass->createEndpoint([ - 'interface' => \OpenStack\Identity\v3\Enum::INTERFACE_INTERNAL, - 'name' => $name, - 'region' => $region, - 'url' => $url, - 'serviceId' => $servId + 'interface' => \OpenStack\Identity\v3\Enum::INTERFACE_INTERNAL, + 'name' => $name, + 'region' => $region, + 'url' => $url, + 'serviceId' => $servId ]); //TODO parse answer }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Retrieve the endpoint for the given id * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function getEndpoint(){ @@ -826,24 +796,24 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Retrieve the list of the different endpoints * - * @return void + * @return NULL */ private function listEndpoints(){ - + try{ $res = $this->libClass->listEndpoints(); @@ -852,64 +822,30 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Update a given endpoint * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function updateEndpoint(){ //Not Implemented Yet - - /*$domId = $this->app->getPostParam("domainId"); - $groupId = $this->app->getPostParam("groupId"); - - if(!isset($domId) || !isset($groupId)){ - - } - - //TODO PARAMETERS - try{ - - $endpoint = $this->libClass->getEndpoint('{endpointId}'); - - $endpoint->interface = \OpenStack\Identity\v3\Enum::INTERFACE_PUBLIC; - - $endpoint->update(); - - //TODO parse answer - - }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); - }*/ } /** * Delete a given endpoint * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function deleteEndpoint(){ $endId = $this->app->getPostParam("endpointId"); @@ -927,129 +863,48 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Add a group. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function addGroup(){ //Not Implemented Yet - - /*$domId = $this->app->getPostParam("domainId"); - $groupId = $this->app->getPostParam("groupId"); - - if(!isset($domId) || !isset($groupId)){ - - } - try{ - - $this->libClass->listCredentials() - - //TODO parse answer - - }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); - }*/ } /** * Retrieve the group's list. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function listGroups(){ //Not Implemented Yet - /* - $domId = $this->app->getPostParam("domainId"); - $groupId = $this->app->getPostParam("groupId"); - - if(!isset($domId) || !isset($groupId)){ - - } - try{ - - $this->libClass->listCredentials() - - //TODO parse answer - - }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); - }*/ } /** * Retrieve the details of a given group. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function showGroup(){ //Not Implemented Yet - - /* - $domId = $this->app->getPostParam("domainId"); - $groupId = $this->app->getPostParam("groupId"); - - if(!isset($domId) || !isset($groupId)){ - - } - try{ - - $this->libClass->listCredentials() - - //TODO parse answer - - }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); - }*/ } /** * Update a given group. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function updateGroup(){ //Todo Argument Optional @@ -1066,9 +921,9 @@ class identity implements Core{ $group = $this->libClass->getGroup($groupId); if(isset($description)) - $group->description = 'foo'; + $group->description = 'foo'; if(isset($name)) - $group->name = 'bar'; + $group->name = 'bar'; $group->update(); @@ -1076,23 +931,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Delete the given group. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function deleteGroup(){ @@ -1112,23 +965,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Retrieve the users of a given group. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function listGroupUsers(){ @@ -1148,23 +999,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Add a user to a group. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function addGroupUser(){ @@ -1185,23 +1034,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Remove a user from a given group. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function removeGroupUser(){ @@ -1222,23 +1069,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Check if a group contains a given user. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function checkGroupUser(){ @@ -1259,199 +1104,67 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * @todo * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function addPolicies(){ //Not Implemented Yet - /* - $domId = $this->app->getPostParam("domainId"); - $groupId = $this->app->getPostParam("groupId"); - - if(!isset($domId) || !isset($groupId)){ - - } - try{ - - $this->libClass->listCredentials() - - //TODO parse answer - - }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); - }*/ } /** * @todo * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function listPolicies(){ //Not Implemented Yet - /* - $domId = $this->app->getPostParam("domainId"); - $groupId = $this->app->getPostParam("groupId"); - - if(!isset($domId) || !isset($groupId)){ - - } - try{ - - $this->libClass->listCredentials() - - //TODO parse answer - - }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); - }*/ } /** * @todo * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function showPolicie(){ //Not Implemented Yet - /* - $domId = $this->app->getPostParam("domainId"); - $groupId = $this->app->getPostParam("groupId"); - - if(!isset($domId) || !isset($groupId)){ - - } - try{ - - $this->libClass->listCredentials() - - //TODO parse answer - - }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); - }*/ } /** * @todo * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function updatePolicies(){ //Not Implemented Yet - /* - $domId = $this->app->getPostParam("domainId"); - $groupId = $this->app->getPostParam("groupId"); - - if(!isset($domId) || !isset($groupId)){ - - } - try{ - - $this->libClass->listCredentials() - - //TODO parse answer - - }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); - }*/ } /** * @todo * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function deletePolicies(){ //Not Implemented Yet - /* - $domId = $this->app->getPostParam("domainId"); - $groupId = $this->app->getPostParam("groupId"); - - if(!isset($domId) || !isset($groupId)){ - - } - try{ - - $this->libClass->listCredentials() - - //TODO parse answer - - }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); - }*/ } /** * Add a project. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function addProject(){ //Todo Parameters Optional @@ -1465,30 +1178,30 @@ class identity implements Core{ try{ $project = $this->libClass->createProject([ - 'description' => $description, - 'enabled' => true, - 'name' => $name + 'description' => $description, + 'enabled' => true, + 'name' => $name ]); //TODO parse answer }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Retrieve the different projects. * - * @return void + * @return NULL */ private function listProjects(){ @@ -1500,23 +1213,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Retrieve the details of a given project. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function showProject(){ @@ -1535,23 +1246,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Update a given project. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function updateProject(){ //Todo Parameters Optionnal @@ -1577,23 +1286,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Delete a given project. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function deleteProject(){ $projId = $this->app->getPostParam("projId"); @@ -1612,23 +1319,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * List the roles of a given user in a project. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function listRolesProjectUser(){ @@ -1649,25 +1354,23 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Grant a role to an user in a project. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function grantRoleProjectUser(){ @@ -1684,31 +1387,29 @@ class identity implements Core{ $project = $this->libClass->getProject($projId); $project->grantUserRole([ - 'userId' => $userId, - 'roleId' => $roleId, + 'userId' => $userId, + 'roleId' => $roleId, ]); //TODO parse answer }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Check if a given user has a role in a project. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function checkRoleProjectUser(){ $projId = $this->app->getPostParam("projetId"); @@ -1724,8 +1425,8 @@ class identity implements Core{ $project = $this->libClass->getProject($projId); $result = $project->checkUserRole([ - 'userId' => $userId, - 'roleId' => $roleId, + 'userId' => $userId, + 'roleId' => $roleId, ]); /*if (true === $result) { @@ -1735,23 +1436,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Delete a role for a given user in a project. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function revokeRoleProjectUser(){ @@ -1768,31 +1467,29 @@ class identity implements Core{ $project = $this->libClass->getProject($projId); $project->revokeUserRole([ - 'userId' => $userId, - 'roleId' => $roleId, + 'userId' => $userId, + 'roleId' => $roleId, ]); //TODO parse answer }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * List the roles of a group in a project. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function listRolesProjectGroup(){ @@ -1803,7 +1500,7 @@ class identity implements Core{ if(!isset($projId) || !isset($groupId)){ } - + try{ $project = $this->libClass->getProject($projId); @@ -1814,23 +1511,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Add a role to a group in a project. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function grantRoleProjectGroup(){ @@ -1841,37 +1536,35 @@ class identity implements Core{ if(!isset($projId) || !isset($userId) || !isset($roleId)){ } - + try{ $project = $this->libClass->getProject($projId); $project->grantUserRole([ - 'userId' => $userId, - 'roleId' => $roleId, + 'userId' => $userId, + 'roleId' => $roleId, ]); //TODO parse answer }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Check if a group has a given role in a project. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function checkRoleProjectGroup(){ @@ -1888,8 +1581,8 @@ class identity implements Core{ $project = $this->libClass->getProject($projId); $result = $project->checkGroupRole([ - 'groupId' => $groupId, - 'roleId' => $roleId, + 'groupId' => $groupId, + 'roleId' => $roleId, ]); /*if (true === $result) { @@ -1898,23 +1591,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Delete a role for a group in a project. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function revokeRoleProjectGroup(){ @@ -1931,31 +1622,29 @@ class identity implements Core{ $project = $this->libClass->getProject($projId); $project->revokeGroupRole([ - 'groupId' => $groupId, - 'roleId' => $roleId, + 'groupId' => $groupId, + 'roleId' => $roleId, ]); //TODO parse answer }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Add a role. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function addRole(){ @@ -1968,28 +1657,28 @@ class identity implements Core{ try{ $role = $this->libClass->createRole([ - 'name' => $name, + 'name' => $name, ]); //TODO parse answer }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * List the different roles * - * @return void + * @return NULL */ private function listRoles(){ @@ -2001,21 +1690,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** - * @todo + * List the different assignments for a given role * - * @return void + * @return NULL */ private function listRoleAssignements(){ @@ -2027,23 +1716,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Add a service. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function addService(){ $name = $this->app->getPostParam("name"); @@ -2056,29 +1743,29 @@ class identity implements Core{ try{ $service = $this->libClass->createService([ - 'name' => $name, - 'type' => $type, + 'name' => $name, + 'type' => $type, ]); //TODO parse answer }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Retrieve the different services. * - * @return void + * @return NULL */ private function listServices(){ @@ -2090,23 +1777,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Retrieve the details for a given service. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function showService(){ $servId = $this->app->getPostParam("serviceId"); @@ -2123,23 +1808,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Delete a given service. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function deleteService(){ @@ -2159,23 +1842,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Generate a new token for a given user id. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function genTokenUserID(){ @@ -2189,33 +1870,31 @@ class identity implements Core{ try{ $token = $this->libClass->generateToken([ - 'user' => [ - 'id' => $userId, - 'password' => $userPass - ] + 'user' => [ + 'id' => $userId, + 'password' => $userPass + ] ]); //TODO parse answer }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Generate a new token for a given user name. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function genTokenUserName(){ $username = $this->app->getPostParam("username"); @@ -2230,36 +1909,34 @@ class identity implements Core{ try{ $token = $this->libClass->generateToken([ - 'user' => [ - 'name' => $username, - 'password' => $userPass, - 'domain' => [ - 'id' => $domId - ] - ] + 'user' => [ + 'name' => $username, + 'password' => $userPass, + 'domain' => [ + 'id' => $domId + ] + ] ]); //TODO parse answer }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Generate a new token from another token ID. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function genTokenID(){ @@ -2273,31 +1950,29 @@ class identity implements Core{ try{ $token = $this->libClass->generateToken([ - 'tokenId' => $tokenId, - 'scope' => ['project' => ['id' => $projectId]] + 'tokenId' => $tokenId, + 'scope' => ['project' => ['id' => $projectId]] ]); //TODO parse answer }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Generate a new token scoped by a project ID. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function genTokenScopedProjectID(){ @@ -2312,36 +1987,34 @@ class identity implements Core{ try{ $token = $this->libClass->generateToken([ - 'user' => [ - 'id' => $userId, - 'password' => $userPass - ], - 'scope' => [ - 'project' => ['id' => $projId] - ] + 'user' => [ + 'id' => $userId, + 'password' => $userPass + ], + 'scope' => [ + 'project' => ['id' => $projId] + ] ]); //TODO parse answer }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Generate a new token scoped by a project name. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function genTokenScopedProjectName(){ @@ -2357,41 +2030,39 @@ class identity implements Core{ try{ $token = $this->libClass->generateToken([ - 'user' => [ - 'id' => $userId, - 'password' => $userPass - ], - 'scope' => [ - 'project' => [ - 'name' => $projName, - 'domain' => [ - 'id' => $domId - ] - ] - ] + 'user' => [ + 'id' => $userId, + 'password' => $userPass + ], + 'scope' => [ + 'project' => [ + 'name' => $projName, + 'domain' => [ + 'id' => $domId + ] + ] + ] ]); //TODO parse answer }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Check if a token is validate. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function validateToken(){ @@ -2413,23 +2084,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Delete a given token. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function revokeToken(){ @@ -2447,23 +2116,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Add a new user. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function addUser(){ //Todo Optionnal Parameter @@ -2475,40 +2142,40 @@ class identity implements Core{ $domId = $this->app->getPostParam("domId"); if(!isset($domId) || !isset($groupId)){ - + } try{ $user = $this->libClass->createUser([ - 'defaultProjectId' => $projId, - 'description' => $desc, - 'domainId' => $domId, - 'email' => $email, - 'enabled' => true, - 'name' => $name, - 'password' => $pass + 'defaultProjectId' => $projId, + 'description' => $desc, + 'domainId' => $domId, + 'email' => $email, + 'enabled' => true, + 'name' => $name, + 'password' => $pass ]); //TODO parse answer }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Retrieve the different users. * - * @return void + * @return NULL */ private function listUsers(){ @@ -2520,23 +2187,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Retrieve the details of a given user. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function showUser(){ @@ -2555,23 +2220,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Update a given user. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function updateUser(){ @@ -2596,23 +2259,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Delete a given user. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function deleteUser(){ @@ -2631,23 +2292,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Retrieve the groups which contains a given user. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function listUserGroups(){ @@ -2667,23 +2326,21 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** * Retrieve the projects which contains a given user. * - * @throws [Type] [] - * - * @return void + * @return NULL */ private function listUserProjects(){ @@ -2703,14 +2360,14 @@ class identity implements Core{ }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } } diff --git a/server/core/Image.php b/server/core/Image.php index 334fce4..d930962 100755 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -51,10 +51,10 @@ class image implements Core{ * * @param String $action name of another function of this class * - * @return void + * @return NULL */ public function action($action){ - $this->{$action.""}(); + $this->{$action.""}(); } /** @@ -78,13 +78,13 @@ class image implements Core{ if(isset($opt['name'])){ $imagesList = $this->listImage(); if(isset($imagesList)){ - foreach($imagesList as $image){ - if(strcmp($image->name, $opt['name']) == 0){ // if the image name already exists -> error - $this->app->setOutput("Error", "Image name already exists"); - } - } - } - $options['name'] = $opt['name']; + foreach($imagesList as $image){ + if(strcmp($image->name, $opt['name']) == 0){ // if the image name already exists -> error + $this->app->setOutput("Error", "Image name already exists"); + } + } + } + $options['name'] = $opt['name']; } else{ $this->app->setOutput("Error", "Missing parameter 'name' for the new image"); @@ -125,15 +125,15 @@ class image implements Core{ $image = $this->libClass->createImage($options); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } $this->app->setOutput("Images", $image); } @@ -152,15 +152,15 @@ class image implements Core{ } }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } $this->app->setOutput("Images", $result); @@ -191,16 +191,16 @@ class image implements Core{ } }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } + } } /** @@ -254,15 +254,15 @@ class image implements Core{ $image->update($options); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } $this->app->setOutput("Images", $image); } } @@ -272,7 +272,7 @@ class image implements Core{ * * @param String $id Identifier of the image * - * @return void + * @return NULL */ private function deleteImage(){ $id = $this->app->getPostParam("id"); @@ -289,16 +289,16 @@ class image implements Core{ $image->delete(); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } + } } /** @@ -306,7 +306,7 @@ class image implements Core{ * * @param String $id Identifier of the image * - * @return void + * @return NULL */ private function reactivateImage(){ $id = $this->app->getPostParam("id"); @@ -326,16 +326,16 @@ class image implements Core{ $image->reactivate(); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } + } } /** @@ -343,7 +343,7 @@ class image implements Core{ * * @param String $id Identifier of the image * - * @return void + * @return NULL */ private function desactivateImage(){ $id = $this->app->getPostParam("id"); @@ -362,16 +362,16 @@ class image implements Core{ $image->deactivate(); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } + } } /** @@ -380,14 +380,14 @@ class image implements Core{ * @param String $id Identifier of the image * @param String $file_name Path of the image * - * @return void + * @return NULL */ private function uploadImage(){ $id = $this->app->getPostParam("id"); $file_name = $this->app->getPostParam("file_name"); - $file = $this->app->getPostParam("file"); + $file = $this->app->getPostParam("file"); error_log(print_r($file, true), 0); - + if(!isset($id)){ $this->app->setOutput("Error", "Incorrect id parameter"); } @@ -405,16 +405,16 @@ class image implements Core{ $image->uploadData($stream); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } + } } /** @@ -440,17 +440,17 @@ class image implements Core{ $stream = $image->downloadData(); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } - $this->app->setOutput("Images", $stream); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } + $this->app->setOutput("Images", $stream); + } } /** @@ -483,16 +483,16 @@ class image implements Core{ $this->app->setOutput("Images", $member_id); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } + } } @@ -526,15 +526,15 @@ class image implements Core{ } }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } $this->app->setOutput("Images", $members); } } @@ -572,15 +572,15 @@ class image implements Core{ } }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } $this->app->setOutput("Images", $member); } } @@ -591,7 +591,7 @@ class image implements Core{ * @param String $image_id Identifier of the image * @param String $member_id Identifier of the member * - * @return void + * @return NULL */ private function removeMemberImage(){ $image_id = $this->app->getPostParam("image_id"); @@ -618,16 +618,16 @@ class image implements Core{ $member->delete(); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } + } } /** @@ -637,7 +637,7 @@ class image implements Core{ * @param String $member_id Identifier of the member * @param String $status New status for the member * - * @return void + * @return NULL **/ private function updateMemberImage(){ $image_id = $this->app->getPostParam("image_id"); @@ -665,16 +665,16 @@ class image implements Core{ $member->updateStatus($status); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } + } } } diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php index 394db31..68a7dbd 100755 --- a/server/core/LibOverride/genTokenOptions.php +++ b/server/core/LibOverride/genTokenOptions.php @@ -22,33 +22,33 @@ class genTokenOptions $this->stack = HandlerStack::create(); $httpClient = new Client([ - 'base_uri' => Utils::normalizeUrl($options['authUrl']), - 'handler' => $this->stack, - ]); + 'base_uri' => Utils::normalizeUrl($options['authUrl']), + 'handler' => $this->stack, + ]); $this->httpClient = $httpClient; - $options['identityService'] = Service::factory($httpClient); + $options['identityService'] = Service::factory($httpClient); $options['authHandler'] = function () use ($options) { return $options['identityService']->generateToken($options); - }; + }; $this->optionsGlobal['Common'] = $options; } - - /** - * @codeCoverageIgnore - */ - private function addDebugMiddleware(array $options, HandlerStack &$stack) - { - if (!empty($options['debugLog']) - && !empty($options['logger']) - && !empty($options['messageFormatter']) - ) { - $stack->push(GuzzleMiddleware::log($options['logger'], $options['messageFormatter'])); - } - } + + /** + * @codeCoverageIgnore + */ + private function addDebugMiddleware(array $options, HandlerStack &$stack) + { + if (!empty($options['debugLog']) + && !empty($options['logger']) + && !empty($options['messageFormatter']) + ) { + $stack->push(GuzzleMiddleware::log($options['logger'], $options['messageFormatter'])); + } + } public function checkToken(){ //error_log(print_r($this->backup['time'], true), 0); @@ -73,9 +73,9 @@ class genTokenOptions $this->addDebugMiddleware($options, $stack); $options['httpClient'] = new Client([ - 'base_uri' => Utils::normalizeUrl($baseUrl), - 'handler' => $stack, - ]); + 'base_uri' => Utils::normalizeUrl($baseUrl), + 'handler' => $stack, + ]); $this->saveBackup('Identity', array('token' => $token, 'baseUrl' => $baseUrl )); $this->optionsGlobal['Identity'] = $options; @@ -98,15 +98,15 @@ class genTokenOptions $baseUrl = $this->backup['Identity']['baseUrl']; $stack = HandlerStack::create(); - + $stack->push(Middleware::authHandler($options['authHandler'], $token)); $this->addDebugMiddleware($options, $stack); $options['httpClient'] = new Client([ - 'base_uri' => Utils::normalizeUrl($baseUrl), - 'handler' => $stack, - ]); + 'base_uri' => Utils::normalizeUrl($baseUrl), + 'handler' => $stack, + ]); $this->saveBackup('Identity', array('token' => $token, 'baseUrl' => $baseUrl )); $this->optionsGlobal['Identity'] = $options; @@ -122,14 +122,14 @@ class genTokenOptions $stack = HandlerStack::create(); - $stack->push(Middleware::authHandler($options['authHandler'], $token)); + $stack->push(Middleware::authHandler($options['authHandler'], $token)); $this->addDebugMiddleware($options, $stack); $options['httpClient'] = new Client([ - 'base_uri' => Utils::normalizeUrl($baseUrl), - 'handler' => $stack, - ]); + 'base_uri' => Utils::normalizeUrl($baseUrl), + 'handler' => $stack, + ]); $this->saveBackup('Image', array('token' => $token, 'baseUrl' => $baseUrl )); $this->optionsGlobal['Image'] = $options; @@ -150,7 +150,7 @@ class genTokenOptions $this->backup['Image'] = $opt; $token = $this->unserializeToken($this->backup['Image']['token']); $baseUrl = $this->backup['Image']['baseUrl']; - + $stack = HandlerStack::create(); $stack->push(Middleware::authHandler($options['authHandler'], $token)); @@ -158,9 +158,9 @@ class genTokenOptions $this->addDebugMiddleware($options, $stack); $options['httpClient'] = new Client([ - 'base_uri' => Utils::normalizeUrl($baseUrl), - 'handler' => $stack, - ]); + 'base_uri' => Utils::normalizeUrl($baseUrl), + 'handler' => $stack, + ]); $this->saveBackup('Image', array('token' => $token, 'baseUrl' => $baseUrl )); $this->optionsGlobal['Image'] = $options; } @@ -175,14 +175,14 @@ class genTokenOptions $stack = HandlerStack::create(); - $stack->push(Middleware::authHandler($options['authHandler'], $token)); + $stack->push(Middleware::authHandler($options['authHandler'], $token)); $this->addDebugMiddleware($options, $stack); $options['httpClient'] = new Client([ - 'base_uri' => Utils::normalizeUrl($baseUrl), - 'handler' => $stack, - ]); + 'base_uri' => Utils::normalizeUrl($baseUrl), + 'handler' => $stack, + ]); $this->saveBackup('Network', array('token' => $token, 'baseUrl' => $baseUrl )); $this->optionsGlobal['Network'] = $options; @@ -203,17 +203,17 @@ class genTokenOptions $this->backup['Network'] = $opt; $token = $this->unserializeToken($this->backup['Network']['token']); $baseUrl = $this->backup['Network']['baseUrl']; - + $stack = HandlerStack::create(); - + $stack->push(Middleware::authHandler($options['authHandler'], $token)); $this->addDebugMiddleware($options, $stack); $options['httpClient'] = new Client([ - 'base_uri' => Utils::normalizeUrl($baseUrl), - 'handler' => $stack, - ]); + 'base_uri' => Utils::normalizeUrl($baseUrl), + 'handler' => $stack, + ]); $this->saveBackup('Network', array('token' => $token, 'baseUrl' => $baseUrl )); $this->optionsGlobal['Network'] = $options; } @@ -228,14 +228,14 @@ class genTokenOptions $stack = HandlerStack::create(); - $stack->push(Middleware::authHandler($options['authHandler'], $token)); + $stack->push(Middleware::authHandler($options['authHandler'], $token)); $this->addDebugMiddleware($options, $stack); $options['httpClient'] = new Client([ - 'base_uri' => Utils::normalizeUrl($baseUrl), - 'handler' => $stack, - ]); + 'base_uri' => Utils::normalizeUrl($baseUrl), + 'handler' => $stack, + ]); $this->saveBackup('Compute', array('token' => $token, 'baseUrl' => $baseUrl )); $this->optionsGlobal['Compute'] = $options; @@ -257,17 +257,17 @@ class genTokenOptions $this->backup['Compute'] = $opt; $token = $this->unserializeToken($this->backup['Compute']['token']); $baseUrl = $this->backup['Compute']['baseUrl']; - + $stack = HandlerStack::create(); - + $stack->push(Middleware::authHandler($options['authHandler'], $token)); $this->addDebugMiddleware($options, $stack); $options['httpClient'] = new Client([ - 'base_uri' => Utils::normalizeUrl($baseUrl), - 'handler' => $stack, - ]); + 'base_uri' => Utils::normalizeUrl($baseUrl), + 'handler' => $stack, + ]); $this->saveBackup('Compute', array('token' => $token, 'baseUrl' => $baseUrl )); $this->optionsGlobal['Compute'] = $options; } @@ -426,7 +426,7 @@ class genTokenOptions $token->user->description = unserialize($this->backup["user"]["description"]); $token->issued = unserialize($tokenSerialized["issued"]); $token->id = unserialize($tokenSerialized["id"]); - + return $token; } } diff --git a/server/core/Network.php b/server/core/Network.php index e93c2c5..54b5d60 100755 --- a/server/core/Network.php +++ b/server/core/Network.php @@ -22,9 +22,9 @@ use OpenCloud\Common\Error\UserInputError; */ class network{ -/** @var App $app protected, contains the main app object */ + /** @var App $app protected, contains the main app object */ protected $app; -/** @var OpenStack\Network $libClass protected, contains the library Network object */ + /** @var OpenStack\Network $libClass protected, contains the library Network object */ protected $libClass; @@ -49,11 +49,11 @@ class network{ * * @param String $action name of another function of this class * - * @return void + * @return NULL */ public function action($action){ - $this->{$action.""}(); + $this->{$action.""}(); } @@ -65,7 +65,7 @@ class network{ * @param String shared Specifies whether the network resource can be accessed by any tenant * @param String tenantId Owner of network. Only admin users can specify a tenant ID other than their own * - * @return void + * @return NULL */ private function create_network() { @@ -102,19 +102,19 @@ class network{ 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); - } + } } @@ -136,7 +136,7 @@ class network{ * * * - * @return void + * @return NULL */ private function create_subnet() @@ -200,24 +200,24 @@ class network{ try { - $subnet = $this->libClass->createSubnet($options); + $subnet = $this->libClass->createSubnet($options); } 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); - } + } } @@ -233,36 +233,36 @@ class network{ try { $ln = $this->libClass->listNetworks(); - + $list_ids = array(); - + foreach($ln as $n) { - + $list_ids[] = $n->id; - + } } 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->setOutput("ListNetworkIds", $list_ids); + $this->app->setOutput("ListNetworkIds", $list_ids); } /** @@ -276,37 +276,37 @@ class network{ try { $ln = $this->libClass->listNetworks(); - + $list_names = array(); - + foreach($ln as $n) { - + $list_names[] = $n->name; - + } - + } 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->setOutput("ListNetworkNames", $list_names); + $this->app->setOutput("ListNetworkNames", $list_names); } /** * List the CIDR of the SUBNETS @@ -317,32 +317,32 @@ class network{ { try { - $ls = $this->libClass->listSubnets(); - $list_cidr = array(); - foreach ($ls as $subnet) - { - - $list_cidr[] = $subnet->cidr; - } + $ls = $this->libClass->listSubnets(); + $list_cidr = array(); + foreach ($ls as $subnet) + { + + $list_cidr[] = $subnet->cidr; + } - $this->app->setOutput("ListCidr", $list_cidr); + $this->app->setOutput("ListCidr", $list_cidr); } 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); - } + } } /** * retrieve a specific network @@ -364,21 +364,21 @@ class network{ 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->setOutput("Network", $network); + $this->app->setOutput("Network", $network); } /** @@ -401,21 +401,21 @@ class network{ 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); - } + } - return $network; + return $network; } /** @@ -437,21 +437,21 @@ class network{ 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->setOutput("Subnet", subnet); - + } /** * internal function @@ -472,21 +472,21 @@ class network{ 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); - } + } return $subnet; - + } /** @@ -498,11 +498,11 @@ class network{ * @param String tenantId Owner of network. Only admin users can specify a tenant ID other than their own * * - * @return void + * @return NULL **/ - private function updateNetwork() - { + private function updateNetwork() + { $options = array(); $name = $this->app->getPostParam("name"); $shared = $this->app->getPostParam("shared"); @@ -524,25 +524,25 @@ class network{ { $networkId = $this->app->getPostParam("networkId"); $network = getNetworkP($networkId); - + $network->update($options); } 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); - } + } } /** @@ -561,11 +561,11 @@ class network{ * @param String allocationPools Subranges of the CIDR available for dynamic allocation to ports * * - * @return void + * @return NULL **/ private function updateSubnet() - { + { $options = array(); $name = $this->app->getPostParam("name"); $networkId = $this->app->getPostParam("networkId"); @@ -596,19 +596,19 @@ class network{ 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); - } + } } /** @@ -617,10 +617,10 @@ class network{ * @param String networkId ID if network which we want to delete * * - * @return void + * @return NULL **/ private function deleteNetwork() - { + { try { $networkId = $this->app->getPostParam("networkId"); @@ -630,19 +630,19 @@ class network{ 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); - } + } } /** @@ -651,10 +651,10 @@ class network{ * @param String subnetId ID if network which we want to delete * * - * @return void + * @return NULL **/ private function deleteSubnet() - { + { try { $subnetId = $this->app->getPostParam("subnetId"); @@ -664,19 +664,19 @@ class network{ 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); - } + } } /** @@ -692,7 +692,7 @@ class network{ * @param String securityGroups Specifies the IDs of any security groups associated with this port * @param String tenantId Owner of the port. Only admin users can specify a tenant ID other than their own. * - * @return void + * @return NULL */ private function createPort() @@ -751,19 +751,19 @@ class network{ 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); - } + } } /** @@ -781,19 +781,19 @@ class network{ 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); - } + } } /** @@ -813,20 +813,20 @@ class network{ 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); - } - + } + } /** @@ -846,20 +846,20 @@ class network{ 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); - } - + } + } @@ -876,7 +876,7 @@ class network{ * @param String securityGroups Specifies the IDs of any security groups associated with this port * @param String tenantId Owner of the port. Only admin users can specify a tenant ID other than their own. * - * @return void + * @return NULL */ private function updatePort() { @@ -935,28 +935,28 @@ class network{ 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); - } + } } /** * Delete a port given * * @param String portId id of port which we wante to delete - * @return void + * @return NULL */ private function deletePort() - { + { try { @@ -967,19 +967,19 @@ class network{ 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); - } + } } /** @@ -988,7 +988,7 @@ class network{ * @param String name A human-readable name for the security group. This name might not be unique * @param String description Description of the security group * - * @return void + * @return NULL */ private function createSecurityGroup() @@ -1012,20 +1012,20 @@ class network{ 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); - } - + } + } /** @@ -1040,7 +1040,7 @@ class network{ *@param String remoteGroupId The remote group ID to be associated with this security group rule. You can specify either remoteGroupId or remoteGroupPrefix *@param String remoteIpPrefix The remote IP prefix to be associated with this security group rule. You can specify either remoteGroupId or remoteGroupPrefix * - * @return void + * @return NULL */ private function createSecurityGroupRule() { @@ -1093,19 +1093,19 @@ class network{ 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); - } + } } @@ -1124,19 +1124,19 @@ class network{ 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); - } + } } @@ -1150,26 +1150,26 @@ class network{ { try { - - $this->app->setOutput("listSecurityGroupeRule", $this->libClass->listSecurityGroupRules()); + + $this->app->setOutput("listSecurityGroupeRule", $this->libClass->listSecurityGroupRules()); } 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); - } + } } /** @@ -1189,20 +1189,20 @@ class network{ 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); - } - + } + } /** @@ -1221,28 +1221,28 @@ class network{ 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); - } - + } + } /** * Delete a specific Security Groupe given * @param securityGroupeId ID of security Groupe which we want to get - * @return void + * @return NULL */ private function deleteSecurityGroupe() - { + { try { $securityGroupId = $this->app->getPostParam("securityGroupeId"); @@ -1252,18 +1252,18 @@ class network{ 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); - } + } } } diff --git a/server/core/NetworkLayer3.php b/server/core/NetworkLayer3.php index 30e8a78..c0b773a 100755 --- a/server/core/NetworkLayer3.php +++ b/server/core/NetworkLayer3.php @@ -51,10 +51,10 @@ class networkLayer3 { * * @param String $action name of another function of this class * - * @return void + * @return NULL */ public function action($action){ - $this->{$action.""}(); + $this->{$action.""}(); } @@ -75,15 +75,15 @@ class networkLayer3 { $this->app->setOutput("NetworkLayer3", $result); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** @@ -109,15 +109,15 @@ class networkLayer3 { } }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } @@ -147,7 +147,7 @@ class networkLayer3 { foreach ($res as $f) { if(strcmp($f->id, $id)){ $result = $f; - + } } @@ -159,15 +159,15 @@ class networkLayer3 { } }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** @@ -175,7 +175,7 @@ class networkLayer3 { * * @param id the id of the floatingip to update * - * @return void + * @return NULL */ private function updateFloatingIp(){ $id = $this->app->getPostParam("id"); @@ -197,7 +197,7 @@ class networkLayer3 { foreach ($res as $f) { if(strcmp($f->id, $id)){ $result = $f; - + } } @@ -208,15 +208,15 @@ class networkLayer3 { } }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } /** @@ -224,7 +224,7 @@ class networkLayer3 { * * @param string floatingip_id the floating-ip id to delete * - * @return void + * @return NULL */ private function deleteFloatingIp(){ $id = $this->app->getPostParam("id"); @@ -245,7 +245,7 @@ class networkLayer3 { foreach ($res as $f) { if(strcmp($f->id, $id)){ $result = $f; - + } } @@ -256,15 +256,15 @@ class networkLayer3 { } }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } @@ -273,7 +273,7 @@ class networkLayer3 { * * @param string floatingip_id the floating-ip id to retrieve * - * @return void + * @return NULL */ private function retrieveFloatingIp(){ $id = $this->app->getPostParam("id"); @@ -294,7 +294,7 @@ class networkLayer3 { foreach ($res as $f) { if(strcmp($f->id, $id)){ $result = $f; - + } } @@ -305,15 +305,15 @@ class networkLayer3 { } }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } @@ -344,15 +344,15 @@ class networkLayer3 { } }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } @@ -372,15 +372,15 @@ class networkLayer3 { $this->app->setOutput("NetworkLayer3", $result); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } @@ -420,15 +420,15 @@ class networkLayer3 { } }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } @@ -437,7 +437,7 @@ class networkLayer3 { * * @param string router the router to delete * - * @return void + * @return NULL */ private function deleteRouter(){ $id = $this->app->getPostParam("id"); @@ -468,15 +468,15 @@ class networkLayer3 { } }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } @@ -485,7 +485,7 @@ class networkLayer3 { * * @param id the id of the floatingip to update * - * @return void + * @return NULL */ private function updateRouter(){ $id = $this->app->getPostParam("id"); @@ -507,7 +507,7 @@ class networkLayer3 { foreach ($res as $f) { if(strcmp($f->id, $id)){ $result = $f; - + } } @@ -518,14 +518,14 @@ class networkLayer3 { } }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ + }catch(UserInputError $e){ $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ + }catch(BaseError $e){ $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ + }catch(NotImplementedError $e){ $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } } } diff --git a/server/index.php b/server/index.php index 53a24c4..01203de 100755 --- a/server/index.php +++ b/server/index.php @@ -1,70 +1,88 @@ setOutput("Error", "Invalid Request!"); + $App->show(); + exit(); +} + +//Authentification and deauthentification request +if($task == "Authenticate"){ - if(isset($_POST["task"]) && isset($_POST["action"])){ - $task = $_POST["task"]; - $action = $_POST["action"]; - }else if(isset($_POST["task"]) && $_POST["task"] == "Authenticate" || $_POST["task"] == "Deauthenticate"){ - $task = $_POST["task"]; - }else{ - //Gestion Erreur - } + $App->authenticate(); + $App->show(); - if($task == "Authenticate"){ - - $App->authenticate(); +}else if($task == "Deauthenticate"){ + + $App->deauthenticate(); + $App->show(); + +}else if($App->checkToken()){ + //Task switcher and task's file loader + switch($task) + { + case "identity": + include_once("core/Identity.php"); + $identityObject = new identity($App); + $identityObject->action($action); $App->show(); + break; - }else if($task == "Deauthenticate"){ - - $App->deauthenticate(); + case "network": + include_once("core/Network.php"); + $networkObject = new network($App); + $networkObject->action($action); $App->show(); + break; - }else if($App->checkToken()){ - switch($task) - { - case "identity": - include_once("core/Identity.php"); - $identityObject = new identity($App); - $identityObject->action($action); - $App->show(); - break; - - case "network": - include_once("core/Network.php"); - $networkObject = new network($App); - $networkObject->action($action); - $App->show(); - break; - - case "image": - include_once("core/Image.php"); - $imageObject = new image($App); - $imageObject->action($action); - $App->show(); - break; - - case "compute": - include_once("core/Compute.php"); - $computeObject = new compute($App); - $computeObject->action($action); - $App->show(); - break; - - case "networkLayer3": - include_once("core/NetworkLayer3.php"); - $computeObject = new networkLayer3($App); - $computeObject->action($action); - $App->show(); - break; - } + case "image": + include_once("core/Image.php"); + $imageObject = new image($App); + $imageObject->action($action); + $App->show(); + break; + + case "compute": + include_once("core/Compute.php"); + $computeObject = new compute($App); + $computeObject->action($action); + $App->show(); + break; - }else{ - $App->setOutput("Error", "Token Invalide"); + case "networkLayer3": + include_once("core/NetworkLayer3.php"); + $computeObject = new networkLayer3($App); + $computeObject->action($action); $App->show(); + break; } - - +}else{ + //Request without authentication + $App->setOutput("Error", "Token Invalide"); + $App->show(); +} + + + diff --git a/server/init.php b/server/init.php index a00927d..767224a 100755 --- a/server/init.php +++ b/server/init.php @@ -1,48 +1,55 @@ Array( - "name" => $user, - "password" => $password, - "domain" => Array( - "name" => "Default") - ), - "scope" => Array( - "project" => Array( - "name" => $project, - "domain" => Array( - "name" => "Default") - ) - ), - "authUrl" => $config["urlAuth"] - ); +}else if(isset($_POST["user"]) && isset($_POST["password"]) && isset($_POST["project"]) ){ - $App = new App($Args); + $user = $_POST["user"]; + $password = $_POST["password"]; + $project = $_POST["project"]; + +} + +//Library args +$Args = Array( + "user" => Array( + "name" => $user, + "password" => $password, + "domain" => Array( + "name" => "Default") + ), + "scope" => Array( + "project" => Array( + "name" => $project, + "domain" => Array( + "name" => "Default") + ) + ), + "authUrl" => $config["urlAuth"] +); + +//Init core Api +$App = new App($Args); - if(isset($token)) - $App->setToken($token); +if(isset($token)) + $App->setToken($token); ?> -- cgit v1.2.3 From 1d42345e07b2ef557de3c5049864e6885632b9e9 Mon Sep 17 00:00:00 2001 From: EoleDev Date: Wed, 27 Apr 2016 14:22:59 +0200 Subject: End of comments --- server/config.inc.php | 4 +- server/core/App.php | 16 +-- server/core/Automating.php | 24 ++-- server/core/Compute.php | 141 +++++++++++++++--------- server/core/CoreInterface.php | 15 ++- server/core/ErrorManagement.php | 20 ++-- server/core/Identity.php | 160 ++++++++++++++------------- server/core/Image.php | 40 +++---- server/core/LibOverride/genTokenOptions.php | 164 ++++++++++++++++++++++++++-- server/core/Network.php | 108 +++++++++--------- server/core/NetworkLayer3.php | 42 +++---- server/index.php | 2 + server/init.php | 19 ++-- 13 files changed, 491 insertions(+), 264 deletions(-) (limited to 'server/core/Image.php') diff --git a/server/config.inc.php b/server/config.inc.php index 4a4e494..71f0bb4 100755 --- a/server/config.inc.php +++ b/server/config.inc.php @@ -1,6 +1,6 @@ diff --git a/server/core/App.php b/server/core/App.php index 3a027d7..fb49b95 100755 --- a/server/core/App.php +++ b/server/core/App.php @@ -9,7 +9,9 @@ * */ -//Library token management override +/* +* Library token management override +*/ include_once("core/LibOverride/genTokenOptions.php"); include_once("core/ErrorManagement.php"); @@ -28,7 +30,7 @@ use OpenCloud\Common\Error\UserInputError; */ class App{ - /** @var Openstack $openstack protected, contains the main library object */ + /** @var OpenStack\OpenStack $openstack protected, contains the main library object */ protected $openstack; /** @var Array $postParams protected, contains the post parameters */ protected $postParams; @@ -124,7 +126,7 @@ class App{ /** * Generate the token for the different services in OpenStack * - * @return NULL + * @return void */ public function authenticate(){ @@ -150,7 +152,7 @@ class App{ /** * Revoke the openstack services' token * - * @return NULL + * @return void */ public function deauthenticate(){ @@ -197,7 +199,7 @@ class App{ * @param String $param Name for the Post entry * @param Object $value Value for the Post entry * - * @return NULL + * @return void */ public function setPostParam($param, $value){ @@ -211,7 +213,7 @@ class App{ * @param String $key Array key for the message * @param Array $out Message's value * - * @return NULL + * @return void */ public function setOutput($key, $out){ @@ -233,7 +235,7 @@ class App{ /** * Output the messages to be send to the client * - * @return NULl + * @return void */ public function show(){ echo json_encode($this->output); diff --git a/server/core/Automating.php b/server/core/Automating.php index 2d8db00..697b666 100755 --- a/server/core/Automating.php +++ b/server/core/Automating.php @@ -14,21 +14,31 @@ include("Network.php"); include("Compute.php"); include("NetworkLayer3.php"); -class automating{ +/** +* automating Class of the back-end application +* +* Contains the different function to automate some action +* +*/ +class automating implements Core{ - /** @var App $app protected, contains the main app object */ + /** @var App $compute protected, contains a Core compute object */ protected $compute; + /** @var App $image protected, contains a Core image object */ protected $image; + /** @var App $network protected, contains a Core network object */ protected $network; + /** @var App $networkLayer3 protected, contains a Core networkLayer3 object */ protected $networkLayer3; + /** @var App $app protected, contains the main app object */ protected $app; /** - * Our library's app constructor for all server app objects + * automating class constructor * - * @param App $app the main app object, e.g. compute, image, network, etc. + * @param App $app the main app object * - * @return + * @return automating Object */ public function __construct($app){ $this->app = $app; @@ -43,7 +53,7 @@ class automating{ * * @param String $action name of another function of this class * - * @return NULL + * @return void */ public function action($action){ $this->{$action.""}(); @@ -57,7 +67,7 @@ class automating{ * @param String $serverName name ofthe new server * @param String $flavor kind of server * - * @return NULL + * @return void */ private function createPublicServer() { diff --git a/server/core/Compute.php b/server/core/Compute.php index e466b52..7e27d00 100755 --- a/server/core/Compute.php +++ b/server/core/Compute.php @@ -1,37 +1,62 @@ app = $app; $this->libClass = $app->getLibClass("Compute"); } + /** * Execute an action * * @param String $action name of another function of this class * - * @return NULL + * @return void */ public function action($action){ $this->{$action.""}(); } + /** - * List servers. - * @return array - */ + * List servers. + * + * @return void + */ public function listServers() { try{ @@ -79,12 +104,13 @@ class compute catch(Exception $e){ $this->app->getErrorInstance()->OtherException($e); } - return; } + /** - * List flavors. - * @return array - */ + * List flavors. + * + * @return void + */ public function listFlavors() { try{ @@ -117,12 +143,13 @@ class compute catch(Exception $e){ $this->app->getErrorInstance()->OtherException($e); } - return; } + /** - * List images. - * @return array - */ + * List images. + * + * @return void + */ public function listImages() { try{ @@ -159,12 +186,13 @@ class compute catch(Exception $e){ $this->app->getErrorInstance()->OtherException($e); } - return; } + /** - * Get server details. - * @return array - */ + * Get server details. + * + * @return void + */ public function getServer() { try{ @@ -193,12 +221,13 @@ class compute catch(Exception $e){ $this->app->getErrorInstance()->OtherException($e); } - return; } + /** - * Get flavor details. - * @return array - */ + * Get flavor details. + * + * @return void + */ public function getFlavor() { try{ @@ -227,12 +256,12 @@ class compute catch(Exception $e){ $this->app->getErrorInstance()->OtherException($e); } - return; } + /** - * Get image details. - * @return array - */ + * Get image details. + * @return array + */ public function getImage() { try{ @@ -261,12 +290,13 @@ class compute catch(Exception $e){ $this->app->getErrorInstance()->OtherException($e); } - return; } + /** - * Create server. - * @return array - */ + * Create server. + * + * @return void + */ public function createServer() { try{ @@ -295,12 +325,12 @@ class compute catch(Exception $e){ $this->app->getErrorInstance()->OtherException($e); } - return; } /** * update a server - * @return NULL + * + * @return void */ public function updateServer() { @@ -342,11 +372,12 @@ class compute catch(Exception $e){ $this->app->getErrorInstance()->OtherException($e); } - return; } + /** * Delete a server - * @return NULL + * + * @return void */ public function deleteServer() { @@ -376,11 +407,12 @@ class compute catch(Exception $e){ $this->app->getErrorInstance()->OtherException($e); } - return; } + /** * Change the password of a server - * @return NULL + * + * @return void */ public function changePassword() { @@ -411,11 +443,12 @@ class compute catch(Exception $e){ $this->app->getErrorInstance()->OtherException($e); } - return; } + /** * Reboot a server - * @return NULL + * + * @return void */ public function reboot() { @@ -445,11 +478,12 @@ class compute catch(Exception $e){ $this->app->getErrorInstance()->OtherException($e); } - return; } + /** * Rebuild a server - * @return NULL + * + * @return void */ public function rebuild() { @@ -490,13 +524,15 @@ class compute catch(Exception $e){ $this->app->getErrorInstance()->OtherException($e); } - return; } } + /** * Resize a server + * * A call to this method has to be followed by either confirmResize or revertResize - * @return NULL + * + * @return void */ public function resize() { @@ -526,11 +562,12 @@ class compute catch(Exception $e){ $this->app->getErrorInstance()->OtherException($e); } - return; } + /** * Confirm resize operation on a server - * @return NULL + * + * @return void */ public function confirmResize() { @@ -560,11 +597,12 @@ class compute catch(Exception $e){ $this->app->getErrorInstance()->OtherException($e); } - return; } + /** * Revert resize operation on a server - * @return NULL + * + * @return void */ public function revertResize() { @@ -594,14 +632,14 @@ class compute catch(Exception $e){ $this->app->getErrorInstance()->OtherException($e); } - return; } + /** * List private and public addresses of a server - * @return NULL + * + * @return void */ - - public function listAddresses(array $options = []) + public function listAddresses() { try{ $serverId = $this->app->getPostParam("serverId"); @@ -629,7 +667,6 @@ class compute catch(Exception $e){ $this->app->getErrorInstance()->OtherException($e); } - return; } } diff --git a/server/core/CoreInterface.php b/server/core/CoreInterface.php index 6c2313b..8bcfad4 100755 --- a/server/core/CoreInterface.php +++ b/server/core/CoreInterface.php @@ -1,15 +1,26 @@ app->setOutput("Error", "BaseError"); @@ -48,7 +54,7 @@ Class errorManagement{ * * @param Exception $error the exception triggered * - * @return NULL + * @return void */ public function BadResponseHandler($error){ $statusCode = $error->getResponse()->getStatusCode(); @@ -88,7 +94,7 @@ Class errorManagement{ * * @param Exception $error the exception triggered * - * @return NULL + * @return void */ public function NotImplementedHandler($error){ $this->app->setOutput("Error", "Internal error (not implemented yet), please contact an administrator"); @@ -99,7 +105,7 @@ Class errorManagement{ * * @param Exception $error the exception triggered * - * @return NULL + * @return void */ public function UserInputHandler($error){ $this->app->setOutput("Error", "UserInputError"); @@ -110,7 +116,7 @@ Class errorManagement{ * * @param Exception $error the exception triggered * - * @return NULL + * @return void */ public function OtherException($error){ $this->app->setOutput("Error", $error->getMessage()); diff --git a/server/core/Identity.php b/server/core/Identity.php index f6179b0..a30dad2 100755 --- a/server/core/Identity.php +++ b/server/core/Identity.php @@ -2,11 +2,10 @@ /** * File containing the identity Class. * -* @version 1.0 Initialisation of this file -* @since 1.0 Core application's file -* -* @author Eole 'eoledev at outlook . fr' -* +*/ + +/** +* Import the Error of the Library */ use OpenCloud\Common\Error; @@ -15,6 +14,11 @@ use OpenCloud\Common\Error; * * This class implements the management for the identity request * +* @version 1.0 Initialisation of this file +* @since 1.0 Core application's file +* +* @author Eole 'eoledev at outlook . fr' +* */ class identity implements Core{ @@ -29,7 +33,7 @@ class identity implements Core{ * * @param App $app the main app object * - * @return identity + * @return identity Object */ public function __construct($app){ @@ -43,7 +47,7 @@ class identity implements Core{ * * @param String $action name of another function of this class * - * @return NULL + * @return void */ public function action($action){ @@ -61,7 +65,7 @@ class identity implements Core{ * @param String $type Required Type of credential : ec2, cert... * @param String $userId Required Id of the user which own the credential * - * @return NULL + * @return void */ private function addCredential(){ @@ -99,7 +103,7 @@ class identity implements Core{ /** * List the credentials for a given user. * - * @return NULL + * @return void */ private function listCredentials(){ try{ @@ -127,7 +131,7 @@ class identity implements Core{ * * @param String $credentialId Required credential id for which it retrieve the details * - * @return NULL + * @return void */ private function showCredential(){ $credentId = $this->app->getPostParam("credentialId"); @@ -164,7 +168,7 @@ class identity implements Core{ * @param JsonString $blob Required credentials information with this structure for ec2: "{\"access\":\"181920\",\"secret\":\"secretKey\"}" * @param String $type Required Type of credential : ec2, cert... * - * @return NULL + * @return void */ private function updateCredential(){ @@ -206,7 +210,7 @@ class identity implements Core{ * * @param String $credentialId Required credential id to delete * - * @return NULL + * @return void */ private function deleteCredential(){ @@ -244,7 +248,7 @@ class identity implements Core{ * @param String $enabled Optional Domain enabled or not : value true or false * @param String $name Required Domain Name * - * @return NULL + * @return void */ private function addDomain(){ @@ -289,7 +293,7 @@ class identity implements Core{ /** * Retrieve the different domain's list. * - * @return NULL + * @return void */ private function listDomains(){ @@ -318,7 +322,7 @@ class identity implements Core{ * * @param String $domainId Required Domain id for which it retrieve the details * - * @return NULL + * @return void */ private function showDomain(){ @@ -356,7 +360,7 @@ class identity implements Core{ * @param String $enabled Optional Domain enabled or not : value true or false * @param String $name Required Domain Name * - * @return NULL + * @return void */ private function updateDomain(){ @@ -404,7 +408,7 @@ class identity implements Core{ * * @param String $domainId Required Domain id to delete * - * @return NULL + * @return void */ private function deleteDomain(){ @@ -437,7 +441,7 @@ class identity implements Core{ /** * Retrieve the different roles of a given user in a domain. * - * @return NULL + * @return void */ private function listRolesDomainUser(){ @@ -472,7 +476,7 @@ class identity implements Core{ /** * Grant a role to a given user in a domain. * - * @return NULL + * @return void */ private function grantRoleDomainUser(){ $domId = $this->app->getPostParam("domainId"); @@ -510,7 +514,7 @@ class identity implements Core{ /** * Verify that a user has a given role in a domain. * - * @return NULL + * @return void */ private function checkRoleDomainUser(){ $domId = $this->app->getPostParam("domainId"); @@ -549,7 +553,7 @@ class identity implements Core{ /** * Delete a role for a given user in a domain. * - * @return NULL + * @return void */ private function revokeRoleDomainUser(){ $domId = $this->app->getPostParam("domainId"); @@ -587,7 +591,7 @@ class identity implements Core{ /** * Retrieve the roles of a given group in a domain. * - * @return NULL + * @return void */ private function listRolesDomainGroup(){ $domId = $this->app->getPostParam("domainId"); @@ -622,7 +626,7 @@ class identity implements Core{ /** * Add a role to a given group in a domain. * - * @return NULL + * @return void */ private function grantRoleDomainGroup(){ $domId = $this->app->getPostParam("domainId"); @@ -660,7 +664,7 @@ class identity implements Core{ /** * Verify that a role is associated with a given group in a domain. * - * @return NULL + * @return void */ private function checkRoleDomainGroup(){ $domId = $this->app->getPostParam("domainId"); @@ -699,7 +703,7 @@ class identity implements Core{ /** * Delete a role for a given group in a domain. * - * @return NULL + * @return void */ private function revokeRoleDomainGroup(){ $domId = $this->app->getPostParam("domainId"); @@ -738,7 +742,7 @@ class identity implements Core{ /** * Add an endpoint to the Openstack instance * - * @return NULL + * @return void */ private function addEndpoint(){ $servId = $this->app->getPostParam("serviceId"); @@ -778,7 +782,7 @@ class identity implements Core{ /** * Retrieve the endpoint for the given id * - * @return NULL + * @return void */ private function getEndpoint(){ @@ -810,7 +814,7 @@ class identity implements Core{ /** * Retrieve the list of the different endpoints * - * @return NULL + * @return void */ private function listEndpoints(){ @@ -836,7 +840,7 @@ class identity implements Core{ /** * Update a given endpoint * - * @return NULL + * @return void */ private function updateEndpoint(){ //Not Implemented Yet @@ -845,7 +849,7 @@ class identity implements Core{ /** * Delete a given endpoint * - * @return NULL + * @return void */ private function deleteEndpoint(){ $endId = $this->app->getPostParam("endpointId"); @@ -877,7 +881,7 @@ class identity implements Core{ /** * Add a group. * - * @return NULL + * @return void */ private function addGroup(){ //Not Implemented Yet @@ -886,7 +890,7 @@ class identity implements Core{ /** * Retrieve the group's list. * - * @return NULL + * @return void */ private function listGroups(){ //Not Implemented Yet @@ -895,7 +899,7 @@ class identity implements Core{ /** * Retrieve the details of a given group. * - * @return NULL + * @return void */ private function showGroup(){ //Not Implemented Yet @@ -904,7 +908,7 @@ class identity implements Core{ /** * Update a given group. * - * @return NULL + * @return void */ private function updateGroup(){ //Todo Argument Optional @@ -945,7 +949,7 @@ class identity implements Core{ /** * Delete the given group. * - * @return NULL + * @return void */ private function deleteGroup(){ @@ -979,7 +983,7 @@ class identity implements Core{ /** * Retrieve the users of a given group. * - * @return NULL + * @return void */ private function listGroupUsers(){ @@ -1013,7 +1017,7 @@ class identity implements Core{ /** * Add a user to a group. * - * @return NULL + * @return void */ private function addGroupUser(){ @@ -1048,7 +1052,7 @@ class identity implements Core{ /** * Remove a user from a given group. * - * @return NULL + * @return void */ private function removeGroupUser(){ @@ -1083,7 +1087,7 @@ class identity implements Core{ /** * Check if a group contains a given user. * - * @return NULL + * @return void */ private function checkGroupUser(){ @@ -1118,7 +1122,7 @@ class identity implements Core{ /** * @todo * - * @return NULL + * @return void */ private function addPolicies(){ //Not Implemented Yet @@ -1127,7 +1131,7 @@ class identity implements Core{ /** * @todo * - * @return NULL + * @return void */ private function listPolicies(){ //Not Implemented Yet @@ -1136,7 +1140,7 @@ class identity implements Core{ /** * @todo * - * @return NULL + * @return void */ private function showPolicie(){ //Not Implemented Yet @@ -1146,7 +1150,7 @@ class identity implements Core{ /** * @todo * - * @return NULL + * @return void */ private function updatePolicies(){ //Not Implemented Yet @@ -1155,7 +1159,7 @@ class identity implements Core{ /** * @todo * - * @return NULL + * @return void */ private function deletePolicies(){ //Not Implemented Yet @@ -1164,7 +1168,7 @@ class identity implements Core{ /** * Add a project. * - * @return NULL + * @return void */ private function addProject(){ //Todo Parameters Optional @@ -1201,7 +1205,7 @@ class identity implements Core{ /** * Retrieve the different projects. * - * @return NULL + * @return void */ private function listProjects(){ @@ -1227,7 +1231,7 @@ class identity implements Core{ /** * Retrieve the details of a given project. * - * @return NULL + * @return void */ private function showProject(){ @@ -1260,7 +1264,7 @@ class identity implements Core{ /** * Update a given project. * - * @return NULL + * @return void */ private function updateProject(){ //Todo Parameters Optionnal @@ -1300,7 +1304,7 @@ class identity implements Core{ /** * Delete a given project. * - * @return NULL + * @return void */ private function deleteProject(){ $projId = $this->app->getPostParam("projId"); @@ -1333,7 +1337,7 @@ class identity implements Core{ /** * List the roles of a given user in a project. * - * @return NULL + * @return void */ private function listRolesProjectUser(){ @@ -1370,7 +1374,7 @@ class identity implements Core{ /** * Grant a role to an user in a project. * - * @return NULL + * @return void */ private function grantRoleProjectUser(){ @@ -1409,7 +1413,7 @@ class identity implements Core{ /** * Check if a given user has a role in a project. * - * @return NULL + * @return void */ private function checkRoleProjectUser(){ $projId = $this->app->getPostParam("projetId"); @@ -1450,7 +1454,7 @@ class identity implements Core{ /** * Delete a role for a given user in a project. * - * @return NULL + * @return void */ private function revokeRoleProjectUser(){ @@ -1489,7 +1493,7 @@ class identity implements Core{ /** * List the roles of a group in a project. * - * @return NULL + * @return void */ private function listRolesProjectGroup(){ @@ -1525,7 +1529,7 @@ class identity implements Core{ /** * Add a role to a group in a project. * - * @return NULL + * @return void */ private function grantRoleProjectGroup(){ @@ -1564,7 +1568,7 @@ class identity implements Core{ /** * Check if a group has a given role in a project. * - * @return NULL + * @return void */ private function checkRoleProjectGroup(){ @@ -1605,7 +1609,7 @@ class identity implements Core{ /** * Delete a role for a group in a project. * - * @return NULL + * @return void */ private function revokeRoleProjectGroup(){ @@ -1644,7 +1648,7 @@ class identity implements Core{ /** * Add a role. * - * @return NULL + * @return void */ private function addRole(){ @@ -1678,7 +1682,7 @@ class identity implements Core{ /** * List the different roles * - * @return NULL + * @return void */ private function listRoles(){ @@ -1704,7 +1708,7 @@ class identity implements Core{ /** * List the different assignments for a given role * - * @return NULL + * @return void */ private function listRoleAssignements(){ @@ -1730,7 +1734,7 @@ class identity implements Core{ /** * Add a service. * - * @return NULL + * @return void */ private function addService(){ $name = $this->app->getPostParam("name"); @@ -1765,7 +1769,7 @@ class identity implements Core{ /** * Retrieve the different services. * - * @return NULL + * @return void */ private function listServices(){ @@ -1791,7 +1795,7 @@ class identity implements Core{ /** * Retrieve the details for a given service. * - * @return NULL + * @return void */ private function showService(){ $servId = $this->app->getPostParam("serviceId"); @@ -1822,7 +1826,7 @@ class identity implements Core{ /** * Delete a given service. * - * @return NULL + * @return void */ private function deleteService(){ @@ -1856,7 +1860,7 @@ class identity implements Core{ /** * Generate a new token for a given user id. * - * @return NULL + * @return void */ private function genTokenUserID(){ @@ -1894,7 +1898,7 @@ class identity implements Core{ /** * Generate a new token for a given user name. * - * @return NULL + * @return void */ private function genTokenUserName(){ $username = $this->app->getPostParam("username"); @@ -1936,7 +1940,7 @@ class identity implements Core{ /** * Generate a new token from another token ID. * - * @return NULL + * @return void */ private function genTokenID(){ @@ -1972,7 +1976,7 @@ class identity implements Core{ /** * Generate a new token scoped by a project ID. * - * @return NULL + * @return void */ private function genTokenScopedProjectID(){ @@ -2014,7 +2018,7 @@ class identity implements Core{ /** * Generate a new token scoped by a project name. * - * @return NULL + * @return void */ private function genTokenScopedProjectName(){ @@ -2062,7 +2066,7 @@ class identity implements Core{ /** * Check if a token is validate. * - * @return NULL + * @return void */ private function validateToken(){ @@ -2098,7 +2102,7 @@ class identity implements Core{ /** * Delete a given token. * - * @return NULL + * @return void */ private function revokeToken(){ @@ -2130,7 +2134,7 @@ class identity implements Core{ /** * Add a new user. * - * @return NULL + * @return void */ private function addUser(){ //Todo Optionnal Parameter @@ -2175,7 +2179,7 @@ class identity implements Core{ /** * Retrieve the different users. * - * @return NULL + * @return void */ private function listUsers(){ @@ -2201,7 +2205,7 @@ class identity implements Core{ /** * Retrieve the details of a given user. * - * @return NULL + * @return void */ private function showUser(){ @@ -2234,7 +2238,7 @@ class identity implements Core{ /** * Update a given user. * - * @return NULL + * @return void */ private function updateUser(){ @@ -2273,7 +2277,7 @@ class identity implements Core{ /** * Delete a given user. * - * @return NULL + * @return void */ private function deleteUser(){ @@ -2306,7 +2310,7 @@ class identity implements Core{ /** * Retrieve the groups which contains a given user. * - * @return NULL + * @return void */ private function listUserGroups(){ @@ -2340,7 +2344,7 @@ class identity implements Core{ /** * Retrieve the projects which contains a given user. * - * @return NULL + * @return void */ private function listUserProjects(){ diff --git a/server/core/Image.php b/server/core/Image.php index d930962..b256d4c 100755 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -7,8 +7,8 @@ * * @author Evan Pisani 'yogg at epsina . com' * -* @todo Complete the functions with errors detection and finish the descriptions */ + use OpenCloud\Common\Error\BadResponseError; use OpenCloud\Common\Error\BaseError; use OpenCloud\Common\Error\NotImplementedError; @@ -27,7 +27,7 @@ class image implements Core{ /** @var App $app protected, contains the main app object */ protected $app; - /** @var OpenStack\Identity $libClass protected, contains the library Identity object */ + /** @var OpenStack\Image $libClass protected, contains the library Image object */ protected $libClass; /** @@ -35,7 +35,7 @@ class image implements Core{ * * @param App $app the main app object * - * @return Image + * @return image Object */ public function __construct($app){ if(!isset($app)){ @@ -51,7 +51,7 @@ class image implements Core{ * * @param String $action name of another function of this class * - * @return NULL + * @return void */ public function action($action){ $this->{$action.""}(); @@ -62,7 +62,7 @@ class image implements Core{ * * @param array $opt Options for the image creation (name is required, others are optionals) * - * @return Image + * @return void */ private function createImage(){ $opt = $this->app->getPostParam("opt"); @@ -141,7 +141,7 @@ class image implements Core{ /** * List the images of the server * - * @return List of Image + * @return void */ private function listImage(){ try{ @@ -171,7 +171,7 @@ class image implements Core{ * * @param String $id Identifier of the image * - * @return Image + * @return void */ private function detailsImage(){ $id = $this->app->getPostParam("id"); @@ -209,7 +209,7 @@ class image implements Core{ * @param String $id id of the image * @param array $opt Options for the image creation * - * @return Image + * @return void */ private function updateImage(){ @@ -272,7 +272,7 @@ class image implements Core{ * * @param String $id Identifier of the image * - * @return NULL + * @return void */ private function deleteImage(){ $id = $this->app->getPostParam("id"); @@ -302,11 +302,11 @@ class image implements Core{ } /** - * Resactive an image + * Reactive an image * * @param String $id Identifier of the image * - * @return NULL + * @return void */ private function reactivateImage(){ $id = $this->app->getPostParam("id"); @@ -339,11 +339,11 @@ class image implements Core{ } /** - * Desactive an image + * Desactivaate an image * * @param String $id Identifier of the image * - * @return NULL + * @return void */ private function desactivateImage(){ $id = $this->app->getPostParam("id"); @@ -380,7 +380,7 @@ class image implements Core{ * @param String $id Identifier of the image * @param String $file_name Path of the image * - * @return NULL + * @return void */ private function uploadImage(){ $id = $this->app->getPostParam("id"); @@ -422,7 +422,7 @@ class image implements Core{ * * @param String $id Identifier of the image * - * @return Stream + * @return void */ private function downloadImage(){ $id = $this->app->getPostParam("id"); @@ -459,7 +459,7 @@ class image implements Core{ * @param String $image_id Identifier of the image * @param String $member_id Identifier of the member * - * @return Member + * @return void */ private function addMemberImage(){ $image_id = $this->app->getPostParam("image_id"); @@ -501,7 +501,7 @@ class image implements Core{ * * @param String $image_id identifier of the image * - * @return List of Member + * @return void */ private function listMemberImage(){ $image_id = $this->app->getPostParam("image_id"); @@ -545,7 +545,7 @@ class image implements Core{ * @param String $image_id Identifier of the image * @param String $member_id Identifier of the member * - * @return Member + * @return void */ private function detailMemberImage(){ $image_id = $this->app->getPostParam("image_id"); @@ -591,7 +591,7 @@ class image implements Core{ * @param String $image_id Identifier of the image * @param String $member_id Identifier of the member * - * @return NULL + * @return void */ private function removeMemberImage(){ $image_id = $this->app->getPostParam("image_id"); @@ -637,7 +637,7 @@ class image implements Core{ * @param String $member_id Identifier of the member * @param String $status New status for the member * - * @return NULL + * @return void **/ private function updateMemberImage(){ $image_id = $this->app->getPostParam("image_id"); diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php index 68a7dbd..f0b3b88 100755 --- a/server/core/LibOverride/genTokenOptions.php +++ b/server/core/LibOverride/genTokenOptions.php @@ -1,4 +1,14 @@ stack = HandlerStack::create(); + $stack = HandlerStack::create(); $httpClient = new Client([ 'base_uri' => Utils::normalizeUrl($options['authUrl']), - 'handler' => $this->stack, + 'handler' => $stack, ]); $this->httpClient = $httpClient; @@ -38,8 +65,13 @@ class genTokenOptions } /** - * @codeCoverageIgnore - */ + * Add a debug for the library + * + * @param array $options Debug options, cf library + * @param HandlerStack $stack pointer to a HandlerStack object + * + * @return void + */ private function addDebugMiddleware(array $options, HandlerStack &$stack) { if (!empty($options['debugLog']) @@ -50,12 +82,20 @@ class genTokenOptions } } + /** + * Check the expiration time of a token + * + * @return boolean if the token is not expired + */ public function checkToken(){ - //error_log(print_r($this->backup['time'], true), 0); return $this->backup['time'] > time(); - //return true; } + /** + * Generate a new token for the Identity service + * + * @return void + */ public function genIdentityToken(){ $options = $this->optionsGlobal['Common']; $options['catalogName'] = 'false'; @@ -81,12 +121,24 @@ class genTokenOptions $this->optionsGlobal['Identity'] = $options; } + /** + * Revoke the token for the Identity Service + * + * @return void + */ public function revokeIdentityToken(){ $token = $this->unserializeToken($this->backup['Identity']['token']); $this->optionsGlobal['Common']['identityService']->revokeToken($token->id); } + /** + * Load a token for the Identity Service + * + * @param String $opt serialized token + * + * @return void + */ public function loadIdentityBackup($opt){ $options = $this->optionsGlobal['Common']; $options['catalogName'] = 'false'; @@ -112,6 +164,11 @@ class genTokenOptions } + /** + * Generate a new token for the Image service + * + * @return void + */ public function genImageToken(){ $options = $this->optionsGlobal['Common']; $options['catalogName'] = 'glance'; @@ -135,12 +192,24 @@ class genTokenOptions $this->optionsGlobal['Image'] = $options; } + /** + * Revoke the token for the Image Service + * + * @return void + */ public function revokeImageToken(){ $token = $this->unserializeToken($this->backup['Image']['token']); $this->optionsGlobal['Common']['identityService']->revokeToken($token->id); } + /** + * Load a token for the Image Service + * + * @param String $opt serialized token + * + * @return void + */ public function loadImageBackup($opt){ $options = $this->optionsGlobal['Common']; $options['catalogName'] = 'glance'; @@ -165,6 +234,11 @@ class genTokenOptions $this->optionsGlobal['Image'] = $options; } + /** + * Generate a new token for the Metwork service + * + * @return void + */ public function genNetworkToken(){ $options = $this->optionsGlobal['Common']; $options['catalogName'] = 'neutron'; @@ -188,12 +262,24 @@ class genTokenOptions $this->optionsGlobal['Network'] = $options; } + /** + * Revoke the token for the Network Service + * + * @return void + */ public function revokeNetworkToken(){ $token = $this->unserializeToken($this->backup['Network']['token']); $this->optionsGlobal['Common']['identityService']->revokeToken($token->id); } + /** + * Load a token for the Network Service + * + * @param String $opt serialized token + * + * @return void + */ public function loadNetworkBackup($opt){ $options = $this->optionsGlobal['Common']; $options['catalogName'] = 'neutron'; @@ -218,6 +304,11 @@ class genTokenOptions $this->optionsGlobal['Network'] = $options; } + /** + * Generate a new token for the Compute service + * + * @return void + */ public function genComputeToken(){ $options = $this->optionsGlobal['Common']; $options['catalogName'] = 'nova'; @@ -241,12 +332,24 @@ class genTokenOptions $this->optionsGlobal['Compute'] = $options; } + /** + * Revoke the token for the Compute Service + * + * @return void + */ public function revokeComputeToken(){ $token = $this->unserializeToken($this->backup['Compute']['token']); $this->optionsGlobal['Common']['identityService']->revokeToken($token->id); } + /** + * Load a token for the Compute Service + * + * @param String $opt serialized token + * + * @return void + */ public function loadComputeBackup($opt){ $options = $this->optionsGlobal['Common']; @@ -272,10 +375,16 @@ class genTokenOptions $this->optionsGlobal['Compute'] = $options; } + /** + * Save the token given a service name + * + * @param String $name name of the service to save + * @param Array $data token and baseUrl for the service + * + * @return void + */ private function saveBackup($name, $data){ $token = $this->serializeToken($data["token"]); - //$path = "core/LibOverride/projectTokenData/".$token['saved']["project"]["name"]; - //error_log("Path a ecrire ".print_r($path, true), 0); file_put_contents("core/LibOverride/projectTokenData/".$token['saved']["project"]["name"], serialize($token['saved'])); $this->backup['time'] = $token['time']; $this->backup["roles"] = $token["roles"]; @@ -284,10 +393,22 @@ class genTokenOptions $this->backup[$name] = array('token' => $token["token"], 'baseUrl' => $data["baseUrl"] ); } + /** + * Retrieve the tokens saved + * + * @return String tokens serialized + */ public function getBackup(){ return serialize($this->backup); } + /** + * Load tokens into the library + * + * @param String $back tokens serialized + * + * @return void + */ public function loadBackup($back){ $backup = unserialize($back); @@ -302,10 +423,24 @@ class genTokenOptions } + /** + * Retrieve the common options for a service + * + * @param String $service name of the service + * + * @return array Options to create the library class corresponding to this service + */ public function getOptions($service){ return $this->optionsGlobal[$service]; } + /** + * Serialize a given token + * + * @param Array $token token to be serialized + * + * @return String token serialized + */ private function serializeToken($token){ global $config; $tokenSerialized = []; @@ -358,6 +493,15 @@ class genTokenOptions return $tokenSerialized; } + /** + * Unserialize a token + * + * Unserialize a token and recreate the architecture of the library token + * + * @param String $tokenSerialized the token to be unserialized + * + * @return OpenCloud\Common\Auth\Token the token unserialized + */ private function unserializeToken($tokenSerialized){ $Saved = file_get_contents("core/LibOverride/projectTokenData/".$this->backup["project"]); $Saved = unserialize($Saved); diff --git a/server/core/Network.php b/server/core/Network.php index 54b5d60..ee66eaa 100755 --- a/server/core/Network.php +++ b/server/core/Network.php @@ -7,7 +7,6 @@ * * @author KABIR Othmane * -* @todo Complete the functions with errors detection and finish the descriptions */ use OpenCloud\Common\Error\BadResponseError; use OpenCloud\Common\Error\BaseError; @@ -17,11 +16,10 @@ use OpenCloud\Common\Error\UserInputError; /** * Network Class of the back-end application * -* ADD CLASS DESCRIPTION +* Management of Networks * */ - -class network{ +class network implements Core{ /** @var App $app protected, contains the main app object */ protected $app; /** @var OpenStack\Network $libClass protected, contains the library Network object */ @@ -29,15 +27,12 @@ class network{ /** - * Image constructor + * Network constructor * * @param App $app the main app object * - * @return Network + * @return network Object */ - - - public function __construct($app){ $this->app = $app; $this->libClass = $app->getLibClass("Network"); @@ -49,7 +44,7 @@ class network{ * * @param String $action name of another function of this class * - * @return NULL + * @return void */ public function action($action){ @@ -65,7 +60,7 @@ class network{ * @param String shared Specifies whether the network resource can be accessed by any tenant * @param String tenantId Owner of network. Only admin users can specify a tenant ID other than their own * - * @return NULL + * @return void */ private function create_network() { @@ -134,9 +129,7 @@ class network{ * @param BOOLEAN enableDhcp Specifies whether DHCP is enabled for this subnet * @param String allocationPools Subranges of the CIDR available for dynamic allocation to ports * - * - * - * @return NULL + * @return void */ private function create_subnet() @@ -225,7 +218,7 @@ class network{ /** * List the ID of the NETWORKS * - * @return List of Networks ID + * @return void */ private function list_network_ids() @@ -276,18 +269,12 @@ class network{ try { $ln = $this->libClass->listNetworks(); - $list_names = array(); - foreach($ln as $n) { - $list_names[] = $n->name; - - } - } catch(BadResponseError $e) { @@ -308,10 +295,11 @@ class network{ $this->app->setOutput("ListNetworkNames", $list_names); } + /** * List the CIDR of the SUBNETS * - * @return List of SUBNETS CIDR + * @return void */ private function list_cidr() { @@ -344,10 +332,13 @@ class network{ $this->app->getErrorInstance->NotImplementedHandler($e); } } + /** * retrieve a specific network + * * @param networkId ID of network which we want to get - * @return Network + * + * @return void */ private function getNetwork() { @@ -383,8 +374,10 @@ class network{ /** * internal function + * * @param String netId ID of network which we want to get - * @return Network + * + * @return OpenStack\Network */ private function getNetworkP($netId) { @@ -420,8 +413,10 @@ class network{ /** * retrieve a specific subnet + * * @param subnetId ID of subnet which we want to get - * @return subnet + * + * @return void */ private function getSubnet() { @@ -455,8 +450,10 @@ class network{ } /** * internal function + * * @param String subnetId ID of subnet which we want to get - * @return subnet + * + * @return OpenStack\Subnet */ private function getSubnetP($subnetId) { @@ -498,7 +495,7 @@ class network{ * @param String tenantId Owner of network. Only admin users can specify a tenant ID other than their own * * - * @return NULL + * @return void **/ private function updateNetwork() @@ -561,7 +558,7 @@ class network{ * @param String allocationPools Subranges of the CIDR available for dynamic allocation to ports * * - * @return NULL + * @return void **/ private function updateSubnet() @@ -616,8 +613,7 @@ class network{ * * @param String networkId ID if network which we want to delete * - * - * @return NULL + * @return void **/ private function deleteNetwork() { @@ -650,8 +646,7 @@ class network{ * * @param String subnetId ID if network which we want to delete * - * - * @return NULL + * @return void **/ private function deleteSubnet() { @@ -692,7 +687,7 @@ class network{ * @param String securityGroups Specifies the IDs of any security groups associated with this port * @param String tenantId Owner of the port. Only admin users can specify a tenant ID other than their own. * - * @return NULL + * @return void */ private function createPort() @@ -769,7 +764,7 @@ class network{ /** * List the of ports * - * @return List of ports + * @return void */ private function listPorts() @@ -798,8 +793,10 @@ class network{ /** * retrieve a specific port given + * * @param portId ID of port which we want to get - * @return port + * + * @return void */ private function getPort() @@ -831,8 +828,11 @@ class network{ /** * internal function + * * retrieve a specific port given + * * @param portId ID of port which we want to get + * * @return port */ @@ -876,7 +876,7 @@ class network{ * @param String securityGroups Specifies the IDs of any security groups associated with this port * @param String tenantId Owner of the port. Only admin users can specify a tenant ID other than their own. * - * @return NULL + * @return void */ private function updatePort() { @@ -953,7 +953,8 @@ class network{ * Delete a port given * * @param String portId id of port which we wante to delete - * @return NULL + * + * @return void */ private function deletePort() { @@ -988,7 +989,7 @@ class network{ * @param String name A human-readable name for the security group. This name might not be unique * @param String description Description of the security group * - * @return NULL + * @return void */ private function createSecurityGroup() @@ -1032,15 +1033,15 @@ class network{ * Create a new security groupe * * @param String securityGroupId The security group ID to associate with this security group rule. - * @param String direction The direction in which the security group rule is applied. For a compute instance, an ingress security group * rule is applied to incoming (ingress) traffic for that instance. An egress rule is applied to traffic leaving the instance. + * @param String direction The direction in which the security group rule is applied. For a compute instance, an ingress security group rule is applied to incoming (ingress) traffic for that instance. An egress rule is applied to traffic leaving the instance. * @param String ethertype Must be IPv4 or IPv6, and addresses represented in CIDR must match the ingress or egress rules. - * @param String portRangeMin The minimum port number in the range that is matched by the security group rule. If the protocol is TCP or UDP, this value must be less than or equal to the value of the portRangeMax attribute. If the protocol is ICMP, this value must be an ICMP type - *@param String portRangeMax The maximum port number in the range that is matched by the security group rule. If the protocol is TCP or UDP, this value must be less than or equal to the value of the portRangeMax attribute. If the protocol is ICMP, this value must be an ICMP type. - *@param String protocol The protocol that is matched by the security group rule - *@param String remoteGroupId The remote group ID to be associated with this security group rule. You can specify either remoteGroupId or remoteGroupPrefix - *@param String remoteIpPrefix The remote IP prefix to be associated with this security group rule. You can specify either remoteGroupId or remoteGroupPrefix + * @param String portRangeMin The minimum port number in the range that is matched by the security group rule. If the protocol is TCP or UDP, this value must be less than or equal to the value of the portRangeMax attribute. If the protocol is ICMP, this value must be an ICMP type + * @param String portRangeMax The maximum port number in the range that is matched by the security group rule. If the protocol is TCP or UDP, this value must be less than or equal to the value of the portRangeMax attribute. If the protocol is ICMP, this value must be an ICMP type. + * @param String protocol The protocol that is matched by the security group rule + * @param String remoteGroupId The remote group ID to be associated with this security group rule. You can specify either remoteGroupId or remoteGroupPrefix + * @param String remoteIpPrefix The remote IP prefix to be associated with this security group rule. You can specify either remoteGroupId or remoteGroupPrefix * - * @return NULL + * @return void */ private function createSecurityGroupRule() { @@ -1112,7 +1113,7 @@ class network{ /** * List of Security Groupes * - * @return List of Security Groupes + * @return void */ private function listSecurityGroupe() @@ -1143,7 +1144,7 @@ class network{ /** * List of Security Groupe Rules * - * @return List of Security Groupe Rules + * @return void */ private function listSecurityGroupeRule() @@ -1174,8 +1175,10 @@ class network{ /** * retrieve a specific Security Groupe given + * * @param securityGroupeId ID of security Groupe which we want to get - * @return securityGroupe + * + * @return void */ private function getSecurityGroupe() @@ -1207,9 +1210,12 @@ class network{ /** * internal function + * * retrieve a specific Security Groupe given + * * @param securityGroupeId ID of security Groupe which we want to get - * @return securityGroupe + * + * @return securityGroup */ private function getSecurityGroupeP($securityGroupeId) { @@ -1238,8 +1244,10 @@ class network{ } /** * Delete a specific Security Groupe given + * * @param securityGroupeId ID of security Groupe which we want to get - * @return NULL + * + * @return void */ private function deleteSecurityGroupe() { diff --git a/server/core/NetworkLayer3.php b/server/core/NetworkLayer3.php index c0b773a..35bf707 100755 --- a/server/core/NetworkLayer3.php +++ b/server/core/NetworkLayer3.php @@ -1,41 +1,41 @@ {$action.""}(); @@ -61,7 +61,7 @@ class networkLayer3 { /** * List floatingip * - * @return list of the floatingip + * @return void */ private function listFloatingIp(){ try{ @@ -91,7 +91,7 @@ class networkLayer3 { * * @param array $opt Options for the floating ip creation (floatingNetworkId is required) * - * @return floatingip + * @return void */ private function createFloatingIp(){ $opt = $this->app->getPostParam("opt"); @@ -126,7 +126,7 @@ class networkLayer3 { * * @param String id the id of the floatingip * - * @return floatingip details + * @return void */ private function getFloatingIp(){ $id = $this->app->getPostParam("id"); @@ -175,7 +175,7 @@ class networkLayer3 { * * @param id the id of the floatingip to update * - * @return NULL + * @return void */ private function updateFloatingIp(){ $id = $this->app->getPostParam("id"); @@ -224,7 +224,7 @@ class networkLayer3 { * * @param string floatingip_id the floating-ip id to delete * - * @return NULL + * @return void */ private function deleteFloatingIp(){ $id = $this->app->getPostParam("id"); @@ -273,7 +273,7 @@ class networkLayer3 { * * @param string floatingip_id the floating-ip id to retrieve * - * @return NULL + * @return void */ private function retrieveFloatingIp(){ $id = $this->app->getPostParam("id"); @@ -326,7 +326,7 @@ class networkLayer3 { * adminStateUp (optionnal) * name (optionnal) * - * @return router + * @return void */ private function createRouter(){ $opt = $this->app->getPostParam("opt"); @@ -359,7 +359,7 @@ class networkLayer3 { /** * List routers * - * @return list of the routers + * @return void */ private function listRouters(){ try{ @@ -389,7 +389,7 @@ class networkLayer3 { * * @param String id the id of the router * - * @return router details + * @return void */ private function getRouter(){ $id = $this->app->getPostParam("id"); @@ -437,7 +437,7 @@ class networkLayer3 { * * @param string router the router to delete * - * @return NULL + * @return void */ private function deleteRouter(){ $id = $this->app->getPostParam("id"); @@ -485,7 +485,7 @@ class networkLayer3 { * * @param id the id of the floatingip to update * - * @return NULL + * @return void */ private function updateRouter(){ $id = $this->app->getPostParam("id"); diff --git a/server/index.php b/server/index.php index 01203de..25c7c2e 100755 --- a/server/index.php +++ b/server/index.php @@ -9,6 +9,8 @@ * */ +/* +*/ //loading dependencies require "vendor/autoload.php"; //Include general config file diff --git a/server/init.php b/server/init.php index 767224a..e6a90fb 100755 --- a/server/init.php +++ b/server/init.php @@ -1,14 +1,17 @@