From dff92c2d58f1683988f1cb8f170c7086e06105c3 Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Sun, 14 Feb 2016 18:41:45 +0100 Subject: tests --- server/core/Image.php | 50 ++++++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) (limited to 'server/core') diff --git a/server/core/Image.php b/server/core/Image.php index 3001eea..125f6ad 100644 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -1,7 +1,4 @@ oidentity->createImage($options); + $image = $this->libClass->createImage($options); return $image; } - /* - * List images + /** + * List the images of the server + * + * @return the list with all images on the server */ - public function list_images(){ + $images["listImages"] = function() { // vérifier si au moins une image - $service = $this->oidentity; - $images = $service->listImages(); - return $images; + $this->libClass->listImages(); + //return $l; } /** @@ -117,7 +115,7 @@ class image{ **/ public function image_details($id){ //vérifier existence image - $service = $this->oidentity; + $service = $this->libClass; $image = $service->getImage($id); return $image; } @@ -133,7 +131,7 @@ class image{ **/ public function update_image($id, array $opt){ //vérifier existence image - $service = $this->oidentity; + $service = $this->libClass; $image = $service->getImage($id); $options = Array(); @@ -170,7 +168,7 @@ class image{ public function delete_image($id){ // si protected = true, demander de le mettre a false // vérifier existence image - $service = $this->oidentity; + $service = $this->libClass; $service->getImage($id)->delete(); } @@ -182,7 +180,7 @@ class image{ **/ public function reactivate_image($id){ // vérifier existence image - $service = $this->oidentity; + $service = $this->libClass; $image = $service->getImage($id); $image->reactivate(); } @@ -195,7 +193,7 @@ class image{ **/ public function desactivate_image($id){ // vérifier existence image - $service = $this->oidentity; + $service = $this->libClass; $image = $service->getImage($id); $image->deactivate(); } @@ -211,7 +209,7 @@ class image{ **/ public function upload_image($id, $file_name){ // vérifier existence image - $service = $this->oidentity; + $service = $this->libClass; $image = $service->getImage($id); $stream = \GuzzleHttp\Psr7\stream_for(fopen($file_name, 'r')); // A VOIR $image->uploadData($stream); @@ -225,7 +223,7 @@ class image{ **/ public function download_image($id){ // vérifier existence image - $service = $this->oidentity; + $service = $this->libClass; $image = $service->getImage($id); $stream = $image->downloadData(); return $stream; @@ -244,7 +242,7 @@ class image{ // vérifier existence image // on doit être le proprio de l'image // vérifier membre existe - $service = $this->oidentity; + $service = $this->libClass; $member_id = $service>getImage($image_id)->addMember($member_id); } @@ -257,7 +255,7 @@ class image{ **/ public function list_member($image_id, $member_id){ // vérifier existence image - $service = $this->oidentity; + $service = $this->libClass; $image = $service->getImage($image_id); $members = $image->listMembers(); return $members; @@ -276,7 +274,7 @@ class image{ // vérifier existence image // on doit être le proprio de l'image // vérifier membre existe - $service = $this->oidentity; + $service = $this->libClass; $member = $service>getImage($image_id)->getMember($member_id); return $member; } @@ -294,7 +292,7 @@ class image{ // vérifier existence image // on doit être le proprio de l'image // vérifier membre existe - $service = $this->oidentity; + $service = $this->libClass; $service>getImage($image_id)->getMember($member_id)->delete(); } @@ -314,7 +312,7 @@ class image{ // vérifier existence image // on doit être le proprio de l'image // vérifier membre existe - $service = $this->oidentity; + $service = $this->libClass; $member = $service>getImage($image_id)->getMember($member_id)->updateStatus($status); } -- cgit v1.2.3 From a90cc995ff44821234f8ae37cbbb685d3dd75a8e Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Wed, 17 Feb 2016 16:09:44 +0100 Subject: Renaming functions --- server/Test/imageTests.php | 56 +++++++++++++++++++++++++--------------------- server/core/Image.php | 32 +++++++++++++------------- 2 files changed, 47 insertions(+), 41 deletions(-) (limited to 'server/core') diff --git a/server/Test/imageTests.php b/server/Test/imageTests.php index b406cee..39e83e1 100644 --- a/server/Test/imageTests.php +++ b/server/Test/imageTests.php @@ -14,51 +14,57 @@ $opt['minDisk'] = 1; $opt['protected'] = false; $opt['minRam'] = 10; -//$new_image = $image->create_image($opt); +//$new_image = $image->createImage($opt); //Liste des images -$images = $image["listImages"]; +$images = $image->listImage(); -echo "Images présentes :"; -echo "
"; - -foreach($images as $i){ - echo $i->name; - if($i->name == "Test"){ - $id_image = $i->id; - $list = $i->tags; - echo $i->status; +if(isset($images)){ + echo "Images présentes :"; + echo "
"; + foreach($images as $i){ + echo $i->name; + if($i->name == "Test"){ + $id_image = $i->id; + $list = $i->tags; + echo $i->status; + } + echo "
"; } echo "
"; -} -echo "
"; -if(isset($list)){ - foreach ($list as $l) { - echo $l; - echo "
"; - } + if(isset($list)){ + foreach ($list as $l) { + echo $l; + echo "
"; + } } +} +else{ + echo "Aucune image présente\n"; +} + + // Détails Image -//$details = $image->image_details($id_image); +//$details = $image->imageDetails($id_image); -//$image->delete_image('123456'); +//$image->deleteImage('123456'); -//$image->desactivate_image($id_image); -//$image->reactivate_image($id_image); +//$image->desactivateImage($id_image); +//$image->reactivateImage($id_image); //$file_name = "/home/yogg/Downloads/TinyCore-6.4.1.iso"; -//$image->upload_image($id_image, $file_name); +//$image->uploadImage($id_image, $file_name); -//$image->download_image($id_image); +//$image->downloadImage($id_image); /* $opt_update = Array(); $opt_update['name'] = "Test"; $opt_update['tags'] = null; -$update = $image->update_image($id_image, $opt_update); +$update = $image->updateImage($id_image, $opt_update); echo $update->name; */ diff --git a/server/core/Image.php b/server/core/Image.php index 125f6ad..637966c 100644 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -17,7 +17,7 @@ use OpenStack\Common\Error; * ADD CLASS DESCRIPTION * */ -class image implements Core{ +class image { //implements Core /** @var App $app protected, contains the main app object */ @@ -45,7 +45,7 @@ class image implements Core{ } - $images = array(); + private $images = array(); /** * Details about an image @@ -54,7 +54,7 @@ class image implements Core{ * options for the image creation * **/ - public function create_image(array $opt){ + public function createImage(array $opt){ // VOIR SI MAUVAIS TYPE $options = Array(); if(isset($opt['name'])){ // string, rendre le nom obligatoire, vérifier nom pas déjà pris @@ -100,7 +100,7 @@ class image implements Core{ * * @return the list with all images on the server */ - $images["listImages"] = function() { + public function listImage(){ // vérifier si au moins une image $this->libClass->listImages(); //return $l; @@ -113,7 +113,7 @@ class image implements Core{ * identifier of the image * **/ - public function image_details($id){ + public function detailsImage($id){ //vérifier existence image $service = $this->libClass; $image = $service->getImage($id); @@ -129,7 +129,7 @@ class image implements Core{ * @param array $opt * options for the image creation **/ - public function update_image($id, array $opt){ + public function updateImage($id, array $opt){ //vérifier existence image $service = $this->libClass; $image = $service->getImage($id); @@ -165,7 +165,7 @@ class image implements Core{ * @param string $id * identifier of the image **/ - public function delete_image($id){ + public function imageDelete($id){ // si protected = true, demander de le mettre a false // vérifier existence image $service = $this->libClass; @@ -178,7 +178,7 @@ class image implements Core{ * @param string $id * identifier of the image **/ - public function reactivate_image($id){ + public function reactivateImage($id){ // vérifier existence image $service = $this->libClass; $image = $service->getImage($id); @@ -191,7 +191,7 @@ class image implements Core{ * @param string $id * identifier of the image **/ - public function desactivate_image($id){ + public function desactivateImage($id){ // vérifier existence image $service = $this->libClass; $image = $service->getImage($id); @@ -207,7 +207,7 @@ class image implements Core{ * @param string $file_name * path of the image **/ - public function upload_image($id, $file_name){ + public function uploadImage($id, $file_name){ // vérifier existence image $service = $this->libClass; $image = $service->getImage($id); @@ -221,7 +221,7 @@ class image implements Core{ * @param string $id * identifier of the image **/ - public function download_image($id){ + public function downloadImage($id){ // vérifier existence image $service = $this->libClass; $image = $service->getImage($id); @@ -238,7 +238,7 @@ class image implements Core{ * @param string $member_id * identifier of the member **/ - public function add_member($image_id, $member_id){ + public function addMemberImage($image_id, $member_id){ // vérifier existence image // on doit être le proprio de l'image // vérifier membre existe @@ -253,7 +253,7 @@ class image implements Core{ * @param string $image_id * identifier of the image **/ - public function list_member($image_id, $member_id){ + public function listMemberImage($image_id, $member_id){ // vérifier existence image $service = $this->libClass; $image = $service->getImage($image_id); @@ -270,7 +270,7 @@ class image implements Core{ * @param string $member_id * identifier of the member **/ - public function detail_member($image_id, $member_id){ + public function detailMemberImage($image_id, $member_id){ // vérifier existence image // on doit être le proprio de l'image // vérifier membre existe @@ -288,7 +288,7 @@ class image implements Core{ * @param string $member_id * identifier of the member **/ - public function remove_member($image_id, $member_id){ + public function removeMemberImage($image_id, $member_id){ // vérifier existence image // on doit être le proprio de l'image // vérifier membre existe @@ -308,7 +308,7 @@ class image implements Core{ * @param string $status * new status for the member **/ - public function update_member($image_id, $member_id, $status){ + public function updateMemberImage($image_id, $member_id, $status){ // vérifier existence image // on doit être le proprio de l'image // vérifier membre existe -- cgit v1.2.3 From 81bc109269722745a475eac0f7aa9d14b3ffe66b Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Wed, 17 Feb 2016 17:16:57 +0100 Subject: Add control of parameters errors --- server/Test/imageTests.php | 2 +- server/core/Image.php | 83 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 80 insertions(+), 5 deletions(-) (limited to 'server/core') diff --git a/server/Test/imageTests.php b/server/Test/imageTests.php index 39e83e1..47a69e2 100644 --- a/server/Test/imageTests.php +++ b/server/Test/imageTests.php @@ -49,7 +49,7 @@ else{ // Détails Image //$details = $image->imageDetails($id_image); -//$image->deleteImage('123456'); +$image->deleteImage('123456'); //$image->desactivateImage($id_image); //$image->reactivateImage($id_image); diff --git a/server/core/Image.php b/server/core/Image.php index 637966c..15facc9 100644 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -40,6 +40,9 @@ class image { * @return Image */ public function __construct($app){ + if(!isset($app)){ + // Renvoyer erreur + } $this->app = $app; $this->libClass = $app->getLibClass("Image"); } @@ -54,7 +57,10 @@ class image { * options for the image creation * **/ - public function createImage(array $opt){ + public function createImage(array $opt){ + if(!isset($opt)){ + // Renvoyer erreur + } // VOIR SI MAUVAIS TYPE $options = Array(); if(isset($opt['name'])){ // string, rendre le nom obligatoire, vérifier nom pas déjà pris @@ -114,6 +120,9 @@ class image { * **/ public function detailsImage($id){ + if(!isset($id)){ + // Renvoyer erreur + } //vérifier existence image $service = $this->libClass; $image = $service->getImage($id); @@ -130,6 +139,12 @@ class image { * options for the image creation **/ public function updateImage($id, array $opt){ + if(!isset($id)){ + // Renvoyer erreur + } + if(!isset($opt)){ + // Renvoyer erreur + } //vérifier existence image $service = $this->libClass; $image = $service->getImage($id); @@ -165,11 +180,26 @@ class image { * @param string $id * identifier of the image **/ - public function imageDelete($id){ + public function deleteImage($id){ // si protected = true, demander de le mettre a false // vérifier existence image - $service = $this->libClass; - $service->getImage($id)->delete(); + if(!isset($id)){ + // Renvoyer erreur + } + try{ + $service = $this->libClass; + $service->getImage($id)->delete(); + }catch(BadResponseError $e){ + echo "YOLO"; + $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); + } + } /** @@ -179,6 +209,9 @@ class image { * identifier of the image **/ public function reactivateImage($id){ + if(!isset($id)){ + // Renvoyer erreur + } // vérifier existence image $service = $this->libClass; $image = $service->getImage($id); @@ -192,6 +225,9 @@ class image { * identifier of the image **/ public function desactivateImage($id){ + if(!isset($id)){ + // Renvoyer erreur + } // vérifier existence image $service = $this->libClass; $image = $service->getImage($id); @@ -208,6 +244,12 @@ class image { * path of the image **/ public function uploadImage($id, $file_name){ + if(!isset($id)){ + // Renvoyer erreur + } + if(!isset($file_name)){ + // Renvoyer erreur + } // vérifier existence image $service = $this->libClass; $image = $service->getImage($id); @@ -222,6 +264,9 @@ class image { * identifier of the image **/ public function downloadImage($id){ + if(!isset($id)){ + // Renvoyer erreur + } // vérifier existence image $service = $this->libClass; $image = $service->getImage($id); @@ -239,6 +284,12 @@ class image { * identifier of the member **/ public function addMemberImage($image_id, $member_id){ + if(!isset($image_id)){ + // Renvoyer erreur + } + if(!isset($member_id)){ + // Renvoyer erreur + } // vérifier existence image // on doit être le proprio de l'image // vérifier membre existe @@ -254,6 +305,12 @@ class image { * identifier of the image **/ public function listMemberImage($image_id, $member_id){ + if(!isset($image_id)){ + // Renvoyer erreur + } + if(!isset($member_id)){ + // Renvoyer erreur + } // vérifier existence image $service = $this->libClass; $image = $service->getImage($image_id); @@ -271,6 +328,12 @@ class image { * identifier of the member **/ public function detailMemberImage($image_id, $member_id){ + if(!isset($image_id)){ + // Renvoyer erreur + } + if(!isset($member_id)){ + // Renvoyer erreur + } // vérifier existence image // on doit être le proprio de l'image // vérifier membre existe @@ -289,6 +352,12 @@ class image { * identifier of the member **/ public function removeMemberImage($image_id, $member_id){ + if(!isset($image_id)){ + // Renvoyer erreur + } + if(!isset($member_id)){ + // Renvoyer erreur + } // vérifier existence image // on doit être le proprio de l'image // vérifier membre existe @@ -309,6 +378,12 @@ class image { * new status for the member **/ public function updateMemberImage($image_id, $member_id, $status){ + if(!isset($image_id)){ + // Renvoyer erreur + } + if(!isset($member_id)){ + // Renvoyer erreur + } // vérifier existence image // on doit être le proprio de l'image // vérifier membre existe -- cgit v1.2.3 From 58a936d0158e4f90596bfe88352f5a570094c436 Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Wed, 17 Feb 2016 17:56:11 +0100 Subject: Add errors features for tests calsses --- server/Test/AppTestClass.php | 13 +++++++++++++ server/core/Image.php | 10 ++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) (limited to 'server/core') diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php index 311b9bf..40a5847 100755 --- a/server/Test/AppTestClass.php +++ b/server/Test/AppTestClass.php @@ -1,6 +1,12 @@ openstack = new OpenStack\OpenStack([]); $this->pluginsApi = plugin_api::getInstance(); $this->output = array(); + $this->errorClass = new errorManagement($this); } @@ -70,4 +78,9 @@ class AppTest{ echo json_encode($this->output); } + public function getErrorInstance(){ + + return $this->errorClass; + + } } \ No newline at end of file diff --git a/server/core/Image.php b/server/core/Image.php index 15facc9..bc4834a 100644 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -9,8 +9,11 @@ * * @todo Complete the functions with errors detection and finish the descriptions */ -use OpenStack\Common\Error; - +use OpenStack\Common\Error\BadResponseError; +use OpenStack\Common\Error\BaseError; +use OpenStack\Common\Error\NotImplementedError; +use OpenStack\Common\Error\UserInputError; + /** * Image Class of the back-end application * @@ -190,8 +193,7 @@ class image { $service = $this->libClass; $service->getImage($id)->delete(); }catch(BadResponseError $e){ - echo "YOLO"; - $this->app->getErrorInstance->BadResponseHandler($e); + $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ $this->app->getErrorInstance->UserInputHandler($e); }catch(BaseError $e){ -- cgit v1.2.3 From 16e0328884f318d97ac991ee8e70f43ee1c14b38 Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Wed, 17 Feb 2016 18:29:03 +0100 Subject: Add errors management --- server/core/Image.php | 366 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 254 insertions(+), 112 deletions(-) (limited to 'server/core') diff --git a/server/core/Image.php b/server/core/Image.php index bc4834a..85a245f 100644 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -46,8 +46,18 @@ class image { if(!isset($app)){ // Renvoyer erreur } - $this->app = $app; - $this->libClass = $app->getLibClass("Image"); + try{ + $this->app = $app; + $this->libClass = $app->getLibClass("Image"); + }catch(BadResponseError $e){ + $this->app->getErrorInstance()->BadResponseHandler($e); + }catch(UserInputError $e){ + $this->app->getErrorInstance->UserInputHandler($e); + }catch(BaseError $e){ + $this->app->getErrorInstance->BaseErrorHandler($e); + }catch(NotImplementedError $e){ + $this->app->getErrorInstance->NotImplementedHandler($e); + } } @@ -63,44 +73,54 @@ class image { public function createImage(array $opt){ if(!isset($opt)){ // Renvoyer erreur - } - // VOIR SI MAUVAIS TYPE - $options = Array(); - if(isset($opt['name'])){ // string, rendre le nom obligatoire, vérifier nom pas déjà pris - } - else{ - //ERROR } - if(isset($opt['id'])){ // UUID : nnnnnnnn-nnnn-nnnn-nnnn-nnnnnnnnnnnn - $options['id'] = $opt['id']; - } - if(isset($opt['visibility'])){ // public, private - $options['visibility'] = $opt['visibility']; - } - if(isset($opt['tags'])){ // list - $options['tags'] = $opt['tags']; - } - if(isset($opt['containerFormat'])){ // string : ami, ari, aki, bare, ovf, ova, docker - $options['containerFormat'] = $opt['containerFormat']; - } - if(isset($opt['diskFormat'])){ // string : ami, ari, aki, vhd, vmdk, raw, qcow2, vdi, iso - $options['diskFormat'] = $opt['diskFormat']; - } - 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['properties'])){ // type dict ? - $options['properties'] = $opt['properties']; - } - $image = $this->libClass->createImage($options); + try{ + // VOIR SI MAUVAIS TYPE + $options = Array(); + if(isset($opt['name'])){ // string, rendre le nom obligatoire, vérifier nom pas déjà pris + } + else{ + //ERROR + } + if(isset($opt['id'])){ // UUID : nnnnnnnn-nnnn-nnnn-nnnn-nnnnnnnnnnnn + $options['id'] = $opt['id']; + } + if(isset($opt['visibility'])){ // public, private + $options['visibility'] = $opt['visibility']; + } + if(isset($opt['tags'])){ // list + $options['tags'] = $opt['tags']; + } + if(isset($opt['containerFormat'])){ // string : ami, ari, aki, bare, ovf, ova, docker + $options['containerFormat'] = $opt['containerFormat']; + } + if(isset($opt['diskFormat'])){ // string : ami, ari, aki, vhd, vmdk, raw, qcow2, vdi, iso + $options['diskFormat'] = $opt['diskFormat']; + } + 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['properties'])){ // type dict ? + $options['properties'] = $opt['properties']; + } + $image = $this->libClass->createImage($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); + } return $image; } @@ -110,9 +130,20 @@ class image { * @return the list with all images on the server */ public function listImage(){ - // vérifier si au moins une image - $this->libClass->listImages(); - //return $l; + try{ + // vérifier si au moins une image + $l = $this->libClass->listImages(); + }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 $l; + } /** @@ -126,10 +157,21 @@ class image { if(!isset($id)){ // Renvoyer erreur } - //vérifier existence image - $service = $this->libClass; - $image = $service->getImage($id); - return $image; + + try{ + //vérifier existence image + $service = $this->libClass; + $image = $service->getImage($id); + return $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); + } } /** @@ -148,32 +190,42 @@ class image { if(!isset($opt)){ // Renvoyer erreur } - //vérifier existence image - $service = $this->libClass; - $image = $service->getImage($id); - $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); + + try{ + //vérifier existence image + $service = $this->libClass; + $image = $service->getImage($id); + $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); + } return $image; } @@ -214,10 +266,20 @@ class image { if(!isset($id)){ // Renvoyer erreur } - // vérifier existence image - $service = $this->libClass; - $image = $service->getImage($id); - $image->reactivate(); + try{ + // vérifier existence image + $service = $this->libClass; + $image = $service->getImage($id); + $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); + } } /** @@ -230,10 +292,20 @@ class image { if(!isset($id)){ // Renvoyer erreur } - // vérifier existence image - $service = $this->libClass; - $image = $service->getImage($id); - $image->deactivate(); + try{ + // vérifier existence image + $service = $this->libClass; + $image = $service->getImage($id); + $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); + } } /** @@ -252,11 +324,21 @@ class image { if(!isset($file_name)){ // Renvoyer erreur } - // vérifier existence image - $service = $this->libClass; - $image = $service->getImage($id); - $stream = \GuzzleHttp\Psr7\stream_for(fopen($file_name, 'r')); // A VOIR - $image->uploadData($stream); + try{ + // vérifier existence image + $service = $this->libClass; + $image = $service->getImage($id); + $stream = \GuzzleHttp\Psr7\stream_for(fopen($file_name, 'r')); // A VOIR + $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); + } } /** @@ -269,11 +351,21 @@ class image { if(!isset($id)){ // Renvoyer erreur } - // vérifier existence image - $service = $this->libClass; - $image = $service->getImage($id); - $stream = $image->downloadData(); - return $stream; + try{ + // vérifier existence image + $service = $this->libClass; + $image = $service->getImage($id); + $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); + } + return $stream; } /** @@ -292,11 +384,21 @@ class image { if(!isset($member_id)){ // Renvoyer erreur } - // vérifier existence image - // on doit être le proprio de l'image - // vérifier membre existe - $service = $this->libClass; - $member_id = $service>getImage($image_id)->addMember($member_id); + try{ + // vérifier existence image + // on doit être le proprio de l'image + // vérifier membre existe + $service = $this->libClass; + $member_id = $service>getImage($image_id)->addMember($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); + } } @@ -313,10 +415,20 @@ class image { if(!isset($member_id)){ // Renvoyer erreur } - // vérifier existence image - $service = $this->libClass; - $image = $service->getImage($image_id); - $members = $image->listMembers(); + try{ + // vérifier existence image + $service = $this->libClass; + $image = $service->getImage($image_id); + $members = $image->listMembers(); + }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 $members; } @@ -336,11 +448,21 @@ class image { if(!isset($member_id)){ // Renvoyer erreur } - // vérifier existence image - // on doit être le proprio de l'image - // vérifier membre existe - $service = $this->libClass; - $member = $service>getImage($image_id)->getMember($member_id); + try{ + // vérifier existence image + // on doit être le proprio de l'image + // vérifier membre existe + $service = $this->libClass; + $member = $service>getImage($image_id)->getMember($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); + } return $member; } @@ -360,11 +482,21 @@ class image { if(!isset($member_id)){ // Renvoyer erreur } - // vérifier existence image - // on doit être le proprio de l'image - // vérifier membre existe - $service = $this->libClass; - $service>getImage($image_id)->getMember($member_id)->delete(); + try{ + // vérifier existence image + // on doit être le proprio de l'image + // vérifier membre existe + $service = $this->libClass; + $service>getImage($image_id)->getMember($member_id)->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); + } } /** @@ -386,12 +518,22 @@ class image { if(!isset($member_id)){ // Renvoyer erreur } - // vérifier existence image - // on doit être le proprio de l'image - // vérifier membre existe - $service = $this->libClass; - $member = $service>getImage($image_id)->getMember($member_id)->updateStatus($status); + try{ + // vérifier existence image + // on doit être le proprio de l'image + // vérifier membre existe + $service = $this->libClass; + $member = $service>getImage($image_id)->getMember($member_id)->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); + } } } -?> +?> \ No newline at end of file -- cgit v1.2.3 From 59dfbc78ffebf674591ecc6e7cbda32ee667381b Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Wed, 24 Feb 2016 14:51:23 +0100 Subject: add some error cases --- server/core/Image.php | 108 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 91 insertions(+), 17 deletions(-) (limited to 'server/core') diff --git a/server/core/Image.php b/server/core/Image.php index 85a245f..dba92ff 100644 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -29,10 +29,6 @@ class image { /** @var OpenStack\Identity $libClass protected, contains the library Identity object */ protected $libClass; - /** @var array $actions protected, contains the functions which can be call by the front-end */ - protected $actions = array(); - - /** * Image constructor * @@ -71,19 +67,33 @@ class image { * **/ public function createImage(array $opt){ + if(!isset($opt)){ // Renvoyer erreur } + try{ // VOIR SI MAUVAIS TYPE $options = Array(); - if(isset($opt['name'])){ // string, rendre le nom obligatoire, vérifier nom pas déjà pris + if(isset($opt['name'])){ // if the image name already exists -> error + $imagesList = listImage(); + if(isset($images)){ + foreach($imagesList as $image){ + if(strcmp($image->name, $opt['name']) == 0){ + + } + } + } + } else{ //ERROR } if(isset($opt['id'])){ // UUID : nnnnnnnn-nnnn-nnnn-nnnn-nnnnnnnnnnnn + if($this->libClass->getImage($opt['id']) != null){ // if the id already exists -> error + + } $options['id'] = $opt['id']; } if(isset($opt['visibility'])){ // public, private @@ -131,8 +141,10 @@ class image { */ public function listImage(){ try{ - // vérifier si au moins une image $l = $this->libClass->listImages(); + if(!isset($l)){ // if the list is empty there is no images + + } }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ @@ -157,11 +169,13 @@ class image { if(!isset($id)){ // Renvoyer erreur } - try{ - //vérifier existence image $service = $this->libClass; $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + // Renvoyer erreur + } + return $image; }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -190,11 +204,15 @@ class image { if(!isset($opt)){ // Renvoyer erreur } - + try{ //vérifier existence image $service = $this->libClass; $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + // Renvoyer erreur + } + $options = Array(); // Voir vérification des types @@ -241,9 +259,14 @@ class image { if(!isset($id)){ // Renvoyer erreur } + try{ $service = $this->libClass; - $service->getImage($id)->delete(); + $image = $this->libClass->getImage($id); + if($image == null){ // if the image don't exists -> error + // Renvoyer erreur + } + $image->delete(); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ @@ -270,6 +293,9 @@ class image { // vérifier existence image $service = $this->libClass; $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + // Renvoyer erreur + } $image->reactivate(); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -296,6 +322,9 @@ class image { // vérifier existence image $service = $this->libClass; $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + // Renvoyer erreur + } $image->deactivate(); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -328,6 +357,9 @@ class image { // vérifier existence image $service = $this->libClass; $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + // Renvoyer erreur + } $stream = \GuzzleHttp\Psr7\stream_for(fopen($file_name, 'r')); // A VOIR $image->uploadData($stream); }catch(BadResponseError $e){ @@ -355,6 +387,9 @@ class image { // vérifier existence image $service = $this->libClass; $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + // Renvoyer erreur + } $stream = $image->downloadData(); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -388,8 +423,14 @@ class image { // vérifier existence image // on doit être le proprio de l'image // vérifier membre existe - $service = $this->libClass; - $member_id = $service>getImage($image_id)->addMember($member_id); + $service = $this->libClass; + + $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + // Renvoyer erreur + } + + $member_id = $image->addMember($member_id); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ @@ -419,7 +460,13 @@ class image { // vérifier existence image $service = $this->libClass; $image = $service->getImage($image_id); + if($image == null){ // if the image don't exists -> error + // Renvoyer erreur + } $members = $image->listMembers(); + if($member == null){ // if the image don't exists -> error + // Renvoyer erreur + } }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ @@ -452,8 +499,17 @@ class image { // vérifier existence image // on doit être le proprio de l'image // vérifier membre existe - $service = $this->libClass; - $member = $service>getImage($image_id)->getMember($member_id); + $service = $this->libClass; + + $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + // Renvoyer erreur + } + + $member = $image->getMember($member_id); + if($member == null){ // if the image don't exists -> error + // Renvoyer erreur + } }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ @@ -486,8 +542,17 @@ class image { // vérifier existence image // on doit être le proprio de l'image // vérifier membre existe - $service = $this->libClass; - $service>getImage($image_id)->getMember($member_id)->delete(); + $service = $this->libClass; + + $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + // Renvoyer erreur + } + $member = $image->getMember($member_id); + if($member == null){ // if the image don't exists -> error + // Renvoyer erreur + } + $member->delete(); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ @@ -523,7 +588,16 @@ class image { // on doit être le proprio de l'image // vérifier membre existe $service = $this->libClass; - $member = $service>getImage($image_id)->getMember($member_id)->updateStatus($status); + + $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + // Renvoyer erreur + } + $member = $image->getMember($member_id); + if($member == null){ // if the image don't exists -> error + // Renvoyer erreur + } + $member->updateStatus($status); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ -- cgit v1.2.3 From 6349739a6c42d413e1bc1ea5068336187055c277 Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Wed, 24 Feb 2016 18:23:39 +0100 Subject: architecture update --- server/core/Image.php | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) (limited to 'server/core') diff --git a/server/core/Image.php b/server/core/Image.php index dba92ff..4d22443 100644 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -20,8 +20,7 @@ use OpenStack\Common\Error\UserInputError; * ADD CLASS DESCRIPTION * */ -class image { - //implements Core +class image implements Core{ /** @var App $app protected, contains the main app object */ protected $app; @@ -57,7 +56,18 @@ class image { } - private $images = array(); + /** + * Execute an action + * + * @param String $action name of another function of this class + * + * @return void + */ + public function action($action){ + + $this->{$action.""}(); + + } /** * Details about an image @@ -66,7 +76,7 @@ class image { * options for the image creation * **/ - public function createImage(array $opt){ + private function createImage(array $opt){ if(!isset($opt)){ // Renvoyer erreur @@ -139,7 +149,7 @@ class image { * * @return the list with all images on the server */ - public function listImage(){ + private function listImage(){ try{ $l = $this->libClass->listImages(); if(!isset($l)){ // if the list is empty there is no images @@ -165,7 +175,7 @@ class image { * identifier of the image * **/ - public function detailsImage($id){ + private function detailsImage($id){ if(!isset($id)){ // Renvoyer erreur } @@ -197,7 +207,7 @@ class image { * @param array $opt * options for the image creation **/ - public function updateImage($id, array $opt){ + private function updateImage($id, array $opt){ if(!isset($id)){ // Renvoyer erreur } @@ -253,7 +263,7 @@ class image { * @param string $id * identifier of the image **/ - public function deleteImage($id){ + private function deleteImage($id){ // si protected = true, demander de le mettre a false // vérifier existence image if(!isset($id)){ @@ -285,7 +295,7 @@ class image { * @param string $id * identifier of the image **/ - public function reactivateImage($id){ + private function reactivateImage($id){ if(!isset($id)){ // Renvoyer erreur } @@ -314,7 +324,7 @@ class image { * @param string $id * identifier of the image **/ - public function desactivateImage($id){ + private function desactivateImage($id){ if(!isset($id)){ // Renvoyer erreur } @@ -346,7 +356,7 @@ class image { * @param string $file_name * path of the image **/ - public function uploadImage($id, $file_name){ + private function uploadImage($id, $file_name){ if(!isset($id)){ // Renvoyer erreur } @@ -379,7 +389,7 @@ class image { * @param string $id * identifier of the image **/ - public function downloadImage($id){ + private function downloadImage($id){ if(!isset($id)){ // Renvoyer erreur } @@ -412,7 +422,7 @@ class image { * @param string $member_id * identifier of the member **/ - public function addMemberImage($image_id, $member_id){ + private function addMemberImage($image_id, $member_id){ if(!isset($image_id)){ // Renvoyer erreur } @@ -449,7 +459,7 @@ class image { * @param string $image_id * identifier of the image **/ - public function listMemberImage($image_id, $member_id){ + private function listMemberImage($image_id, $member_id){ if(!isset($image_id)){ // Renvoyer erreur } @@ -488,7 +498,7 @@ class image { * @param string $member_id * identifier of the member **/ - public function detailMemberImage($image_id, $member_id){ + private function detailMemberImage($image_id, $member_id){ if(!isset($image_id)){ // Renvoyer erreur } @@ -531,7 +541,7 @@ class image { * @param string $member_id * identifier of the member **/ - public function removeMemberImage($image_id, $member_id){ + private function removeMemberImage($image_id, $member_id){ if(!isset($image_id)){ // Renvoyer erreur } @@ -576,7 +586,7 @@ class image { * @param string $status * new status for the member **/ - public function updateMemberImage($image_id, $member_id, $status){ + private function updateMemberImage($image_id, $member_id, $status){ if(!isset($image_id)){ // Renvoyer erreur } -- cgit v1.2.3 From cfce59d6dc120848624e105614575ae0f48af81b Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Mon, 29 Feb 2016 14:20:13 +0100 Subject: merge --- client/images/spin/128x128/Preloader_1.gif | Bin 0 -> 71831 bytes client/images/spin/128x128/Preloader_10.gif | Bin 0 -> 19793 bytes client/images/spin/128x128/Preloader_2.gif | Bin 0 -> 7879 bytes client/images/spin/128x128/Preloader_3.gif | Bin 0 -> 22053 bytes client/images/spin/128x128/Preloader_4.gif | Bin 0 -> 19963 bytes client/images/spin/128x128/Preloader_5.gif | Bin 0 -> 84698 bytes client/images/spin/128x128/Preloader_6.gif | Bin 0 -> 19299 bytes client/images/spin/128x128/Preloader_7.gif | Bin 0 -> 12651 bytes client/images/spin/128x128/Preloader_8.gif | Bin 0 -> 81985 bytes client/images/spin/128x128/Preloader_9.gif | Bin 0 -> 48009 bytes client/images/spin/32x32/Preloader_1.gif | Bin 0 -> 17796 bytes client/images/spin/32x32/Preloader_10.gif | Bin 0 -> 5943 bytes client/images/spin/32x32/Preloader_2.gif | Bin 0 -> 3551 bytes client/images/spin/32x32/Preloader_3.gif | Bin 0 -> 7980 bytes client/images/spin/32x32/Preloader_4.gif | Bin 0 -> 6852 bytes client/images/spin/32x32/Preloader_5.gif | Bin 0 -> 22755 bytes client/images/spin/32x32/Preloader_6.gif | Bin 0 -> 5965 bytes client/images/spin/32x32/Preloader_7.gif | Bin 0 -> 4217 bytes client/images/spin/32x32/Preloader_8.gif | Bin 0 -> 13706 bytes client/images/spin/32x32/Preloader_9.gif | Bin 0 -> 13661 bytes client/images/spin/64x64/Preloader_1.gif | Bin 0 -> 35166 bytes client/images/spin/64x64/Preloader_10.gif | Bin 0 -> 10015 bytes client/images/spin/64x64/Preloader_2.gif | Bin 0 -> 4799 bytes client/images/spin/64x64/Preloader_3.gif | Bin 0 -> 12080 bytes client/images/spin/64x64/Preloader_4.gif | Bin 0 -> 10456 bytes client/images/spin/64x64/Preloader_5.gif | Bin 0 -> 41405 bytes client/images/spin/64x64/Preloader_6.gif | Bin 0 -> 9959 bytes client/images/spin/64x64/Preloader_7.gif | Bin 0 -> 6225 bytes client/images/spin/64x64/Preloader_8.gif | Bin 0 -> 25056 bytes client/images/spin/64x64/Preloader_9.gif | Bin 0 -> 23767 bytes client/index.html | 5 + client/js/controllers/home/machineDetails.js | 39 ++++++ client/js/controllers/home/main.js | 13 +- client/js/controllers/login.js | 9 +- client/js/controllers/status.js | 6 +- client/js/services/Compute.js | 25 +++- client/js/services/Identity.js | 79 ++++++++---- client/partials/home/machineDetails.html | 84 +++++++++++++ client/partials/home/main.html | 7 +- client/partials/nav.html | 2 +- server/Test/AppTestClass.php | 43 ++++++- server/Test/computeTest.php | 20 +++ server/core/App.php | 15 ++- server/core/Compute.php | 175 +++++++++++++++++++++++++++ server/core/LibOverride/genTokenOptions.php | 10 +- server/index.php | 16 ++- server/vendor/php-opencloud/openstack | 2 +- 47 files changed, 499 insertions(+), 51 deletions(-) create mode 100644 client/images/spin/128x128/Preloader_1.gif create mode 100644 client/images/spin/128x128/Preloader_10.gif create mode 100644 client/images/spin/128x128/Preloader_2.gif create mode 100644 client/images/spin/128x128/Preloader_3.gif create mode 100644 client/images/spin/128x128/Preloader_4.gif create mode 100644 client/images/spin/128x128/Preloader_5.gif create mode 100644 client/images/spin/128x128/Preloader_6.gif create mode 100644 client/images/spin/128x128/Preloader_7.gif create mode 100644 client/images/spin/128x128/Preloader_8.gif create mode 100644 client/images/spin/128x128/Preloader_9.gif create mode 100644 client/images/spin/32x32/Preloader_1.gif create mode 100644 client/images/spin/32x32/Preloader_10.gif create mode 100644 client/images/spin/32x32/Preloader_2.gif create mode 100644 client/images/spin/32x32/Preloader_3.gif create mode 100644 client/images/spin/32x32/Preloader_4.gif create mode 100644 client/images/spin/32x32/Preloader_5.gif create mode 100644 client/images/spin/32x32/Preloader_6.gif create mode 100644 client/images/spin/32x32/Preloader_7.gif create mode 100644 client/images/spin/32x32/Preloader_8.gif create mode 100644 client/images/spin/32x32/Preloader_9.gif create mode 100644 client/images/spin/64x64/Preloader_1.gif create mode 100644 client/images/spin/64x64/Preloader_10.gif create mode 100644 client/images/spin/64x64/Preloader_2.gif create mode 100644 client/images/spin/64x64/Preloader_3.gif create mode 100644 client/images/spin/64x64/Preloader_4.gif create mode 100644 client/images/spin/64x64/Preloader_5.gif create mode 100644 client/images/spin/64x64/Preloader_6.gif create mode 100644 client/images/spin/64x64/Preloader_7.gif create mode 100644 client/images/spin/64x64/Preloader_8.gif create mode 100644 client/images/spin/64x64/Preloader_9.gif create mode 100644 client/js/controllers/home/machineDetails.js create mode 100644 client/partials/home/machineDetails.html create mode 100644 server/Test/computeTest.php mode change 100644 => 100755 server/core/App.php mode change 100644 => 100755 server/core/LibOverride/genTokenOptions.php (limited to 'server/core') diff --git a/client/images/spin/128x128/Preloader_1.gif b/client/images/spin/128x128/Preloader_1.gif new file mode 100644 index 0000000..dafe17e Binary files /dev/null and b/client/images/spin/128x128/Preloader_1.gif differ diff --git a/client/images/spin/128x128/Preloader_10.gif b/client/images/spin/128x128/Preloader_10.gif new file mode 100644 index 0000000..cdfa680 Binary files /dev/null and b/client/images/spin/128x128/Preloader_10.gif differ diff --git a/client/images/spin/128x128/Preloader_2.gif b/client/images/spin/128x128/Preloader_2.gif new file mode 100644 index 0000000..3cb9003 Binary files /dev/null and b/client/images/spin/128x128/Preloader_2.gif differ diff --git a/client/images/spin/128x128/Preloader_3.gif b/client/images/spin/128x128/Preloader_3.gif new file mode 100644 index 0000000..7f7d415 Binary files /dev/null and b/client/images/spin/128x128/Preloader_3.gif differ diff --git a/client/images/spin/128x128/Preloader_4.gif b/client/images/spin/128x128/Preloader_4.gif new file mode 100644 index 0000000..78baff6 Binary files /dev/null and b/client/images/spin/128x128/Preloader_4.gif differ diff --git a/client/images/spin/128x128/Preloader_5.gif b/client/images/spin/128x128/Preloader_5.gif new file mode 100644 index 0000000..c9c1530 Binary files /dev/null and b/client/images/spin/128x128/Preloader_5.gif differ diff --git a/client/images/spin/128x128/Preloader_6.gif b/client/images/spin/128x128/Preloader_6.gif new file mode 100644 index 0000000..3203d7f Binary files /dev/null and b/client/images/spin/128x128/Preloader_6.gif differ diff --git a/client/images/spin/128x128/Preloader_7.gif b/client/images/spin/128x128/Preloader_7.gif new file mode 100644 index 0000000..2eb19be Binary files /dev/null and b/client/images/spin/128x128/Preloader_7.gif differ diff --git a/client/images/spin/128x128/Preloader_8.gif b/client/images/spin/128x128/Preloader_8.gif new file mode 100644 index 0000000..3ba8217 Binary files /dev/null and b/client/images/spin/128x128/Preloader_8.gif differ diff --git a/client/images/spin/128x128/Preloader_9.gif b/client/images/spin/128x128/Preloader_9.gif new file mode 100644 index 0000000..7018192 Binary files /dev/null and b/client/images/spin/128x128/Preloader_9.gif differ diff --git a/client/images/spin/32x32/Preloader_1.gif b/client/images/spin/32x32/Preloader_1.gif new file mode 100644 index 0000000..b810330 Binary files /dev/null and b/client/images/spin/32x32/Preloader_1.gif differ diff --git a/client/images/spin/32x32/Preloader_10.gif b/client/images/spin/32x32/Preloader_10.gif new file mode 100644 index 0000000..f9c462f Binary files /dev/null and b/client/images/spin/32x32/Preloader_10.gif differ diff --git a/client/images/spin/32x32/Preloader_2.gif b/client/images/spin/32x32/Preloader_2.gif new file mode 100644 index 0000000..f23998f Binary files /dev/null and b/client/images/spin/32x32/Preloader_2.gif differ diff --git a/client/images/spin/32x32/Preloader_3.gif b/client/images/spin/32x32/Preloader_3.gif new file mode 100644 index 0000000..bb7c60d Binary files /dev/null and b/client/images/spin/32x32/Preloader_3.gif differ diff --git a/client/images/spin/32x32/Preloader_4.gif b/client/images/spin/32x32/Preloader_4.gif new file mode 100644 index 0000000..117c756 Binary files /dev/null and b/client/images/spin/32x32/Preloader_4.gif differ diff --git a/client/images/spin/32x32/Preloader_5.gif b/client/images/spin/32x32/Preloader_5.gif new file mode 100644 index 0000000..7169708 Binary files /dev/null and b/client/images/spin/32x32/Preloader_5.gif differ diff --git a/client/images/spin/32x32/Preloader_6.gif b/client/images/spin/32x32/Preloader_6.gif new file mode 100644 index 0000000..9087ded Binary files /dev/null and b/client/images/spin/32x32/Preloader_6.gif differ diff --git a/client/images/spin/32x32/Preloader_7.gif b/client/images/spin/32x32/Preloader_7.gif new file mode 100644 index 0000000..0b1e633 Binary files /dev/null and b/client/images/spin/32x32/Preloader_7.gif differ diff --git a/client/images/spin/32x32/Preloader_8.gif b/client/images/spin/32x32/Preloader_8.gif new file mode 100644 index 0000000..6816be3 Binary files /dev/null and b/client/images/spin/32x32/Preloader_8.gif differ diff --git a/client/images/spin/32x32/Preloader_9.gif b/client/images/spin/32x32/Preloader_9.gif new file mode 100644 index 0000000..e38dd5a Binary files /dev/null and b/client/images/spin/32x32/Preloader_9.gif differ diff --git a/client/images/spin/64x64/Preloader_1.gif b/client/images/spin/64x64/Preloader_1.gif new file mode 100644 index 0000000..2004c5f Binary files /dev/null and b/client/images/spin/64x64/Preloader_1.gif differ diff --git a/client/images/spin/64x64/Preloader_10.gif b/client/images/spin/64x64/Preloader_10.gif new file mode 100644 index 0000000..944ec82 Binary files /dev/null and b/client/images/spin/64x64/Preloader_10.gif differ diff --git a/client/images/spin/64x64/Preloader_2.gif b/client/images/spin/64x64/Preloader_2.gif new file mode 100644 index 0000000..9821827 Binary files /dev/null and b/client/images/spin/64x64/Preloader_2.gif differ diff --git a/client/images/spin/64x64/Preloader_3.gif b/client/images/spin/64x64/Preloader_3.gif new file mode 100644 index 0000000..52b81ba Binary files /dev/null and b/client/images/spin/64x64/Preloader_3.gif differ diff --git a/client/images/spin/64x64/Preloader_4.gif b/client/images/spin/64x64/Preloader_4.gif new file mode 100644 index 0000000..3408b5d Binary files /dev/null and b/client/images/spin/64x64/Preloader_4.gif differ diff --git a/client/images/spin/64x64/Preloader_5.gif b/client/images/spin/64x64/Preloader_5.gif new file mode 100644 index 0000000..6f0585d Binary files /dev/null and b/client/images/spin/64x64/Preloader_5.gif differ diff --git a/client/images/spin/64x64/Preloader_6.gif b/client/images/spin/64x64/Preloader_6.gif new file mode 100644 index 0000000..c577f24 Binary files /dev/null and b/client/images/spin/64x64/Preloader_6.gif differ diff --git a/client/images/spin/64x64/Preloader_7.gif b/client/images/spin/64x64/Preloader_7.gif new file mode 100644 index 0000000..5f6dd5e Binary files /dev/null and b/client/images/spin/64x64/Preloader_7.gif differ diff --git a/client/images/spin/64x64/Preloader_8.gif b/client/images/spin/64x64/Preloader_8.gif new file mode 100644 index 0000000..b57e4d8 Binary files /dev/null and b/client/images/spin/64x64/Preloader_8.gif differ diff --git a/client/images/spin/64x64/Preloader_9.gif b/client/images/spin/64x64/Preloader_9.gif new file mode 100644 index 0000000..fc3ddb7 Binary files /dev/null and b/client/images/spin/64x64/Preloader_9.gif differ diff --git a/client/index.html b/client/index.html index ba183df..8d81ac3 100644 --- a/client/index.html +++ b/client/index.html @@ -26,6 +26,9 @@
+ +
+
@@ -81,7 +84,9 @@ + + diff --git a/client/js/controllers/home/machineDetails.js b/client/js/controllers/home/machineDetails.js new file mode 100644 index 0000000..f84a073 --- /dev/null +++ b/client/js/controllers/home/machineDetails.js @@ -0,0 +1,39 @@ +/** + * The home controller + * + * @param {$scope} $scope The $scope service from angular + */ +mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$timeout', function ($scope, Compute, $rootScope, $timeout) +{ + + $scope.machine={}; + $("#waitingForToggleMachine").hide(); + + $scope.$on('showMachineDetailsEvent', function(eventName ,machine){ + $scope.machine=machine; + $('#machineDetailsModal').modal({backdrop: false, keyboard: true}); + }); + + + $scope.toggleMachineState=function(){ + $("#waitingForToggleMachine").show(); + + // Fake timeout + $timeout(function(){ + $("#waitingForToggleMachine").hide(); + }, 3000); + $timeout(function(){ + $scope.machine.online=!$scope.machine.online; + + }, 3000); + + + }; + + $scope.applyModifications=function(){ + //Todo + } + + + +}]); diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js index d25bfad..4e3bcda 100644 --- a/client/js/controllers/home/main.js +++ b/client/js/controllers/home/main.js @@ -3,15 +3,22 @@ * * @param {$scope} $scope The $scope service from angular */ -mainApp.controller('homeCtrl', [ '$scope', 'Compute', function ($scope, Compute) +mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', function ($scope, Compute, $rootScope) { - var updatePage=function(){ // TODO Update graph etc... } // Retrieve all Data Compute.pullData(updatePage); - + + Compute.getMachines(function(adzda){}); + + $scope.raiseShowMachineDetailsEvent=function(){ + var machine={name: "Machine 1", online:true}; + $rootScope.$broadcast("showMachineDetailsEvent", machine); + } + + }]); diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js index 829fc1d..1a89563 100644 --- a/client/js/controllers/login.js +++ b/client/js/controllers/login.js @@ -13,14 +13,19 @@ mainApp.controller('loginCtrl', ['$scope','$sce','Identity', function ($scope,$s if(!Identity.isAlreadyLogin()){ $('#loginModal').modal({backdrop: 'static', keyboard: false}); } + + // Manager logout event $scope.$on('logoutEvent', function(){ + Identity.logout(); $('#loginModal').modal({backdrop: 'static', keyboard: false}); }); - + + // Hide loading button and message alert $('#loadingLoginButton').hide(); $('#failedToLoginAlert').hide(); - + + // Defined function for login $scope.loginAction=function(){ // Begin login state for template diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js index e01df34..940d794 100644 --- a/client/js/controllers/status.js +++ b/client/js/controllers/status.js @@ -10,13 +10,11 @@ mainApp.controller('statusCtrl', ['$scope','Identity', '$rootScope', function ($ { // Give profile to model - $scope.profile=Identity.profile; + $scope.profile=Identity.getProfile(); // Function to logout - $scope.logout=function(){ - Identity.logout(); + $scope.raiseLogoutEvent=function(){ $rootScope.$broadcast('logoutEvent'); - }; }]); diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js index c5c8da9..8148948 100644 --- a/client/js/services/Compute.js +++ b/client/js/services/Compute.js @@ -2,11 +2,12 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ - + // Create data var data={}; data.machines={}; + // Parser var parseGetMachinesAnswer=function(response, failedToSendRequest){ @@ -16,8 +17,24 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ // Get Machine var getMachines=function(callback){ + var params={ + "token" : Identity.getToken(), + "task" : "compute", + "action":"getServer", + "serverId":"69d5bcc4-2fab-4634-b0d2-f455fee5b7bd" + }; + var result=$http.post('../server/index.php', - $.param({"token" : Identity.profile.token, "task" : "Compute"})); + $.param(params)); + + // Wait and handle the response + result.then(function (response){ + console.log(response.data.Servers); + callback(parseGetMachinesAnswer(response, false)); + },function(response){ + alert(response.status); + callback(parseGetMachinesAnswer(response, true)); + }); }; @@ -31,8 +48,8 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ // Return services objects return { - getMachines: getMachines - pullData: pullData + getMachines: getMachines, + pullData: pullData, data:data }; diff --git a/client/js/services/Identity.js b/client/js/services/Identity.js index 8ee664c..b1d2a48 100644 --- a/client/js/services/Identity.js +++ b/client/js/services/Identity.js @@ -7,37 +7,47 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){ var profile={}; profile.username=null; profile.projectname=null; - profile.token=null; - - - /** - * Save profile in cookies - */ - var saveCookieForSession=function(){ - $cookies.putObject('profile', 5); - }; - + var token=null; + /* * @returns {boolean} Return true if a cookie is found (and load it in profile) false else */ var isAlreadyLogin=function(){ + + // Load cookies var profileInCookie=$cookies.getObject('profile'); - console.log(profileInCookie); + var tokenPart_0InCookie=$cookies.getObject('token.part_0'); + var tokenPart_1InCookie=$cookies.getObject('token.part_1'); + - if(typeof profileInCookie !== 'undefined'){ + // Check if cookie is defined + if(typeof profileInCookie !== 'undefined' + && typeof tokenPart_0InCookie !== 'undefined' + && typeof tokenPart_1InCookie !== 'undefined' + ){ + + // If yes, put it into variables angular.extend(profile, profileInCookie); + token=tokenPart_0InCookie+tokenPart_1InCookie; + + // Return I'm Login return true; } + // Return I'm not Login return false; } + + /* * Destroy profile cookies */ var logout=function(){ $cookies.remove('profile'); + $cookies.remove('token.part_0'); + $cookies.remove('token.part_1'); } @@ -49,15 +59,28 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){ */ var parseLoginAnswer=function(response, failedToSendRequest){ - + // Defined return object var requestParserResult={}; requestParserResult.status=1; requestParserResult.failReason=null; if (typeof response.data.token !== 'undefined') { + // Set status code requestParserResult.status=0; - profile.token=response.data.token; - saveCookieForSession(); + + // Find the middle of the token to split it + var middle=parseInt(response.data.token.length/2); + + // Create expire date (cookie expire in 55 mins) + var expireDate=new Date(); + expireDate.setMinutes(expireDate.getMinutes()+55); + + // Save profile + $cookies.putObject('profile', profile, {'expires': expireDate}); + // Save first part of token + $cookies.putObject('token.part_0', response.data.token.substring(0, middle), {'expires': expireDate}); + // Save second part of token + $cookies.putObject('token.part_1', response.data.token.substring(middle, response.data.token.length), {'expires': expireDate}); } else if(failedToSendRequest){ requestParserResult.failReason="Failed to send request"; @@ -69,7 +92,6 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){ return requestParserResult; }; - /** * Function to connect to OpenStack @@ -87,24 +109,39 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){ profile.projectname=projectname; var result=$http.post('../server/index.php', - $.param({"task" : "Authenticate", "user" : username, "password" : password, "project" : projectname})); + $.param({"task" : "Authenticate", "user" : username, "password" : password, "project" : projectname})); // Wait and handle the response result.then(function (response){ - callback(parseLoginAnswer(response), false); + callback(parseLoginAnswer(response, false)); },function(response){ - callback(parseLoginAnswer(response), true) + callback(parseLoginAnswer(response, true)); }); }; + /* + * Get the profile + */ + var getProfile=function(){ + return profile; + } + + /* + * Get the token + */ + var getToken=function(){ + return token; + } + // Return services objects return { login: login, - profile: profile, + getProfile: getProfile, isAlreadyLogin: isAlreadyLogin, - logout:logout + logout:logout, + getToken:getToken }; diff --git a/client/partials/home/machineDetails.html b/client/partials/home/machineDetails.html new file mode 100644 index 0000000..606edcf --- /dev/null +++ b/client/partials/home/machineDetails.html @@ -0,0 +1,84 @@ + diff --git a/client/partials/home/main.html b/client/partials/home/main.html index 7a5045a..37638d3 100644 --- a/client/partials/home/main.html +++ b/client/partials/home/main.html @@ -1,8 +1,11 @@ -
+
Home
Main Content + +
+
-
\ No newline at end of file +
diff --git a/client/partials/nav.html b/client/partials/nav.html index 3c72844..b3ef76a 100644 --- a/client/partials/nav.html +++ b/client/partials/nav.html @@ -32,7 +32,7 @@
  • Informations
  • Settings
    • -
  • Logout
    • +
  • Logout
    • diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php index 40a5847..3ff0aea 100755 --- a/server/Test/AppTestClass.php +++ b/server/Test/AppTestClass.php @@ -12,6 +12,7 @@ class AppTest{ protected $openstack; protected $pluginsApi; + protected $postParams; protected $tokenClass; protected $tokenPost; protected $output; @@ -23,8 +24,13 @@ class AppTest{ $this->tokenClass = new genTokenOptions($args); $this->openstack = new OpenStack\OpenStack([]); $this->pluginsApi = plugin_api::getInstance(); + $this->errorClass = new errorManagement($this); $this->output = array(); +<<<<<<< HEAD $this->errorClass = new errorManagement($this); +======= + $this->postParams = $_POST; +>>>>>>> develop } @@ -48,6 +54,16 @@ class AppTest{ $opt = $this->tokenClass->getOptions($service); return $this->openstack->imagesV2($opt); break; + case "Compute": + if($this->tokenPost == NULL) $this->tokenClass->genComputeToken(); + $opt = $this->tokenClass->getOptions($service); + return $this->openstack->computeV2($opt); + break; + case "Network": + if($this->tokenPost == NULL) $this->tokenClass->genNetworkToken(); + $opt = $this->tokenClass->getOptions($service); + return $this->openstack->networkingV2($opt); + break; } } @@ -61,10 +77,21 @@ class AppTest{ $this->tokenClass->genNetworkToken(); $this->setOutput("token", $this->tokenClass->getBackup()); - }catch(Exception $e){ - echo $e; - exit(); - } + }catch(BadResponseError $e){ + $this->errorClass->BadResponseHandler($e); + }catch(UserInputError $e){ + $this->errorClass->UserInputHandler($e); + }catch(BaseError $e){ + $this->errorClass->BaseErrorHandler($e); + }catch(NotImplementedError $e){ + $this->errorClass->NotImplementedHandler($e); + } + + } + + public function getPostParam($name){ + + return $this->postParams[$name]; } @@ -75,12 +102,16 @@ class AppTest{ } public function show(){ - echo json_encode($this->output); + return json_encode($this->output); } +<<<<<<< HEAD public function getErrorInstance(){ return $this->errorClass; } -} \ No newline at end of file +} +======= +} +>>>>>>> develop diff --git a/server/Test/computeTest.php b/server/Test/computeTest.php new file mode 100644 index 0000000..3ce1f2e --- /dev/null +++ b/server/Test/computeTest.php @@ -0,0 +1,20 @@ +re '../vendor/autoload.php'; +include('/istic-openstack/server/init.php'); +include_once("../core/Compute.php"); +$compute = new compute($App); + +$servers = $compute->listServers(); + +$servers= $compute->listServers(true); +foreach($servers as $server){ + //print_r($server); + echo $server->name." ".$server->id."
    "; + +//$opt = Array(); +//$opt['name'] = "Test"; +//$serverid = Array("id"=>"69d5bcc4-2fab-4634-b0d2-f455fee5b7bd"); +//$serverid["id"] = "{69d5bcc4-2fab-4634-b0d2-f455fee5b7bd}"; +//unset($server); +//$server = $compute->getServer($serverid); +//echo $server->name." ".$server->image; +//$server->update(array('name' => 'test')); diff --git a/server/core/App.php b/server/core/App.php old mode 100644 new mode 100755 index babb3d9..edb75f6 --- a/server/core/App.php +++ b/server/core/App.php @@ -33,7 +33,7 @@ class App{ public function setToken($token){ $this->tokenPost = $token; - $this->tokenClass->loadBackup($his->tokenPost); + $this->tokenClass->loadBackup($this->tokenPost); } @@ -50,6 +50,16 @@ class App{ $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; } } @@ -95,6 +105,7 @@ class App{ public function show(){ echo json_encode($this->output); + //error_log(var_dump(json_encode($this->output), true), 0); } -} \ No newline at end of file +} diff --git a/server/core/Compute.php b/server/core/Compute.php index 8d1c8b6..94e219c 100644 --- a/server/core/Compute.php +++ b/server/core/Compute.php @@ -1 +1,176 @@ +app = $app; + $this->libClass = $app->getLibClass("Compute"); + } + /** + * Execute an action + * + * @param String $action name of another function of this class + * + * @return void + */ + public function action($action){ + + $this->{$action.""}(); + + } + /** + * List servers. + * @return array + */ + public function listServers() + { + $servers = $this->libClass->listServers(); + $this->app->setOutput("Servers", $servers); + return; + } + /** + * List flavors. + * @return array + */ + public function listFlavors() + { + $flavors = $this->libClass->listFlavors(); + $this->app->setOutput("Flavors", $flavors); + return; + } + /** + * List images. + * @return array + */ + public function listImages() + { + $images = $this->libClass->listImages(); + $this->app->setOutput("Images", $images); + return; + } + /** + * Create server. + * @return array + * + public function createServer() + { + + $server = $this->libClass->createServer(); + } + */ + /** + * Get server details. + * @return array + */ + public function getServer() + { + $serverId = $this->app->getPostParam("serverId"); + $opt = array('id' => $serverId); + $server = $this->libClass->getServer($opt); + $server->retrieve(); + $this->app->setOutput("MyServer", $server); + return; + } + /** + * Get flavor details. + * @return array + */ + public function getFlavor() + { + $flavorId = $this->app->getPostParam("flavorId"); + $opt = array('id' => $flavorId); + $flavor = $this->libClass->getFlavor($opt); + $flavor->retrieve(); + $this->app->setOutput("MyFlavor", $flavor); + return; + } + /** + * Get image details. + * @return array + */ + public function getImage() + { + $imageId = $this->app->getPostParam("imageId"); + $opt = array('id' => $imageId); + $image = $this->libClass->getImage($opt); + $image->retrieve(); + $this->app->setOutput("MyImage", $image); + return; + } + /* working on tests + + public function update() + { + $image = $this->app->getServer(array $options = []); + + } + public function delete() + { + //TODO + } + public function changePassword($newPassword) + { + //TODO + } + public function reboot($type = Enum::REBOOT_SOFT) + { + //TODO + } + public function rebuild(array $options) + { + //TODO + } + public function resize($flavorId) + { + //TODO + } + public function confirmResize() + { + //TODO + } + public function revertResize() + { + //TODO + } + public function createImage(array $options) + { + //TODO + } + public function listAddresses(array $options = []) + { + //TODO + } + public function getMetadata() + { + //TODO + } + public function resetMetadata(array $metadata) + { + //TODO + } + public function mergeMetadata(array $metadata) + { + //TODO + } + public function getMetadataItem($key) + { + //TODO + } + public function deleteMetadataItem($key) + { + //TODO + } +*/ +} diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php old mode 100644 new mode 100755 index b71defa..50826ed --- a/server/core/LibOverride/genTokenOptions.php +++ b/server/core/LibOverride/genTokenOptions.php @@ -260,13 +260,14 @@ class genTokenOptions public function loadBackup($back){ $backup = unserialize($back); + $this->backup["roles"] = $backup["roles"]; $this->backup["project"] = $backup["project"]; $this->backup["user"] = $backup["user"]; - loadComputeBackup($backup["Compute"]); - loadIdentityBackup($backup["Identity"]); - loadImageBackup($backup["Image"]); - loadNetworkBackup($backup["Network"]); + $this->loadComputeBackup($backup["Compute"]); + $this->loadIdentityBackup($backup["Identity"]); + $this->loadImageBackup($backup["Image"]); + $this->loadNetworkBackup($backup["Network"]); } @@ -324,6 +325,7 @@ class genTokenOptions private function unserializeToken($tokenSerialized){ $Saved = file_get_contents("core/LibOverride/projectTokenData/".$this->backup["project"]); + $Saved = unserialize($Saved); $api = new Api(); $token = new Models\Token($this->httpClient, $api); $token->methods = unserialize($tokenSerialized["methods"]); diff --git a/server/index.php b/server/index.php index 166e82e..f888671 100644 --- a/server/index.php +++ b/server/index.php @@ -27,12 +27,26 @@ $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; } diff --git a/server/vendor/php-opencloud/openstack b/server/vendor/php-opencloud/openstack index 1419eb2..15aca73 160000 --- a/server/vendor/php-opencloud/openstack +++ b/server/vendor/php-opencloud/openstack @@ -1 +1 @@ -Subproject commit 1419eb2e01164bb6b8b837df37724423907352d7 +Subproject commit 15aca73f423166c7ef8337ba08615c103c66e931 -- cgit v1.2.3 From ae1100c16880d4bae77513ec433ac6734da8dea4 Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Mon, 29 Feb 2016 15:25:30 +0100 Subject: Error management --- server/Test/AppTestClass.php | 20 +++------- server/Test/imageTests.php | 4 +- server/core/Image.php | 92 ++++++++++++++++++++------------------------ 3 files changed, 48 insertions(+), 68 deletions(-) (limited to 'server/core') diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php index 4d1f824..57dd422 100755 --- a/server/Test/AppTestClass.php +++ b/server/Test/AppTestClass.php @@ -26,15 +26,10 @@ class AppTest{ $this->pluginsApi = plugin_api::getInstance(); $this->errorClass = new errorManagement($this); $this->output = array(); -<<<<<<< HEAD -<<<<<<< HEAD + $this->errorClass = new errorManagement($this); -======= - $this->postParams = $_POST; ->>>>>>> develop -======= + $this->postParams = $_POST; ->>>>>>> develop } @@ -109,17 +104,12 @@ class AppTest{ return json_encode($this->output); } -<<<<<<< HEAD -<<<<<<< HEAD + public function getErrorInstance(){ return $this->errorClass; } -} -======= } ->>>>>>> develop -======= -} ->>>>>>> develop + + diff --git a/server/Test/imageTests.php b/server/Test/imageTests.php index 47a69e2..d21eefb 100644 --- a/server/Test/imageTests.php +++ b/server/Test/imageTests.php @@ -17,7 +17,7 @@ $opt['minRam'] = 10; //$new_image = $image->createImage($opt); //Liste des images -$images = $image->listImage(); +$images = $image->action("listImage"); if(isset($images)){ echo "Images présentes :"; @@ -49,7 +49,7 @@ else{ // Détails Image //$details = $image->imageDetails($id_image); -$image->deleteImage('123456'); +//$image->deleteImage('123456'); //$image->desactivateImage($id_image); //$image->reactivateImage($id_image); diff --git a/server/core/Image.php b/server/core/Image.php index 4d22443..4025595 100644 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -39,7 +39,7 @@ class image implements Core{ */ public function __construct($app){ if(!isset($app)){ - // Renvoyer erreur + $this->app->setOutput("Error", "Incorrect parameter"); } try{ $this->app = $app; @@ -79,7 +79,7 @@ class image implements Core{ private function createImage(array $opt){ if(!isset($opt)){ - // Renvoyer erreur + $this->app->setOutput("Error", "Incorrect parameter"); } @@ -98,7 +98,7 @@ class image implements Core{ } else{ - //ERROR + $this->app->setOutput("Error", "Image name already exists"); } if(isset($opt['id'])){ // UUID : nnnnnnnn-nnnn-nnnn-nnnn-nnnnnnnnnnnn if($this->libClass->getImage($opt['id']) != null){ // if the id already exists -> error @@ -153,7 +153,7 @@ class image implements Core{ try{ $l = $this->libClass->listImages(); if(!isset($l)){ // if the list is empty there is no images - + $this->app->setOutput("Error", "No image"); } }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -183,7 +183,7 @@ class image implements Core{ $service = $this->libClass; $image = $service->getImage($id); if($image == null){ // if the image don't exists -> error - // Renvoyer erreur + $this->app->setOutput("Error", "Image doesn't exist"); } return $image; @@ -209,10 +209,10 @@ class image implements Core{ **/ private function updateImage($id, array $opt){ if(!isset($id)){ - // Renvoyer erreur + $this->app->setOutput("Error", "Incorrect id parameter"); } if(!isset($opt)){ - // Renvoyer erreur + $this->app->setOutput("Error", "Incorrect opt parameter"); } try{ @@ -220,7 +220,7 @@ class image implements Core{ $service = $this->libClass; $image = $service->getImage($id); if($image == null){ // if the image don't exists -> error - // Renvoyer erreur + $this->app->setOutput("Error", "Image doesn't exist"); } $options = Array(); @@ -267,14 +267,14 @@ class image implements Core{ // si protected = true, demander de le mettre a false // vérifier existence image if(!isset($id)){ - // Renvoyer erreur + $this->app->setOutput("Error", "Image doesn't exist"); } try{ $service = $this->libClass; $image = $this->libClass->getImage($id); if($image == null){ // if the image don't exists -> error - // Renvoyer erreur + $this->app->setOutput("Error", "Image doesn't exist"); } $image->delete(); }catch(BadResponseError $e){ @@ -297,14 +297,14 @@ class image implements Core{ **/ private function reactivateImage($id){ if(!isset($id)){ - // Renvoyer erreur + $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 - // Renvoyer erreur + $this->app->setOutput("Error", "Image doesn't exist"); } $image->reactivate(); }catch(BadResponseError $e){ @@ -326,14 +326,14 @@ class image implements Core{ **/ private function desactivateImage($id){ if(!isset($id)){ - // Renvoyer erreur + $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 - // Renvoyer erreur + $this->app->setOutput("Error", "Image doesn't exist"); } $image->deactivate(); }catch(BadResponseError $e){ @@ -358,19 +358,19 @@ class image implements Core{ **/ private function uploadImage($id, $file_name){ if(!isset($id)){ - // Renvoyer erreur + $this->app->setOutput("Error", "Incorrect id parameter"); } if(!isset($file_name)){ - // Renvoyer erreur + $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 - // Renvoyer erreur + $this->app->setOutput("Error", "Image doesn't exist"); } - $stream = \GuzzleHttp\Psr7\stream_for(fopen($file_name, 'r')); // A VOIR + $stream = \GuzzleHttp\Psr7\stream_for(fopen($file_name, 'r')); $image->uploadData($stream); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -391,14 +391,14 @@ class image implements Core{ **/ private function downloadImage($id){ if(!isset($id)){ - // Renvoyer erreur + $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 - // Renvoyer erreur + $this->app->setOutput("Error", "Image doesn't exist"); } $stream = $image->downloadData(); }catch(BadResponseError $e){ @@ -424,22 +424,18 @@ class image implements Core{ **/ private function addMemberImage($image_id, $member_id){ if(!isset($image_id)){ - // Renvoyer erreur + $this->app->setOutput("Error", "Incorrect parameter image_id"); } if(!isset($member_id)){ - // Renvoyer erreur + $this->app->setOutput("Error", "Incorrect parameter member_id"); } try{ - // vérifier existence image - // on doit être le proprio de l'image - // vérifier membre existe $service = $this->libClass; $image = $service->getImage($id); if($image == null){ // if the image don't exists -> error - // Renvoyer erreur + $this->app->setOutput("Error", "Image doesn't exist"); } - $member_id = $image->addMember($member_id); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -461,21 +457,21 @@ class image implements Core{ **/ private function listMemberImage($image_id, $member_id){ if(!isset($image_id)){ - // Renvoyer erreur + $this->app->setOutput("Error", "Incorrect parameter image_id"); } if(!isset($member_id)){ - // Renvoyer erreur + $this->app->setOutput("Error", "Incorrect parameter member_id"); } try{ // vérifier existence image $service = $this->libClass; $image = $service->getImage($image_id); if($image == null){ // if the image don't exists -> error - // Renvoyer erreur + $this->app->setOutput("Error", "Image doesn't exist"); } $members = $image->listMembers(); if($member == null){ // if the image don't exists -> error - // Renvoyer erreur + $this->app->setOutput("Error", "No member"); } }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -500,10 +496,10 @@ class image implements Core{ **/ private function detailMemberImage($image_id, $member_id){ if(!isset($image_id)){ - // Renvoyer erreur + $this->app->setOutput("Error", "Incorrect parameter image_id"); } if(!isset($member_id)){ - // Renvoyer erreur + $this->app->setOutput("Error", "Incorrect parameter member_id"); } try{ // vérifier existence image @@ -513,12 +509,12 @@ class image implements Core{ $image = $service->getImage($id); if($image == null){ // if the image don't exists -> error - // Renvoyer erreur + $this->app->setOutput("Error", "Image doesn't exist"); } $member = $image->getMember($member_id); - if($member == null){ // if the image don't exists -> error - // Renvoyer erreur + 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); @@ -543,24 +539,21 @@ class image implements Core{ **/ private function removeMemberImage($image_id, $member_id){ if(!isset($image_id)){ - // Renvoyer erreur + $this->app->setOutput("Error", "Incorrect parameter image_id"); } if(!isset($member_id)){ - // Renvoyer erreur + $this->app->setOutput("Error", "Incorrect parameter member_id"); } try{ - // vérifier existence image - // on doit être le proprio de l'image - // vérifier membre existe $service = $this->libClass; $image = $service->getImage($id); if($image == null){ // if the image don't exists -> error - // Renvoyer erreur + $this->app->setOutput("Error", "Image doesn't exist"); } $member = $image->getMember($member_id); if($member == null){ // if the image don't exists -> error - // Renvoyer erreur + $this->app->setOutput("Error", "Member doesn't exist"); } $member->delete(); }catch(BadResponseError $e){ @@ -588,24 +581,21 @@ class image implements Core{ **/ private function updateMemberImage($image_id, $member_id, $status){ if(!isset($image_id)){ - // Renvoyer erreur + $this->app->setOutput("Error", "Incorrect parameter image_id"); } if(!isset($member_id)){ - // Renvoyer erreur + $this->app->setOutput("Error", "Incorrect parameter member_id"); } try{ - // vérifier existence image - // on doit être le proprio de l'image - // vérifier membre existe $service = $this->libClass; $image = $service->getImage($id); if($image == null){ // if the image don't exists -> error - // Renvoyer erreur + $this->app->setOutput("Error", "Image doesn't exist"); } $member = $image->getMember($member_id); - if($member == null){ // if the image don't exists -> error - // Renvoyer erreur + if($member == null){ // if the member don't exists -> error + $this->app->setOutput("Error", "Member doesn't exist"); } $member->updateStatus($status); }catch(BadResponseError $e){ -- cgit v1.2.3 From 671f03df988218444d5cd889705521415bf14d13 Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Wed, 2 Mar 2016 13:01:51 +0100 Subject: try to resolve token pb --- server/Test/imageTests.php | 2 +- server/core/Image.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'server/core') diff --git a/server/Test/imageTests.php b/server/Test/imageTests.php index d21eefb..1bb834b 100644 --- a/server/Test/imageTests.php +++ b/server/Test/imageTests.php @@ -18,7 +18,7 @@ $opt['minRam'] = 10; //Liste des images $images = $image->action("listImage"); - +//$images = $image->listImage(); if(isset($images)){ echo "Images présentes :"; echo "
    "; diff --git a/server/core/Image.php b/server/core/Image.php index 4025595..e341fe0 100644 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -14,6 +14,8 @@ use OpenStack\Common\Error\BaseError; use OpenStack\Common\Error\NotImplementedError; use OpenStack\Common\Error\UserInputError; +include("CoreInterface.php"); + /** * Image Class of the back-end application * -- cgit v1.2.3 From 0161194d08050877e958cab885e7c335f2cca2d9 Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Wed, 2 Mar 2016 15:28:09 +0100 Subject: pb resolu --- server/Test/imageTests.php | 9 ++++++--- server/core/Image.php | 8 ++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) (limited to 'server/core') diff --git a/server/Test/imageTests.php b/server/Test/imageTests.php index 1bb834b..a8f16ce 100644 --- a/server/Test/imageTests.php +++ b/server/Test/imageTests.php @@ -17,14 +17,17 @@ $opt['minRam'] = 10; //$new_image = $image->createImage($opt); //Liste des images -$images = $image->action("listImage"); +$image->action("listImage"); //$images = $image->listImage(); +$im = $App->show(); +error_log(var_export(json_decode($im, true), true), 0); +$images = json_decode($im, true)["Images"]; if(isset($images)){ echo "Images présentes :"; echo "
    "; foreach($images as $i){ - echo $i->name; - if($i->name == "Test"){ + echo $i['name']; + if($i['name'] == "Test"){ $id_image = $i->id; $list = $i->tags; echo $i->status; diff --git a/server/core/Image.php b/server/core/Image.php index e341fe0..6bc2dbd 100644 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -153,7 +153,11 @@ class image implements Core{ */ private function listImage(){ try{ + $result = array(); $l = $this->libClass->listImages(); + foreach($l as $tmp) + $result[] = $tmp; + error_log(var_export($result, true), 0); if(!isset($l)){ // if the list is empty there is no images $this->app->setOutput("Error", "No image"); } @@ -166,8 +170,8 @@ class image implements Core{ }catch(NotImplementedError $e){ $this->app->getErrorInstance->NotImplementedHandler($e); } - return $l; - + //return $l; + $this->app->setOutput("Images", $result); } /** -- cgit v1.2.3 From 66baa3ffc8bd119558eeb1e87cb05c6008df9d6f Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Wed, 2 Mar 2016 15:58:17 +0100 Subject: Architecture mofification --- server/Test/imageTests.php | 6 ----- server/core/Image.php | 67 +++++++++++++++++++++++++++++----------------- 2 files changed, 43 insertions(+), 30 deletions(-) (limited to 'server/core') diff --git a/server/Test/imageTests.php b/server/Test/imageTests.php index a8f16ce..3af12fc 100644 --- a/server/Test/imageTests.php +++ b/server/Test/imageTests.php @@ -20,18 +20,12 @@ $opt['minRam'] = 10; $image->action("listImage"); //$images = $image->listImage(); $im = $App->show(); -error_log(var_export(json_decode($im, true), true), 0); $images = json_decode($im, true)["Images"]; if(isset($images)){ echo "Images présentes :"; echo "
    "; foreach($images as $i){ echo $i['name']; - if($i['name'] == "Test"){ - $id_image = $i->id; - $list = $i->tags; - echo $i->status; - } echo "
    "; } echo "
    "; diff --git a/server/core/Image.php b/server/core/Image.php index 6bc2dbd..ddd8390 100644 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -79,6 +79,7 @@ class image implements Core{ * **/ private function createImage(array $opt){ + $opt = $this->app->getPostParam("opt"); if(!isset($opt)){ $this->app->setOutput("Error", "Incorrect parameter"); @@ -143,7 +144,7 @@ class image implements Core{ }catch(NotImplementedError $e){ $this->app->getErrorInstance->NotImplementedHandler($e); } - return $image; + $this->app->setOutput("Images", $image); } /** @@ -155,11 +156,8 @@ class image implements Core{ try{ $result = array(); $l = $this->libClass->listImages(); - foreach($l as $tmp) + foreach($l as $tmp){ $result[] = $tmp; - error_log(var_export($result, true), 0); - if(!isset($l)){ // if the list is empty there is no images - $this->app->setOutput("Error", "No image"); } }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -170,7 +168,6 @@ class image implements Core{ }catch(NotImplementedError $e){ $this->app->getErrorInstance->NotImplementedHandler($e); } - //return $l; $this->app->setOutput("Images", $result); } @@ -181,9 +178,10 @@ class image implements Core{ * identifier of the image * **/ - private function detailsImage($id){ + private function detailsImage(){ + $id = $this->app->getPostParam("id"); if(!isset($id)){ - // Renvoyer erreur + $this->app->setOutput("Error", "Incorrect id parameter"); } try{ $service = $this->libClass; @@ -191,8 +189,7 @@ class image implements Core{ if($image == null){ // if the image don't exists -> error $this->app->setOutput("Error", "Image doesn't exist"); } - - return $image; + $this->app->setOutput("Images", $image); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ @@ -213,7 +210,9 @@ class image implements Core{ * @param array $opt * options for the image creation **/ - private function updateImage($id, array $opt){ + private function updateImage(){ + $id = $this->app->getPostParam("id"); + $opt = $this->app->getPostParam("opt"); if(!isset($id)){ $this->app->setOutput("Error", "Incorrect id parameter"); } @@ -260,7 +259,7 @@ class image implements Core{ }catch(NotImplementedError $e){ $this->app->getErrorInstance->NotImplementedHandler($e); } - return $image; + $this->app->setOutput("Images", $image); } /** @@ -269,9 +268,10 @@ class image implements Core{ * @param string $id * identifier of the image **/ - private function deleteImage($id){ + 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"); } @@ -291,8 +291,7 @@ class image implements Core{ $this->app->getErrorInstance->BaseErrorHandler($e); }catch(NotImplementedError $e){ $this->app->getErrorInstance->NotImplementedHandler($e); - } - + } } /** @@ -301,7 +300,8 @@ class image implements Core{ * @param string $id * identifier of the image **/ - private function reactivateImage($id){ + private function reactivateImage(){ + $id = $this->app->getPostParam("id"); if(!isset($id)){ $this->app->setOutput("Error", "Incorrect parameter"); } @@ -330,7 +330,8 @@ class image implements Core{ * @param string $id * identifier of the image **/ - private function desactivateImage($id){ + private function desactivateImage(){ + $id = $this->app->getPostParam("id"); if(!isset($id)){ $this->app->setOutput("Error", "Incorrect parameter"); } @@ -363,6 +364,9 @@ class image implements Core{ * path of the image **/ private function uploadImage($id, $file_name){ + $id = $this->app->getPostParam("id"); + $file_name = $this->app->getPostParam("file_name"); + if(!isset($id)){ $this->app->setOutput("Error", "Incorrect id parameter"); } @@ -396,6 +400,7 @@ class image implements Core{ * identifier of the image **/ private function downloadImage($id){ + $id = $this->app->getPostParam("id"); if(!isset($id)){ $this->app->setOutput("Error", "Incorrect parameter"); } @@ -416,7 +421,7 @@ class image implements Core{ }catch(NotImplementedError $e){ $this->app->getErrorInstance->NotImplementedHandler($e); } - return $stream; + $this->app->setOutput("Images", $stream); } /** @@ -428,7 +433,10 @@ class image implements Core{ * @param string $member_id * identifier of the member **/ - private function addMemberImage($image_id, $member_id){ + 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"); } @@ -461,7 +469,9 @@ class image implements Core{ * @param string $image_id * identifier of the image **/ - private function listMemberImage($image_id, $member_id){ + 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"); } @@ -488,7 +498,7 @@ class image implements Core{ }catch(NotImplementedError $e){ $this->app->getErrorInstance->NotImplementedHandler($e); } - return $members; + $this->app->setOutput("Images", $member); } /** @@ -500,7 +510,9 @@ class image implements Core{ * @param string $member_id * identifier of the member **/ - private function detailMemberImage($image_id, $member_id){ + 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"); } @@ -531,7 +543,7 @@ class image implements Core{ }catch(NotImplementedError $e){ $this->app->getErrorInstance->NotImplementedHandler($e); } - return $member; + $this->app->setOutput("Images", $member); } /** @@ -543,7 +555,10 @@ class image implements Core{ * @param string $member_id * identifier of the member **/ - private function removeMemberImage($image_id, $member_id){ + 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"); } @@ -586,6 +601,10 @@ class image implements Core{ * new status for the member **/ private function updateMemberImage($image_id, $member_id, $status){ + $image_id = $this->app->getPostParam("image_id"); + $member_id = $this->app->getPostParam("member_id"); + $status = $this->app->getPostParam("status"); + if(!isset($image_id)){ $this->app->setOutput("Error", "Incorrect parameter image_id"); } -- cgit v1.2.3 From 78a4f8574fb074fef30b2a646c052f68743ee37e Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Wed, 9 Mar 2016 14:31:14 +0100 Subject: modif in image constructor --- server/core/Image.php | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'server/core') diff --git a/server/core/Image.php b/server/core/Image.php index ddd8390..426cf9d 100644 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -43,18 +43,8 @@ class image implements Core{ if(!isset($app)){ $this->app->setOutput("Error", "Incorrect parameter"); } - try{ - $this->app = $app; - $this->libClass = $app->getLibClass("Image"); - }catch(BadResponseError $e){ - $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ - $this->app->getErrorInstance->UserInputHandler($e); - }catch(BaseError $e){ - $this->app->getErrorInstance->BaseErrorHandler($e); - }catch(NotImplementedError $e){ - $this->app->getErrorInstance->NotImplementedHandler($e); - } + $this->app = $app; + $this->libClass = $app->getLibClass("Image"); } -- cgit v1.2.3 From 5c6f6c97b7b906476ad5b9ed193e0140dd66f977 Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Wed, 9 Mar 2016 15:26:01 +0100 Subject: solve syntax error --- server/core/Image.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server/core') diff --git a/server/core/Image.php b/server/core/Image.php index 426cf9d..b21073b 100644 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -68,7 +68,7 @@ class image implements Core{ * options for the image creation * **/ - private function createImage(array $opt){ + private function createImage(){ $opt = $this->app->getPostParam("opt"); if(!isset($opt)){ -- cgit v1.2.3 From aee0bda9d47f9d279ff9b5b4a4a263fc5613863e Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Wed, 9 Mar 2016 15:39:43 +0100 Subject: correct errors --- server/core/Image.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'server/core') diff --git a/server/core/Image.php b/server/core/Image.php index b21073b..f509cd6 100644 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -353,7 +353,7 @@ class image implements Core{ * @param string $file_name * path of the image **/ - private function uploadImage($id, $file_name){ + private function uploadImage(){ $id = $this->app->getPostParam("id"); $file_name = $this->app->getPostParam("file_name"); @@ -389,7 +389,7 @@ class image implements Core{ * @param string $id * identifier of the image **/ - private function downloadImage($id){ + private function downloadImage(){ $id = $this->app->getPostParam("id"); if(!isset($id)){ $this->app->setOutput("Error", "Incorrect parameter"); @@ -590,7 +590,7 @@ class image implements Core{ * @param string $status * new status for the member **/ - private function updateMemberImage($image_id, $member_id, $status){ + private function updateMemberImage(){ $image_id = $this->app->getPostParam("image_id"); $member_id = $this->app->getPostParam("member_id"); $status = $this->app->getPostParam("status"); -- cgit v1.2.3