end of floatingip

3 files changed, 165 insertions, 56 deletions

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 "</br>";
 
-// liste des floatingip
-echo "Liste des floatingip : </br>";
-$floatingIp->action("listFloatingIp");
-$listFloatingIp =  json_decode($App->show(), true)["FloatingIp"];
-$ip = null;
-foreach ($listFloatingIp as $floatIp){
-	echo $floatIp['floatingIpAddress']." ".$floatIp['id']." ".$floatIp["status"]."<br>";
-	$ip = $floatIp;
-}
-
-echo "</br>";
-
+/*
 // 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</br>";
 }
-else{
-	foreach ($float as $f) {
-		echo $f." ";
-	}
-	echo "<br>";
-}
+echo "</br>";
+*/
 
 
-echo "</br>";
 
 // liste des floatingip
 echo "Liste des floatingip : </br>";
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 @@
+<?php
+
+include('InitTest.php');
+include_once("../core/Compute.php");
+include_once("../core/Network.php");
+include_once("../core/FloatingIp.php");
+
+$compute = new Compute($App);
+$network = new Network($App);
+$floatingIp = new FloatingIp($App);
+
+
+// Liste des serveurs
+echo "Liste des serveurs : </br>";
+$compute->action("listServers");
+$servers = json_decode($App->show(), true)["Servers"];
+$id = null;
+foreach($servers as $server){
+	echo $server['name']." ".$server['id']." ".$server['ipv4']."<br>";
+	if(strcmp($server['name'], "bob")){
+		$id = $server['id'];
+	}	
+}
+echo "</br>";
+
+
+// Liste des networks
+echo "Liste des network : </br>";
+$network->action("list_network_ids");
+$servers = json_decode($App->show(), true)["ListNetworkIds"];
+$id = null;
+foreach($servers as $server){
+	echo $server."<br>";
+}
+echo "</br>";
+
+
+// Liste des floatingip
+echo "Liste des floatingip : </br>";
+$floatingIp->action("listFloatingIp");
+$listFloatingIp =  json_decode($App->show(), true)["FloatingIp"];
+$id = null;
+foreach ($listFloatingIp as $floatIp){
+	echo $floatIp['floatingIpAddress']." ".$floatIp['id']." ".$floatIp["status"]."<br>";
+	$id = $floatIp['id'];
+}
+echo "</br>";
+
+
+// Liste des floatingip
+echo "Get floatingip : </br>";
+$App->setPostParam('id', $id);
+$floatingIp->action("getFloatingIp");
+$getFloatingIp =  json_decode($App->show(), true)["FloatingIp"];
+echo $getFloatingIp['id']."<br>";
+echo "</br>";
+
+
+/*
+// 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</br>";
+}
+echo "</br>";
+*/
+
+/*
+// Suppression d'une ip flotante
+$App->setPostParam('id', $id);
+$floatingIp->action("deleteFloatingIp");
+*/
+
+// Liste des floatingip
+echo "Liste des floatingip : </br>";
+$floatingIp->action("listFloatingIp");
+$listFloatingIp =  json_decode($App->show(), true)["FloatingIp"];
+foreach ($listFloatingIp as $floatIp){
+	echo $floatIp['floatingIpAddress']." ".$floatIp['id']." ".$floatIp["status"]."<br>";
+}
+
+
+?>
\ 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){