From 2d260aa6f591030f869063ccdb1f6997d12c1294 Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Tue, 19 Apr 2016 17:17:14 +0200 Subject: correct syntaxt on Network, add tests for automating --- server/core/FloatingIp.php | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) (limited to 'server/core/FloatingIp.php') diff --git a/server/core/FloatingIp.php b/server/core/FloatingIp.php index 4271a84..c5a947e 100755 --- a/server/core/FloatingIp.php +++ b/server/core/FloatingIp.php @@ -105,7 +105,16 @@ class floatingIp implements Core{ $this->app->setOutput("Error", "Incorrect parameter opt"); } try{ - $floatingip = null; //obtenir ip + $floatingips = listFloatingIps(); + $floatingIp = null; + foreach ($floatingips as $f) { + if($f['id'] == $id){ + $floatingIp = $f; + } + } + if(!isset($floatingIp)){ + $this->app->setOutput("Error", "Unknowing floatingip id"); + } $floatingip->update(); @@ -139,7 +148,16 @@ class floatingIp implements Core{ $this->app->setOutput("Error", "Incorrect parameter opt"); } try{ - $floatingip = null; //obtenir ip + $floatingips = listFloatingIps(); + $floatingIp = null; + foreach ($floatingips as $f) { + if($f['id'] == $id){ + $floatingIp = $f; + } + } + if(!isset($floatingIp)){ + $this->app->setOutput("Error", "Unknowing floatingip id"); + } $floatingip->delete(); @@ -173,7 +191,16 @@ class floatingIp implements Core{ $this->app->setOutput("Error", "Incorrect parameter opt"); } try{ - $floatingip = null; //obtenir ip + $floatingips = listFloatingIps(); + $floatingIp = null; + foreach ($floatingips as $f) { + if($f['id'] == $id){ + $floatingIp = $f; + } + } + if(!isset($floatingIp)){ + $this->app->setOutput("Error", "Unknowing floatingip id"); + } $floatingip->retrieve(); -- cgit v1.2.3 From 3795d05a97dd144073d466be1ed0fd144683d8df Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Tue, 19 Apr 2016 18:00:37 +0200 Subject: trying test floatingip --- server/Test/AppTestClass.php | 5 +++++ server/Test/automatingTests.php | 22 ++++++++++-------- server/core/FloatingIp.php | 50 ++++++++++++++++++++++++++++------------- 3 files changed, 53 insertions(+), 24 deletions(-) (limited to 'server/core/FloatingIp.php') diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php index a663514..eaea7f6 100755 --- a/server/Test/AppTestClass.php +++ b/server/Test/AppTestClass.php @@ -63,6 +63,11 @@ class AppTest{ $opt = $this->tokenClass->getOptions($service); return $this->openstack->networkingV2($opt); break; + case "FloatingIp": + if($this->tokenPost == NULL) $this->tokenClass->genNetworkToken(); + $opt = $this->tokenClass->getOptions($service); + return $this->openstack->networkingV2ExtLayer3($opt); + break; } } diff --git a/server/Test/automatingTests.php b/server/Test/automatingTests.php index 5cdee26..6de4de5 100644 --- a/server/Test/automatingTests.php +++ b/server/Test/automatingTests.php @@ -2,23 +2,27 @@ include('InitTest.php'); include_once("../core/Image.php"); include_once("../core/Compute.php"); -include_once("../core/Network.php"); +//include_once("../core/Network.php"); +//include_once("../core/Automating.php"); include_once("../core/FloatingIp.php"); -include_once("../core/Automating.php"); $image = new Image($App); $compute = new Compute($App); -$network = new Network($App); +//$network = new Network($App); $floatingIp = new FloatingIp($App); -$automating = new Automating($App); - - -$compute->listServers(); +//$automating = new Automating($App); +// Liste des serveurs +$compute->action("listServers"); $servers = json_decode($App->show(), true)["Servers"]; - foreach($servers as $server){ - echo $server->name." ".$server->id."
"; + echo $server['name']." ".$server['id']."
"; } +// liste des floatingip +$floatingIp->action("listFloatingIp"); +$listFloatingIp = json_decode($App->show(), true)["FloatingIp"]; +foreach ($listFloatingIp as $floatIp){ + echo $floatIp['floating_ip_address']." ".$floatIp['id']." ".$floatIp["status"]."
"; +} ?> \ No newline at end of file diff --git a/server/core/FloatingIp.php b/server/core/FloatingIp.php index c5a947e..bbcd888 100755 --- a/server/core/FloatingIp.php +++ b/server/core/FloatingIp.php @@ -14,7 +14,7 @@ use OpenCloud\Common\Error\BaseError; use OpenCloud\Common\Error\NotImplementedError; use OpenCloud\Common\Error\UserInputError; -include("CoreInterface.php"); +//include("CoreInterface.php"); /** * Image Class of the back-end application @@ -22,7 +22,7 @@ include("CoreInterface.php"); * Management of images * */ -class floatingIp implements Core{ +class floatingIp { /** @var App $app protected, contains the main app object */ protected $app; @@ -31,11 +31,11 @@ class floatingIp implements Core{ protected $libClass; /** - * Image constructor + * floatingip constructor * * @param App $app the main app object * - * @return Image + * @return floatingip */ public function __construct($app){ if(!isset($app)){ @@ -57,6 +57,36 @@ class floatingIp implements Core{ $this->{$action.""}(); } + + /** + * List floatingip + * + * @return list of the floatingip + */ + private function listFloatingIp(){ + try{ + $result = array(); + $l = $this->libClass->getFloatingIps(); + + + + foreach ($l as $tmp) { + $serult[] = $tmp; + } + $this->app->setOutput("FloatingIp", $result); + }catch(BadResponseError $e){ + $this->app->getErrorInstance()->BadResponseHandler($e); + }catch(UserInputError $e){ + $this->app->getErrorInstance()->UserInputHandler($e); + }catch(BaseError $e){ + $this->app->getErrorInstance()->BaseErrorHandler($e); + }catch(NotImplementedError $e){ + $this->app->getErrorInstance()->NotImplementedHandler($e); + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } + } + /** * Create a new floating IP adress * @@ -72,7 +102,7 @@ class floatingIp implements Core{ } try{ $floatingip = $this->libClass->create($opt); - if(!isset){ + if(!isset($floatingip)){ $this->app->setOutput("Error", "Unknowing error during floating ip creation"); } else{ @@ -118,9 +148,6 @@ class floatingIp implements Core{ $floatingip->update(); - if(!isset){ - $this->app->setOutput("Error", "Unknowing error during floating ip creation"); - } }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ @@ -161,9 +188,6 @@ class floatingIp implements Core{ $floatingip->delete(); - if(!isset){ - $this->app->setOutput("Error", "Unknowing error during floating ip creation"); - } }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ @@ -203,10 +227,6 @@ class floatingIp implements Core{ } $floatingip->retrieve(); - - if(!isset){ - $this->app->setOutput("Error", "Unknowing error during floating ip creation"); - } }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ -- cgit v1.2.3 From 00184e623ec6dd1b5757fd9b268bc2afe97c338b Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Tue, 19 Apr 2016 18:33:21 +0200 Subject: trying floating ip --- server/core/FloatingIp.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'server/core/FloatingIp.php') diff --git a/server/core/FloatingIp.php b/server/core/FloatingIp.php index bbcd888..26f5ef1 100755 --- a/server/core/FloatingIp.php +++ b/server/core/FloatingIp.php @@ -66,13 +66,13 @@ class floatingIp { private function listFloatingIp(){ try{ $result = array(); - $l = $this->libClass->getFloatingIps(); - - + $l = $this->libClass->getFloatingIps(); + echo 'toto'; foreach ($l as $tmp) { - $serult[] = $tmp; + $result[] = $tmp; } + $this->app->setOutput("FloatingIp", $result); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); -- cgit v1.2.3 From 49ce03168ad0c71a1df3ff4f9f161cbbe61bb277 Mon Sep 17 00:00:00 2001 From: EoleDev Date: Tue, 19 Apr 2016 19:44:09 +0200 Subject: Error patch --- server/Test/automatingTests.php | 2 +- server/core/FloatingIp.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 server/Test/automatingTests.php (limited to 'server/core/FloatingIp.php') diff --git a/server/Test/automatingTests.php b/server/Test/automatingTests.php old mode 100644 new mode 100755 index 6de4de5..8715464 --- a/server/Test/automatingTests.php +++ b/server/Test/automatingTests.php @@ -23,6 +23,6 @@ foreach($servers as $server){ $floatingIp->action("listFloatingIp"); $listFloatingIp = json_decode($App->show(), true)["FloatingIp"]; foreach ($listFloatingIp as $floatIp){ - echo $floatIp['floating_ip_address']." ".$floatIp['id']." ".$floatIp["status"]."
"; + echo "IP : ".$floatIp['floating_ip_address']." et ID: ".$floatIp['id']." ".$floatIp["status"]."
"; } ?> \ No newline at end of file diff --git a/server/core/FloatingIp.php b/server/core/FloatingIp.php index 26f5ef1..f26c3fb 100755 --- a/server/core/FloatingIp.php +++ b/server/core/FloatingIp.php @@ -66,8 +66,8 @@ class floatingIp { private function listFloatingIp(){ try{ $result = array(); - - $l = $this->libClass->getFloatingIps(); + $l = $this->libClass->listFloatingIps(); + error_log(var_export($l, true), 0); echo 'toto'; foreach ($l as $tmp) { $result[] = $tmp; -- cgit v1.2.3 From 94629aeaf523f391f09ef18c1b2ca639e0b02d08 Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Tue, 19 Apr 2016 23:57:03 +0200 Subject: tentative ip publique --- server/Test/automatingTests.php | 65 ++++++++++++++++++++++++++++++++++++++--- server/core/FloatingIp.php | 51 ++++++++++++++++++++++++++++++-- server/core/Network.php | 2 +- 3 files changed, 111 insertions(+), 7 deletions(-) (limited to 'server/core/FloatingIp.php') diff --git a/server/Test/automatingTests.php b/server/Test/automatingTests.php index 8715464..078f86b 100755 --- a/server/Test/automatingTests.php +++ b/server/Test/automatingTests.php @@ -2,27 +2,84 @@ include('InitTest.php'); include_once("../core/Image.php"); include_once("../core/Compute.php"); -//include_once("../core/Network.php"); +include_once("../core/Network.php"); //include_once("../core/Automating.php"); include_once("../core/FloatingIp.php"); $image = new Image($App); $compute = new Compute($App); -//$network = new Network($App); +$network = new Network($App); $floatingIp = new FloatingIp($App); //$automating = new Automating($App); // Liste des serveurs +echo "Liste des serveurs :
"; $compute->action("listServers"); $servers = json_decode($App->show(), true)["Servers"]; +$id = null; foreach($servers as $server){ - echo $server['name']." ".$server['id']."
"; + echo $server['name']." ".$server['id']." ".$server['ipv4']."
"; + if(strcmp($server['name'], "bob")){ + $id = $server['id']; + } } +echo "
"; + +/* +// Liste des ports +echo "Liste des ports :
"; +$network->action("listPorts"); +$ports = json_decode($App->show(), true)["Network"]; +foreach ($ports as $p) { + echo $p["fixedIps"]."
"; +} +*/ + + +// liste des floatingip +echo "Liste des floatingip :
"; +$floatingIp->action("listFloatingIp"); +$listFloatingIp = json_decode($App->show(), true)["FloatingIp"]; +$ip = null; +foreach ($listFloatingIp as $floatIp){ + echo $floatIp['floatingIpAddress']." ".$floatIp['id']." ".$floatIp["status"]."
"; + $ip = $floatIp; +} + +echo "
"; + +// Création d'une ip flotante +$opt = array(); +$opt['floatingNetworkId'] = $id; +$opt['floatingip'] = $ip; +//$opt['tenantId'] = "fbf5f920a7954b61b352bc09ce5ae803 "; +//$opt['fixedIpAddress'] = "10.0.0.52"; +//$opt['floatingIpAddress'] = "148.60.11.116"; +//$opt['portId'] = "10.0.0.52"; + +$App->setPostParam('opt', $opt); +$floatingIp->action("createFloatingIp"); +$float = json_decode($App->show(), true)["FloatingIp"]; +if(!isset($float)){ + echo "Erreur pendant la création
"; +} +else{ + foreach ($float as $f) { + echo $f." "; + } + echo "
"; +} + + +echo "
"; // liste des floatingip +echo "Liste des floatingip :
"; $floatingIp->action("listFloatingIp"); $listFloatingIp = json_decode($App->show(), true)["FloatingIp"]; foreach ($listFloatingIp as $floatIp){ - echo "IP : ".$floatIp['floating_ip_address']." et ID: ".$floatIp['id']." ".$floatIp["status"]."
"; + echo $floatIp['floatingIpAddress']." ".$floatIp['id']." ".$floatIp["status"]."
"; } + + ?> \ No newline at end of file diff --git a/server/core/FloatingIp.php b/server/core/FloatingIp.php index f26c3fb..528ab4f 100755 --- a/server/core/FloatingIp.php +++ b/server/core/FloatingIp.php @@ -68,7 +68,6 @@ class floatingIp { $result = array(); $l = $this->libClass->listFloatingIps(); error_log(var_export($l, true), 0); - echo 'toto'; foreach ($l as $tmp) { $result[] = $tmp; } @@ -101,13 +100,61 @@ class floatingIp { $this->app->setOutput("Error", "Incorrect parameter opt"); } try{ - $floatingip = $this->libClass->create($opt); + $floatingip = $this->libClass->createFloatingIp($opt); + echo 'YOLO'; if(!isset($floatingip)){ $this->app->setOutput("Error", "Unknowing error during floating ip creation"); } else{ $this->app->setOutput("FloatingIp", $floatingip); } + }catch(BadResponseError $e){ + echo $e."
"; + $this->app->getErrorInstance()->BadResponseHandler($e); + }catch(UserInputError $e){ + echo $e."
"; + $this->app->getErrorInstance()->UserInputHandler($e); + }catch(BaseError $e){ + echo $e."
"; + $this->app->getErrorInstance()->BaseErrorHandler($e); + }catch(NotImplementedError $e){ + echo $e."
"; + $this->app->getErrorInstance()->NotImplementedHandler($e); + }catch(Exception $e){ + echo $e->getMessage()."
"; + $this->app->getErrorInstance()->OtherException($e); + } + } + + + /** + * Show floatingip details + * + * @param String id the id of the floatingip + * + * @return floatingip details + */ + private function getFloatingIp(){ + $id = $this->app->getPostParam("id"); + if(!isset($id)){ + $this->app->setOutput("Error", "Incorrect parameter opt"); + } + + try{ + /*$l = $this->listFloatingIp(); + $res = null; + foreach ($l as $f) { + if($f['id']==$id){ + $res = $f; + } + } + if(!isset($f)){ + $this->app->setOutput("Error", "Unknow id"); + } + else{*/ + $res = $this->libClass->getFloatingIp($id); + $this->app->setOutput("FloatingIp", $res); + //} }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ diff --git a/server/core/Network.php b/server/core/Network.php index 9564f06..3e5e2ca 100755 --- a/server/core/Network.php +++ b/server/core/Network.php @@ -40,7 +40,7 @@ class network{ public function __construct($app){ $this->app = $app; - $this->libClass = $app->getLibClass("network"); + $this->libClass = $app->getLibClass("Network"); } -- cgit v1.2.3 From 94ce37f5175eb6f528d5ad29a446c04d981628f1 Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Thu, 21 Apr 2016 21:31:25 +0200 Subject: end of floatingip --- server/Test/automatingTests.php | 22 ++------ server/Test/floatingIpTests.php | 88 +++++++++++++++++++++++++++++++ server/core/FloatingIp.php | 111 ++++++++++++++++++++++++++-------------- 3 files changed, 165 insertions(+), 56 deletions(-) create mode 100644 server/Test/floatingIpTests.php (limited to 'server/core/FloatingIp.php') diff --git a/server/Test/automatingTests.php b/server/Test/automatingTests.php index 6b0e9d6..3f32d02 100755 --- a/server/Test/automatingTests.php +++ b/server/Test/automatingTests.php @@ -44,18 +44,7 @@ foreach($servers as $server){ } echo "
"; -// liste des floatingip -echo "Liste des floatingip :
"; -$floatingIp->action("listFloatingIp"); -$listFloatingIp = json_decode($App->show(), true)["FloatingIp"]; -$ip = null; -foreach ($listFloatingIp as $floatIp){ - echo $floatIp['floatingIpAddress']." ".$floatIp['id']." ".$floatIp["status"]."
"; - $ip = $floatIp; -} - -echo "
"; - +/* // Création d'une ip flotante $opt = array(); //$opt['floatingNetworkId'] = $id; !!!!! TOTALEMENT FAUX ici tu passe en parametre l id du serveur et non du network @@ -72,15 +61,10 @@ $float = json_decode($App->show(), true)["FloatingIp"]; if(!isset($float)){ echo "Erreur pendant la création
"; } -else{ - foreach ($float as $f) { - echo $f." "; - } - echo "
"; -} +echo "
"; +*/ -echo "
"; // liste des floatingip echo "Liste des floatingip :
"; diff --git a/server/Test/floatingIpTests.php b/server/Test/floatingIpTests.php new file mode 100644 index 0000000..191de46 --- /dev/null +++ b/server/Test/floatingIpTests.php @@ -0,0 +1,88 @@ +"; +$compute->action("listServers"); +$servers = json_decode($App->show(), true)["Servers"]; +$id = null; +foreach($servers as $server){ + echo $server['name']." ".$server['id']." ".$server['ipv4']."
"; + if(strcmp($server['name'], "bob")){ + $id = $server['id']; + } +} +echo "
"; + + +// Liste des networks +echo "Liste des network :
"; +$network->action("list_network_ids"); +$servers = json_decode($App->show(), true)["ListNetworkIds"]; +$id = null; +foreach($servers as $server){ + echo $server."
"; +} +echo "
"; + + +// Liste des floatingip +echo "Liste des floatingip :
"; +$floatingIp->action("listFloatingIp"); +$listFloatingIp = json_decode($App->show(), true)["FloatingIp"]; +$id = null; +foreach ($listFloatingIp as $floatIp){ + echo $floatIp['floatingIpAddress']." ".$floatIp['id']." ".$floatIp["status"]."
"; + $id = $floatIp['id']; +} +echo "
"; + + +// Liste des floatingip +echo "Get floatingip :
"; +$App->setPostParam('id', $id); +$floatingIp->action("getFloatingIp"); +$getFloatingIp = json_decode($App->show(), true)["FloatingIp"]; +echo $getFloatingIp['id']."
"; +echo "
"; + + +/* +// Création d'une ip flotante +$opt = array(); +$opt['floatingNetworkId'] = "251b4641-20ff-4a72-8549-1758788b51ce"; + +$App->setPostParam('opt', $opt); +$floatingIp->action("createFloatingIp"); +$float = json_decode($App->show(), true)["FloatingIp"]; +if(!isset($float)){ + echo "Erreur pendant la création
"; +} +echo "
"; +*/ + +/* +// Suppression d'une ip flotante +$App->setPostParam('id', $id); +$floatingIp->action("deleteFloatingIp"); +*/ + +// Liste des floatingip +echo "Liste des floatingip :
"; +$floatingIp->action("listFloatingIp"); +$listFloatingIp = json_decode($App->show(), true)["FloatingIp"]; +foreach ($listFloatingIp as $floatIp){ + echo $floatIp['floatingIpAddress']." ".$floatIp['id']." ".$floatIp["status"]."
"; +} + + +?> \ No newline at end of file diff --git a/server/core/FloatingIp.php b/server/core/FloatingIp.php index 528ab4f..cdbb64b 100755 --- a/server/core/FloatingIp.php +++ b/server/core/FloatingIp.php @@ -101,11 +101,10 @@ class floatingIp { } try{ $floatingip = $this->libClass->createFloatingIp($opt); - echo 'YOLO'; + if(!isset($floatingip)){ $this->app->setOutput("Error", "Unknowing error during floating ip creation"); - } - else{ + }else{ $this->app->setOutput("FloatingIp", $floatingip); } }catch(BadResponseError $e){ @@ -141,20 +140,29 @@ class floatingIp { } try{ - /*$l = $this->listFloatingIp(); - $res = null; - foreach ($l as $f) { - if($f['id']==$id){ - $res = $f; + // List of floating IPs + $res = array(); + $l = $this->libClass->listFloatingIps(); + foreach ($l as $tmp) { + $res[] = $tmp; + } + + // Verification if id exists + $result = null; + foreach ($res as $f) { + if(strcmp($res['id'], $id)){ + $result = $f; + } } - if(!isset($f)){ + + if(!isset($result)){ // If id doesn't exists $this->app->setOutput("Error", "Unknow id"); - } - else{*/ + }else{ // If id exists $res = $this->libClass->getFloatingIp($id); $this->app->setOutput("FloatingIp", $res); - //} + } + }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ @@ -182,18 +190,29 @@ class floatingIp { $this->app->setOutput("Error", "Incorrect parameter opt"); } try{ - $floatingips = listFloatingIps(); - $floatingIp = null; - foreach ($floatingips as $f) { - if($f['id'] == $id){ - $floatingIp = $f; + + // List of floating IPs + $res = array(); + $l = $this->libClass->listFloatingIps(); + foreach ($l as $tmp) { + $res[] = $tmp; + } + + // Verification if id exists + $result = null; + foreach ($res as $f) { + if(strcmp($res['id'], $id)){ + $result = $f; + } } - if(!isset($floatingIp)){ + + if(!isset($result)){ // If id doesn't exists $this->app->setOutput("Error", "Unknowing floatingip id"); + }else{ + $result->update(); } - - $floatingip->update(); + }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -222,19 +241,27 @@ class floatingIp { $this->app->setOutput("Error", "Incorrect parameter opt"); } try{ - $floatingips = listFloatingIps(); - $floatingIp = null; - foreach ($floatingips as $f) { - if($f['id'] == $id){ - $floatingIp = $f; + // List of floating IPs + $res = array(); + $l = $this->libClass->listFloatingIps(); + foreach ($l as $tmp) { + $res[] = $tmp; + } + + // Verification if id exists + $result = null; + foreach ($res as $f) { + if(strcmp($res['id'], $id)){ + $result = $f; + } } - if(!isset($floatingIp)){ + + if(!isset($result)){ // If id doesn't exists $this->app->setOutput("Error", "Unknowing floatingip id"); + }else{ + $result->delete(); } - - $floatingip->delete(); - }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ @@ -248,6 +275,7 @@ class floatingIp { } } + /** * Retrieve a floating ip * @@ -262,18 +290,27 @@ class floatingIp { $this->app->setOutput("Error", "Incorrect parameter opt"); } try{ - $floatingips = listFloatingIps(); - $floatingIp = null; - foreach ($floatingips as $f) { - if($f['id'] == $id){ - $floatingIp = $f; + // List of floating IPs + $res = array(); + $l = $this->libClass->listFloatingIps(); + foreach ($l as $tmp) { + $res[] = $tmp; + } + + // Verification if id exists + $result = null; + foreach ($res as $f) { + if(strcmp($res['id'], $id)){ + $result = $f; + } } - if(!isset($floatingIp)){ + + if(!isset($result)){ // If id doesn't exists $this->app->setOutput("Error", "Unknowing floatingip id"); + }else{ + $result->retrieve(); } - - $floatingip->retrieve(); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ -- cgit v1.2.3 From 3f6af0b6446725462362de94f09daf9a723b130d Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Thu, 21 Apr 2016 21:51:46 +0200 Subject: modification in structure for ip and routers --- server/Test/AppTestClass.php | 2 +- server/Test/NetworkLayer3Tests.php | 88 ++++++++++ server/Test/automatingTests.php | 40 +---- server/Test/floatingIpTests.php | 88 ---------- server/core/App.php | 2 +- server/core/Automating.php | 5 +- server/core/FloatingIp.php | 326 ------------------------------------- server/core/NetworkLayer3.php | 326 +++++++++++++++++++++++++++++++++++++ server/index.php | 6 +- 9 files changed, 427 insertions(+), 456 deletions(-) create mode 100644 server/Test/NetworkLayer3Tests.php delete mode 100644 server/Test/floatingIpTests.php delete mode 100755 server/core/FloatingIp.php create mode 100755 server/core/NetworkLayer3.php (limited to 'server/core/FloatingIp.php') diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php index d8a02ca..972d9b4 100755 --- a/server/Test/AppTestClass.php +++ b/server/Test/AppTestClass.php @@ -63,7 +63,7 @@ class AppTest{ $opt = $this->tokenClass->getOptions($service); return $this->openstack->networkingV2($opt); break; - case "FloatingIp": + case "NetworkLayer3": if($this->tokenPost == NULL) $this->tokenClass->genNetworkToken(); $opt = $this->tokenClass->getOptions('Network'); return $this->openstack->networkingV2ExtLayer3($opt); diff --git a/server/Test/NetworkLayer3Tests.php b/server/Test/NetworkLayer3Tests.php new file mode 100644 index 0000000..b827a51 --- /dev/null +++ b/server/Test/NetworkLayer3Tests.php @@ -0,0 +1,88 @@ +"; +$compute->action("listServers"); +$servers = json_decode($App->show(), true)["Servers"]; +$id = null; +foreach($servers as $server){ + echo $server['name']." ".$server['id']." ".$server['ipv4']."
"; + if(strcmp($server['name'], "bob")){ + $id = $server['id']; + } +} +echo "
"; + + +// Liste des networks +echo "Liste des network :
"; +$network->action("list_network_ids"); +$servers = json_decode($App->show(), true)["ListNetworkIds"]; +$id = null; +foreach($servers as $server){ + echo $server."
"; +} +echo "
"; + + +// Liste des floatingip +echo "Liste des floatingip :
"; +$networkLayer3->action("listFloatingIp"); +$listFloatingIp = json_decode($App->show(), true)["NetworkLayer3"]; +$id = null; +foreach ($listFloatingIp as $floatIp){ + echo $floatIp['floatingIpAddress']." ".$floatIp['id']." ".$floatIp["status"]."
"; + $id = $floatIp['id']; +} +echo "
"; + + +// Liste des floatingip +echo "Get floatingip :
"; +$App->setPostParam('id', $id); +$networkLayer3->action("getFloatingIp"); +$getFloatingIp = json_decode($App->show(), true)["NetworkLayer3"]; +echo $getFloatingIp['id']."
"; +echo "
"; + + +/* +// Création d'une ip flotante +$opt = array(); +$opt['floatingNetworkId'] = "251b4641-20ff-4a72-8549-1758788b51ce"; + +$App->setPostParam('opt', $opt); +$networkLayer3->action("createFloatingIp"); +$float = json_decode($App->show(), true)["NetworkLayer3"]; +if(!isset($float)){ + echo "Erreur pendant la création
"; +} +echo "
"; +*/ + +/* +// Suppression d'une ip flotante +$App->setPostParam('id', $id); +$networkLayer3->action("deleteFloatingIp"); +*/ + +// Liste des floatingip +echo "Liste des floatingip :
"; +$networkLayer3->action("listFloatingIp"); +$listFloatingIp = json_decode($App->show(), true)["NetworkLayer3"]; +foreach ($listFloatingIp as $floatIp){ + echo $floatIp['floatingIpAddress']." ".$floatIp['id']." ".$floatIp["status"]."
"; +} + + +?> \ No newline at end of file diff --git a/server/Test/automatingTests.php b/server/Test/automatingTests.php index 3f32d02..e8e8475 100755 --- a/server/Test/automatingTests.php +++ b/server/Test/automatingTests.php @@ -4,12 +4,11 @@ include_once("../core/Image.php"); include_once("../core/Compute.php"); include_once("../core/Network.php"); //include_once("../core/Automating.php"); -include_once("../core/FloatingIp.php"); +include_once("../core/NetworkLayer3.php"); $image = new Image($App); $compute = new Compute($App); -$network = new Network($App); -$floatingIp = new FloatingIp($App); +$networkLayer3 = new NetworkLayer3($App); //$automating = new Automating($App); // Liste des serveurs @@ -25,15 +24,7 @@ foreach($servers as $server){ } echo "
"; -/* -// Liste des ports -echo "Liste des ports :
"; -$network->action("listPorts"); -$ports = json_decode($App->show(), true)["Network"]; -foreach ($ports as $p) { - echo $p["fixedIps"]."
"; -} -*/ + //Liste des networks echo "Liste des network :
"; $network->action("list_network_ids"); @@ -44,32 +35,11 @@ foreach($servers as $server){ } echo "
"; -/* -// Création d'une ip flotante -$opt = array(); -//$opt['floatingNetworkId'] = $id; !!!!! TOTALEMENT FAUX ici tu passe en parametre l id du serveur et non du network -//$opt['floatingip'] = $ip; !!!! il n y a pas d objet floatingip a passer en param, celui ci est compose, regarde bien les exemples de l api OpenStack -//$opt['tenantId'] = "fbf5f920a7954b61b352bc09ce5ae803 "; -//$opt['fixedIpAddress'] = "10.0.0.52"; -//$opt['floatingIpAddress'] = "148.60.11.116"; -//$opt['portId'] = "10.0.0.52"; -$opt['floatingNetworkId'] = "251b4641-20ff-4a72-8549-1758788b51ce"; - -$App->setPostParam('opt', $opt); -$floatingIp->action("createFloatingIp"); -$float = json_decode($App->show(), true)["FloatingIp"]; -if(!isset($float)){ - echo "Erreur pendant la création
"; -} -echo "
"; -*/ - - // liste des floatingip echo "Liste des floatingip :
"; -$floatingIp->action("listFloatingIp"); -$listFloatingIp = json_decode($App->show(), true)["FloatingIp"]; +$networkLayer3->action("listFloatingIp"); +$listFloatingIp = json_decode($App->show(), true)["NetworkLayer3"]; foreach ($listFloatingIp as $floatIp){ echo $floatIp['floatingIpAddress']." ".$floatIp['id']." ".$floatIp["status"]."
"; } diff --git a/server/Test/floatingIpTests.php b/server/Test/floatingIpTests.php deleted file mode 100644 index 191de46..0000000 --- a/server/Test/floatingIpTests.php +++ /dev/null @@ -1,88 +0,0 @@ -"; -$compute->action("listServers"); -$servers = json_decode($App->show(), true)["Servers"]; -$id = null; -foreach($servers as $server){ - echo $server['name']." ".$server['id']." ".$server['ipv4']."
"; - if(strcmp($server['name'], "bob")){ - $id = $server['id']; - } -} -echo "
"; - - -// Liste des networks -echo "Liste des network :
"; -$network->action("list_network_ids"); -$servers = json_decode($App->show(), true)["ListNetworkIds"]; -$id = null; -foreach($servers as $server){ - echo $server."
"; -} -echo "
"; - - -// Liste des floatingip -echo "Liste des floatingip :
"; -$floatingIp->action("listFloatingIp"); -$listFloatingIp = json_decode($App->show(), true)["FloatingIp"]; -$id = null; -foreach ($listFloatingIp as $floatIp){ - echo $floatIp['floatingIpAddress']." ".$floatIp['id']." ".$floatIp["status"]."
"; - $id = $floatIp['id']; -} -echo "
"; - - -// Liste des floatingip -echo "Get floatingip :
"; -$App->setPostParam('id', $id); -$floatingIp->action("getFloatingIp"); -$getFloatingIp = json_decode($App->show(), true)["FloatingIp"]; -echo $getFloatingIp['id']."
"; -echo "
"; - - -/* -// Création d'une ip flotante -$opt = array(); -$opt['floatingNetworkId'] = "251b4641-20ff-4a72-8549-1758788b51ce"; - -$App->setPostParam('opt', $opt); -$floatingIp->action("createFloatingIp"); -$float = json_decode($App->show(), true)["FloatingIp"]; -if(!isset($float)){ - echo "Erreur pendant la création
"; -} -echo "
"; -*/ - -/* -// Suppression d'une ip flotante -$App->setPostParam('id', $id); -$floatingIp->action("deleteFloatingIp"); -*/ - -// Liste des floatingip -echo "Liste des floatingip :
"; -$floatingIp->action("listFloatingIp"); -$listFloatingIp = json_decode($App->show(), true)["FloatingIp"]; -foreach ($listFloatingIp as $floatIp){ - echo $floatIp['floatingIpAddress']." ".$floatIp['id']." ".$floatIp["status"]."
"; -} - - -?> \ No newline at end of file diff --git a/server/core/App.php b/server/core/App.php index a4be6ec..32ad016 100755 --- a/server/core/App.php +++ b/server/core/App.php @@ -64,7 +64,7 @@ class App{ $opt = $this->tokenClass->getOptions($service); return $this->openstack->computeV2($opt); break; - case "FloatingIp": + case "NetworkLayer3": if($this->tokenPost == NULL) $this->tokenClass->genNetworkToken(); $opt = $this->tokenClass->getOptions('Network'); return $this->openstack->networkingV2ExtLayer3($opt); diff --git a/server/core/Automating.php b/server/core/Automating.php index 69a2773..4e212e7 100755 --- a/server/core/Automating.php +++ b/server/core/Automating.php @@ -14,6 +14,7 @@ include("CoreInterface.php"); include("Image.php"); include("Network.php"); include("Compute.php"); +include("NetworkLayer3"); class automating implements Core{ @@ -22,7 +23,7 @@ class automating implements Core{ protected $appImage; protected $appNetwork; protected $appIdentity; - protected $appFloatingIp; + protected $appNetworkLayer3; protected $app; /** @@ -40,7 +41,7 @@ class automating implements Core{ $this->appImage = $appImage; $this->appNetwork = $appNetwork; $this->appIdentity = $appIdentity; - $this->appFloatingIp = $appFloatingIp; + $this->appNetworkLayer3 = $appNetworkLayer3; $this->app = $app; } diff --git a/server/core/FloatingIp.php b/server/core/FloatingIp.php deleted file mode 100755 index cdbb64b..0000000 --- a/server/core/FloatingIp.php +++ /dev/null @@ -1,326 +0,0 @@ -app->setOutput("Error", "Incorrect parameter app"); - } - $this->app = $app; - $this->libClass = $app->getLibClass("FloatingIp"); - } - - - /** - * Execute an action - * - * @param String $action name of another function of this class - * - * @return void - */ - public function action($action){ - $this->{$action.""}(); - } - - - /** - * List floatingip - * - * @return list of the floatingip - */ - private function listFloatingIp(){ - try{ - $result = array(); - $l = $this->libClass->listFloatingIps(); - error_log(var_export($l, true), 0); - foreach ($l as $tmp) { - $result[] = $tmp; - } - - $this->app->setOutput("FloatingIp", $result); - }catch(BadResponseError $e){ - $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ - $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ - $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ - $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } - } - - /** - * Create a new floating IP adress - * - * @param array $opt Options for the floating ip creation (floatingipo and floating network id are required, others are optionals) - * - * @return floatingip - */ - private function createFloatingIp(){ - $opt = $this->app->getPostParam("opt"); - - if(!isset($opt)){ - $this->app->setOutput("Error", "Incorrect parameter opt"); - } - try{ - $floatingip = $this->libClass->createFloatingIp($opt); - - if(!isset($floatingip)){ - $this->app->setOutput("Error", "Unknowing error during floating ip creation"); - }else{ - $this->app->setOutput("FloatingIp", $floatingip); - } - }catch(BadResponseError $e){ - echo $e."
"; - $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ - echo $e."
"; - $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ - echo $e."
"; - $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ - echo $e."
"; - $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - echo $e->getMessage()."
"; - $this->app->getErrorInstance()->OtherException($e); - } - } - - - /** - * Show floatingip details - * - * @param String id the id of the floatingip - * - * @return floatingip details - */ - private function getFloatingIp(){ - $id = $this->app->getPostParam("id"); - if(!isset($id)){ - $this->app->setOutput("Error", "Incorrect parameter opt"); - } - - try{ - // List of floating IPs - $res = array(); - $l = $this->libClass->listFloatingIps(); - foreach ($l as $tmp) { - $res[] = $tmp; - } - - // Verification if id exists - $result = null; - foreach ($res as $f) { - if(strcmp($res['id'], $id)){ - $result = $f; - - } - } - - if(!isset($result)){ // If id doesn't exists - $this->app->setOutput("Error", "Unknow id"); - }else{ // If id exists - $res = $this->libClass->getFloatingIp($id); - $this->app->setOutput("FloatingIp", $res); - } - - }catch(BadResponseError $e){ - $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ - $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ - $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ - $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } - } - - /** - * Update floating ip - * - * @param id the id of the floatingip to update - * - * @return Image - */ - private function updateFloatingIp(){ - $id = $this->app->getPostParam("id"); - - if(!isset($id)){ - $this->app->setOutput("Error", "Incorrect parameter opt"); - } - try{ - - // List of floating IPs - $res = array(); - $l = $this->libClass->listFloatingIps(); - foreach ($l as $tmp) { - $res[] = $tmp; - } - - // Verification if id exists - $result = null; - foreach ($res as $f) { - if(strcmp($res['id'], $id)){ - $result = $f; - - } - } - - if(!isset($result)){ // If id doesn't exists - $this->app->setOutput("Error", "Unknowing floatingip id"); - }else{ - $result->update(); - } - - - }catch(BadResponseError $e){ - $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ - $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ - $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ - $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } - } - - /** - * Delete a floating ip - * - * @param string floatingip_id the floating-ip id to delete - * - * @return void - */ - private function deleteFloatingIp(){ - $id = $this->app->getPostParam("id"); - - if(!isset($id)){ - $this->app->setOutput("Error", "Incorrect parameter opt"); - } - try{ - // List of floating IPs - $res = array(); - $l = $this->libClass->listFloatingIps(); - foreach ($l as $tmp) { - $res[] = $tmp; - } - - // Verification if id exists - $result = null; - foreach ($res as $f) { - if(strcmp($res['id'], $id)){ - $result = $f; - - } - } - - if(!isset($result)){ // If id doesn't exists - $this->app->setOutput("Error", "Unknowing floatingip id"); - }else{ - $result->delete(); - } - }catch(BadResponseError $e){ - $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ - $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ - $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ - $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } - } - - - /** - * Retrieve a floating ip - * - * @param string floatingip_id the floating-ip id to retrieve - * - * @return void - */ - private function retrieveFloatingIp(){ - $id = $this->app->getPostParam("id"); - - if(!isset($id)){ - $this->app->setOutput("Error", "Incorrect parameter opt"); - } - try{ - // List of floating IPs - $res = array(); - $l = $this->libClass->listFloatingIps(); - foreach ($l as $tmp) { - $res[] = $tmp; - } - - // Verification if id exists - $result = null; - foreach ($res as $f) { - if(strcmp($res['id'], $id)){ - $result = $f; - - } - } - - if(!isset($result)){ // If id doesn't exists - $this->app->setOutput("Error", "Unknowing floatingip id"); - }else{ - $result->retrieve(); - } - }catch(BadResponseError $e){ - $this->app->getErrorInstance()->BadResponseHandler($e); - }catch(UserInputError $e){ - $this->app->getErrorInstance()->UserInputHandler($e); - }catch(BaseError $e){ - $this->app->getErrorInstance()->BaseErrorHandler($e); - }catch(NotImplementedError $e){ - $this->app->getErrorInstance()->NotImplementedHandler($e); - }catch(Exception $e){ - $this->app->getErrorInstance()->OtherException($e); - } - } -} diff --git a/server/core/NetworkLayer3.php b/server/core/NetworkLayer3.php new file mode 100755 index 0000000..28d27b4 --- /dev/null +++ b/server/core/NetworkLayer3.php @@ -0,0 +1,326 @@ +app->setOutput("Error", "Incorrect parameter app"); + } + $this->app = $app; + $this->libClass = $app->getLibClass("NetworkLayer3"); + } + + + /** + * Execute an action + * + * @param String $action name of another function of this class + * + * @return void + */ + public function action($action){ + $this->{$action.""}(); + } + + + /** + * List floatingip + * + * @return list of the floatingip + */ + private function listFloatingIp(){ + try{ + $result = array(); + $l = $this->libClass->listFloatingIps(); + error_log(var_export($l, true), 0); + foreach ($l as $tmp) { + $result[] = $tmp; + } + + $this->app->setOutput("NetworkLayer3", $result); + }catch(BadResponseError $e){ + $this->app->getErrorInstance()->BadResponseHandler($e); + }catch(UserInputError $e){ + $this->app->getErrorInstance()->UserInputHandler($e); + }catch(BaseError $e){ + $this->app->getErrorInstance()->BaseErrorHandler($e); + }catch(NotImplementedError $e){ + $this->app->getErrorInstance()->NotImplementedHandler($e); + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } + } + + /** + * Create a new floating IP adress + * + * @param array $opt Options for the floating ip creation (floatingipo and floating network id are required, others are optionals) + * + * @return floatingip + */ + private function createFloatingIp(){ + $opt = $this->app->getPostParam("opt"); + + if(!isset($opt)){ + $this->app->setOutput("Error", "Incorrect parameter opt"); + } + try{ + $floatingip = $this->libClass->createFloatingIp($opt); + + if(!isset($floatingip)){ + $this->app->setOutput("Error", "Unknowing error during floating ip creation"); + }else{ + $this->app->setOutput("NetworkLayer3", $floatingip); + } + }catch(BadResponseError $e){ + echo $e."
"; + $this->app->getErrorInstance()->BadResponseHandler($e); + }catch(UserInputError $e){ + echo $e."
"; + $this->app->getErrorInstance()->UserInputHandler($e); + }catch(BaseError $e){ + echo $e."
"; + $this->app->getErrorInstance()->BaseErrorHandler($e); + }catch(NotImplementedError $e){ + echo $e."
"; + $this->app->getErrorInstance()->NotImplementedHandler($e); + }catch(Exception $e){ + echo $e->getMessage()."
"; + $this->app->getErrorInstance()->OtherException($e); + } + } + + + /** + * Show floatingip details + * + * @param String id the id of the floatingip + * + * @return floatingip details + */ + private function getFloatingIp(){ + $id = $this->app->getPostParam("id"); + if(!isset($id)){ + $this->app->setOutput("Error", "Incorrect parameter opt"); + } + + try{ + // List of floating IPs + $res = array(); + $l = $this->libClass->listFloatingIps(); + foreach ($l as $tmp) { + $res[] = $tmp; + } + + // Verification if id exists + $result = null; + foreach ($res as $f) { + if(strcmp($res['id'], $id)){ + $result = $f; + + } + } + + if(!isset($result)){ // If id doesn't exists + $this->app->setOutput("Error", "Unknow id"); + }else{ // If id exists + $res = $this->libClass->getFloatingIp($id); + $this->app->setOutput("NetworkLayer3", $res); + } + + }catch(BadResponseError $e){ + $this->app->getErrorInstance()->BadResponseHandler($e); + }catch(UserInputError $e){ + $this->app->getErrorInstance()->UserInputHandler($e); + }catch(BaseError $e){ + $this->app->getErrorInstance()->BaseErrorHandler($e); + }catch(NotImplementedError $e){ + $this->app->getErrorInstance()->NotImplementedHandler($e); + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } + } + + /** + * Update floating ip + * + * @param id the id of the floatingip to update + * + * @return Image + */ + private function updateFloatingIp(){ + $id = $this->app->getPostParam("id"); + + if(!isset($id)){ + $this->app->setOutput("Error", "Incorrect parameter opt"); + } + try{ + + // List of floating IPs + $res = array(); + $l = $this->libClass->listFloatingIps(); + foreach ($l as $tmp) { + $res[] = $tmp; + } + + // Verification if id exists + $result = null; + foreach ($res as $f) { + if(strcmp($res['id'], $id)){ + $result = $f; + + } + } + + if(!isset($result)){ // If id doesn't exists + $this->app->setOutput("Error", "Unknowing floatingip id"); + }else{ + $result->update(); + } + + + }catch(BadResponseError $e){ + $this->app->getErrorInstance()->BadResponseHandler($e); + }catch(UserInputError $e){ + $this->app->getErrorInstance()->UserInputHandler($e); + }catch(BaseError $e){ + $this->app->getErrorInstance()->BaseErrorHandler($e); + }catch(NotImplementedError $e){ + $this->app->getErrorInstance()->NotImplementedHandler($e); + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } + } + + /** + * Delete a floating ip + * + * @param string floatingip_id the floating-ip id to delete + * + * @return void + */ + private function deleteFloatingIp(){ + $id = $this->app->getPostParam("id"); + + if(!isset($id)){ + $this->app->setOutput("Error", "Incorrect parameter opt"); + } + try{ + // List of floating IPs + $res = array(); + $l = $this->libClass->listFloatingIps(); + foreach ($l as $tmp) { + $res[] = $tmp; + } + + // Verification if id exists + $result = null; + foreach ($res as $f) { + if(strcmp($res['id'], $id)){ + $result = $f; + + } + } + + if(!isset($result)){ // If id doesn't exists + $this->app->setOutput("Error", "Unknowing floatingip id"); + }else{ + $result->delete(); + } + }catch(BadResponseError $e){ + $this->app->getErrorInstance()->BadResponseHandler($e); + }catch(UserInputError $e){ + $this->app->getErrorInstance()->UserInputHandler($e); + }catch(BaseError $e){ + $this->app->getErrorInstance()->BaseErrorHandler($e); + }catch(NotImplementedError $e){ + $this->app->getErrorInstance()->NotImplementedHandler($e); + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } + } + + + /** + * Retrieve a floating ip + * + * @param string floatingip_id the floating-ip id to retrieve + * + * @return void + */ + private function retrieveFloatingIp(){ + $id = $this->app->getPostParam("id"); + + if(!isset($id)){ + $this->app->setOutput("Error", "Incorrect parameter opt"); + } + try{ + // List of floating IPs + $res = array(); + $l = $this->libClass->listFloatingIps(); + foreach ($l as $tmp) { + $res[] = $tmp; + } + + // Verification if id exists + $result = null; + foreach ($res as $f) { + if(strcmp($res['id'], $id)){ + $result = $f; + + } + } + + if(!isset($result)){ // If id doesn't exists + $this->app->setOutput("Error", "Unknowing floatingip id"); + }else{ + $result->retrieve(); + } + }catch(BadResponseError $e){ + $this->app->getErrorInstance()->BadResponseHandler($e); + }catch(UserInputError $e){ + $this->app->getErrorInstance()->UserInputHandler($e); + }catch(BaseError $e){ + $this->app->getErrorInstance()->BaseErrorHandler($e); + }catch(NotImplementedError $e){ + $this->app->getErrorInstance()->NotImplementedHandler($e); + }catch(Exception $e){ + $this->app->getErrorInstance()->OtherException($e); + } + } +} diff --git a/server/index.php b/server/index.php index ac66c95..53a24c4 100755 --- a/server/index.php +++ b/server/index.php @@ -53,9 +53,9 @@ $App->show(); break; - case "floatingip": - include_once("core/FloatingIp.php"); - $computeObject = new floatingIp($App); + case "networkLayer3": + include_once("core/NetworkLayer3.php"); + $computeObject = new networkLayer3($App); $computeObject->action($action); $App->show(); break; -- cgit v1.2.3