modification in structure for ip and routers

3 files changed, 17 insertions, 47 deletions

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/floatingIpTests.php b/server/Test/NetworkLayer3Tests.php
index 191de46..b827a51 100644
--- a/server/Test/floatingIpTests.php
+++ b/server/Test/NetworkLayer3Tests.php
@@ -3,11 +3,11 @@
 include('InitTest.php');
 include_once("../core/Compute.php");
 include_once("../core/Network.php");
-include_once("../core/FloatingIp.php");
+include_once("../core/NetworkLayer3.php");
 
 $compute = new Compute($App);
 $network = new Network($App);
-$floatingIp = new FloatingIp($App);
+$networkLayer3 = new NetworkLayer3($App);
 
 
 // Liste des serveurs
@@ -37,8 +37,8 @@ echo "</br>";
 
 // Liste des floatingip
 echo "Liste des floatingip : </br>";
-$floatingIp->action("listFloatingIp");
-$listFloatingIp =  json_decode($App->show(), true)["FloatingIp"];
+$networkLayer3->action("listFloatingIp");
+$listFloatingIp =  json_decode($App->show(), true)["NetworkLayer3"];
 $id = null;
 foreach ($listFloatingIp as $floatIp){
 	echo $floatIp['floatingIpAddress']." ".$floatIp['id']." ".$floatIp["status"]."<br>";
@@ -50,8 +50,8 @@ echo "</br>";
 // Liste des floatingip
 echo "Get floatingip : </br>";
 $App->setPostParam('id', $id);
-$floatingIp->action("getFloatingIp");
-$getFloatingIp =  json_decode($App->show(), true)["FloatingIp"];
+$networkLayer3->action("getFloatingIp");
+$getFloatingIp =  json_decode($App->show(), true)["NetworkLayer3"];
 echo $getFloatingIp['id']."<br>";
 echo "</br>";
 
@@ -62,8 +62,8 @@ $opt = array();
 $opt['floatingNetworkId'] = "251b4641-20ff-4a72-8549-1758788b51ce";
 
 $App->setPostParam('opt', $opt);
-$floatingIp->action("createFloatingIp");
-$float =  json_decode($App->show(), true)["FloatingIp"];
+$networkLayer3->action("createFloatingIp");
+$float =  json_decode($App->show(), true)["NetworkLayer3"];
 if(!isset($float)){
 	echo "Erreur pendant la création</br>";
 }
@@ -73,13 +73,13 @@ echo "</br>";
 /*
 // Suppression d'une ip flotante
 $App->setPostParam('id', $id);
-$floatingIp->action("deleteFloatingIp");
+$networkLayer3->action("deleteFloatingIp");
 */
 
 // Liste des floatingip
 echo "Liste des floatingip : </br>";
-$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"]."<br>";
 }
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 "</br>";
 
-/*
-// Liste des ports
-echo "Liste des ports : </br>";
-$network->action("listPorts");
-$ports = json_decode($App->show(), true)["Network"];
-foreach ($ports as $p) {
-	echo $p["fixedIps"]."</br>";
-}
-*/
+
 //Liste des networks
 echo "Liste des network : </br>";
 $network->action("list_network_ids");
@@ -44,32 +35,11 @@ foreach($servers as $server){
 }
 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
-//$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</br>";
-}
-echo "</br>";
-*/
-
-
 
 // liste des floatingip
 echo "Liste des floatingip : </br>";
-$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"]."<br>";
 }