Merge branch 'develop' into Eole_Graph

Conflicts:
	client/index.html
	client/js/controllers/home/home.js
	client/partials/home/home.html

12 files changed, 360 insertions, 50 deletions

diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php
index b398088..972d9b4 100755
--- a/server/Test/AppTestClass.php
+++ b/server/Test/AppTestClass.php
@@ -1,24 +1,12 @@
 <?php

 include_once("../core/Plugin_Api.php");

 include_once("../core/LibOverride/genTokenOptions.php");

-<<<<<<< HEAD
-<<<<<<< Updated upstream
-=======
 include_once("../core/ErrorManagement.php");

 

 use OpenCloud\Common\Error\BadResponseError;

 use OpenCloud\Common\Error\BaseError;

 use OpenCloud\Common\Error\NotImplementedError;

 use OpenCloud\Common\Error\UserInputError;

->>>>>>> Stashed changes
-=======
-include_once("../core/ErrorManagement.php");

-

-use OpenStack\Common\Error\BadResponseError;

-use OpenStack\Common\Error\BaseError;

-use OpenStack\Common\Error\NotImplementedError;

-use OpenStack\Common\Error\UserInputError;

->>>>>>> develop
 

 class AppTest{

 	

@@ -34,7 +22,7 @@ class AppTest{
 

 		$this->tokenPost = NULL;

 		$this->tokenClass = new genTokenOptions($args);

-		$this->openstack = new OpenStack\OpenStack([]);

+		$this->openstack = new OpenStack\OpenStack(['authUrl' => $args["authUrl"]]);

 		$this->pluginsApi = plugin_api::getInstance();

 		$this->errorClass = new errorManagement($this);

 		$this->output = array();

@@ -75,6 +63,11 @@ class AppTest{
 				$opt = $this->tokenClass->getOptions($service);

 				return $this->openstack->networkingV2($opt);

 				break;

+			case "NetworkLayer3":

+				if($this->tokenPost == NULL) $this->tokenClass->genNetworkToken();

+				$opt = $this->tokenClass->getOptions('Network');

+				return $this->openstack->networkingV2ExtLayer3($opt);

+				break;

 		}

 		

 	}

@@ -101,9 +94,17 @@ class AppTest{
 	}

 	

 	public function getPostParam($name){

+		if(isset($this->postParams[$name])){

+			return $this->postParams[$name];

+		}else{

+			$this->setOutput("Error", "Missing parameter ".$name);

+		}

+	}

+

+	public function setPostParam($name, $value){

 		

-		return $this->postParams[$name];

-		

+		$this->postParams[$name] = $value;

+

 	}

 	

 	public function setOutput($key, $out){

diff --git a/server/Test/DisplayListCidr.php b/server/Test/DisplayListCidr.php
new file mode 100755
index 0000000..119b218
--- /dev/null
+++ b/server/Test/DisplayListCidr.php
@@ -0,0 +1,26 @@
+<?php
+
+ini_set('display_errors', 1);
+date_default_timezone_set("Europe/Paris");
+require 'vendor/autoload.php';
+
+	$options = Array();
+	$options["user"]  = Array("name"=>"admin", "password"=>"ae5or6cn", "domain"=>["id"=>"Default"]);
+	$options["scope"] = Array("project"=>Array("name"=>"admin", "domain"=>["id"=>"Default"]));
+	$options["authUrl"] = "http://148.60.11.31:5000/v3"; 
+	$openstack = new OpenStack\OpenStack($options);
+	$networking = $openstack->networkingV2(["region"=>"RegionOne"]);
+	$ls = $networking->listSubnets();
+
+	foreach ($ls as $subnet) {
+     echo $subnet->cidr."<br>";
+}
+
+
+
+
+
+
+
+
+
diff --git a/server/Test/DisplayNetIds.php b/server/Test/DisplayNetIds.php
index ade15e4..ade15e4 100644..100755
--- a/server/Test/DisplayNetIds.php
+++ b/server/Test/DisplayNetIds.php
diff --git a/server/Test/NetworkLayer3Tests.php b/server/Test/NetworkLayer3Tests.php
new file mode 100644
index 0000000..cb14e3a
--- /dev/null
+++ b/server/Test/NetworkLayer3Tests.php
@@ -0,0 +1,146 @@
+<?php
+
+include('InitTest.php');
+include_once("../core/Compute.php");
+include_once("../core/Network.php");
+include_once("../core/NetworkLayer3.php");
+
+$compute = new Compute($App);
+$network = new Network($App);
+$networkLayer3 = new NetworkLayer3($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>";
+$networkLayer3->action("listFloatingIp");
+$listFloatingIp =  json_decode($App->show(), true)["NetworkLayer3"];
+$id = null;
+foreach ($listFloatingIp as $floatIp){
+	echo $floatIp['floatingIpAddress']." ".$floatIp['id']." ".$floatIp["status"]."<br>";
+	$id = $floatIp['id'];
+}
+echo "</br>";
+
+
+// get floatingip
+echo "Get floatingip : </br>";
+$App->setPostParam('id', $id);
+$networkLayer3->action("getFloatingIp");
+$getFloatingIp =  json_decode($App->show(), true)["NetworkLayer3"];
+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);
+$networkLayer3->action("createFloatingIp");
+$float =  json_decode($App->show(), true)["NetworkLayer3"];
+if(!isset($float)){
+	echo "Erreur pendant la création</br>";
+}
+echo "</br>";
+*/
+
+
+/*
+// Suppression d'une ip flotante
+$App->setPostParam('id', $id);
+$networkLayer3->action("deleteFloatingIp");
+*/
+
+
+// Liste des floatingip
+echo "Liste des floatingip : </br>";
+$networkLayer3->action("listFloatingIp");
+$listFloatingIp =  json_decode($App->show(), true)["NetworkLayer3"];
+foreach ($listFloatingIp as $floatIp){
+	echo $floatIp['floatingIpAddress']." ".$floatIp['id']." ".$floatIp["status"]."<br>";
+}
+echo "</br>";
+
+
+// Liste des routeurs
+echo "Liste des routeurs : </br>";
+$networkLayer3->action("listRouters");
+$listRouters =  json_decode($App->show(), true)["NetworkLayer3"];
+foreach ($listRouters as $router){
+	echo $router['name']." ".$router['id']."<br>";
+	if(strcmp($router['name'], "Test")){
+		$id = $router['id'];
+	}
+}
+echo "</br>";
+
+
+// get floatingip
+echo "Get router : </br>";
+$App->setPostParam('id', $id);
+$networkLayer3->action("getRouter");
+$getRouter =  json_decode($App->show(), true)["NetworkLayer3"];
+echo $getRouter['id']."<br>";
+echo "</br>";
+
+
+/*
+// Création d'un routeur'		
+$opt = array();
+$optGate = array();
+$optGate['networkId'] = "251b4641-20ff-4a72-8549-1758788b51ce";
+$opt['externalGatewayInfo'] = $optGate;
+$opt['name'] = "Test";
+$App->setPostParam('opt', $opt);
+$networkLayer3->action("createRouter");
+$r =  json_decode($App->show(), true)["NetworkLayer3"];
+if(!isset($r)){
+	echo "Erreur pendant la création</br>";
+}
+echo "</br>";
+*/
+
+
+/*
+// Suppression d'un routeur
+$App->setPostParam('id', $id);
+$networkLayer3->action("deleteRouter");
+echo "</br>";
+*/
+
+
+// Liste des routeurs
+echo "Liste des routeurs : </br>";
+$networkLayer3->action("listRouters");
+$listRouters =  json_decode($App->show(), true)["NetworkLayer3"];
+foreach ($listRouters as $router){
+	echo $router['name']." ".$router['id']."<br>";
+}
+
+?>
\ No newline at end of file
diff --git a/server/Test/automatingTests.php b/server/Test/automatingTests.php
new file mode 100755
index 0000000..8088102
--- /dev/null
+++ b/server/Test/automatingTests.php
@@ -0,0 +1,20 @@
+<?php
+include('InitTest.php');
+include_once("../core/Automating.php");
+
+$automating = new Automating($App);
+
+//$id = // id du réseau 
+
+/*
+// Création serveur avec ip publique
+echo "Test création serveur avec ip publique : </br>";
+$App->setPostParam('networkId', $id);
+$App->setPostParam('imageName', "ImageTest");
+$App->setPostParam('serverName', "ServerTest");
+$App->setPostParam('flavor', 1);
+$compute->action("createPublicServer");
+$servers = json_decode($App->show(), true)["Automating"];
+*/
+
+?>
\ No newline at end of file
diff --git a/server/Test/computeTest.php b/server/Test/computeTest.php
index 3ce1f2e..3ce1f2e 100644..100755
--- a/server/Test/computeTest.php
+++ b/server/Test/computeTest.php
diff --git a/server/Test/create_network.php b/server/Test/create_network.php
index c267322..c267322 100644..100755
--- a/server/Test/create_network.php
+++ b/server/Test/create_network.php
diff --git a/server/Test/create_subnet.php b/server/Test/create_subnet.php
index 644a77d..644a77d 100644..100755
--- a/server/Test/create_subnet.php
+++ b/server/Test/create_subnet.php
diff --git a/server/Test/genTokenOptionsTest.php b/server/Test/genTokenOptionsTest.php
index f7d0ee4..f7d0ee4 100644..100755
--- a/server/Test/genTokenOptionsTest.php
+++ b/server/Test/genTokenOptionsTest.php
diff --git a/server/Test/getIdNetwork.php b/server/Test/getIdNetwork.php
new file mode 100755
index 0000000..1e38627
--- /dev/null
+++ b/server/Test/getIdNetwork.php
@@ -0,0 +1,34 @@
+<?php
+
+ini_set('display_errors', 1);
+date_default_timezone_set("Europe/Paris");
+require 'vendor/autoload.php';
+
+	$options = Array();
+	$options["user"]  = Array("name"=>"admin", "password"=>"ae5or6cn", "domain"=>["id"=>"Default"]);
+	$options["scope"] = Array("project"=>Array("name"=>"admin", "domain"=>["id"=>"Default"]));
+	$options["authUrl"] = "http://148.60.11.31:5000/v3"; 
+	$openstack = new OpenStack\OpenStack($options);
+	$networking = $openstack->networkingV2(["region"=>"RegionOne"]);
+
+	$ls = $networking->getNetwork('5f78d3c1-1f53-4be7-897b-cf3c797961e0');
+try{
+$ls->retrieve();
+
+
+	
+echo "oui";}
+
+ catch (OpenStack\Common\Error\BadResponseError $e){
+echo "non"; }
+     
+
+
+
+
+
+
+
+
+
+
diff --git a/server/Test/getNetwork.php b/server/Test/getNetwork.php
new file mode 100755
index 0000000..4c76480
--- /dev/null
+++ b/server/Test/getNetwork.php
@@ -0,0 +1,26 @@
+<?php
+
+ini_set('display_errors', 1);
+date_default_timezone_set("Europe/Paris");
+require 'vendor/autoload.php';
+
+	$options = Array();
+	$options["user"]  = Array("name"=>"admin", "password"=>"ae5or6cn", "domain"=>["id"=>"Default"]);
+	$options["scope"] = Array("project"=>Array("name"=>"admin", "domain"=>["id"=>"Default"]));
+	$options["authUrl"] = "http://148.60.11.31:5000/v3"; 
+	$openstack = new OpenStack\OpenStack($options);
+	$networking = $openstack->networkingV2(["region"=>"RegionOne"]);
+	$ls = $networking->listNetworks();
+
+	foreach ($ls as $subnet) {
+     echo $subnet->id."<br>";
+}
+
+
+
+
+
+
+
+
+
diff --git a/server/Test/imageTests.php b/server/Test/imageTests.php
index 3af12fc..a99fbd7 100644..100755
--- a/server/Test/imageTests.php
+++ b/server/Test/imageTests.php
@@ -1,68 +1,125 @@
 <?php
 include('InitTest.php');
 include_once("../core/Image.php");
+include_once("../core/Compute.php");
 
 $image = new Image($App);
+$compute = new Compute($App);
 
+// Création image
+/*
+echo "Création image :</br>";
 $opt = Array();
 $opt['name'] = "Test";
 $opt['tags'] = ['test', 'openstack'];
 //$opt['containerFormat'] = 'ami';
 //$opt['diskFormat'] = 'iso';
-$opt['visibility'] = 'public';
+//$opt['visibility'] = 'public';
 $opt['minDisk'] = 1;
 $opt['protected'] = false;
 $opt['minRam'] = 10;
 
-//$new_image = $image->createImage($opt);
+$App->setPostParam('opt', $opt);
+$image->action("createImage");
+$retCreate = json_decode($App->show(), true)["Images"];
+$idNew = $retCreate['id'];
+*/
+
+
 
-//Liste des images
+
+// Liste images
 $image->action("listImage");
-//$images = $image->listImage();
 $im = $App->show();
-$images = json_decode($im, true)["Images"]; 
-if(isset($images)){
-    echo "Images présentes :";
-    echo "</br>";
-    foreach($images as $i){
-    	echo $i['name'];
-        echo "</br>";
+$images = json_decode($im, true)["Images"];
+
+$res;
+echo "List images :</br></br>";
+foreach($images as $i){
+    $name = $i['name'];
+    if(strcmp($name,"Test") == 0)
+    {
+        $res = $i['id'];
     }
+    echo $name."</br>"; // Nom
+    echo $i['status']."</br>"; // Status
+    $id = $i['id']; // Id
+    echo $id."</br>";
+    /*foreach ($i['tags'] as $tag) { // Tags
+        echo $tag."</br>";
+    }*/
     echo "</br>";
+ }  
 
-    if(isset($list)){
-    foreach ($list as $l) {
-        echo $l;
-        echo "</br>";
-    }
-}
-}
-else{
-    echo "Aucune image présente\n";
-}
+// Delete Image
+ /*
+$App->setPostParam('id', $res);
+$image->action("deleteImage");
+*/
 
+/*
+// Details images
+echo "Détail image :</br>";
+$App->setPostParam('id', $id);
+$image->action("detailsImage");
+$retDetails = json_decode($App->show(), true)["Images"];
+echo $retDetails['id']."</br>";
+echo "</br>";
+*/
 
+/*
+// Download image
+$App->setPostParam('id', $id);
+$image->action("downloadImage");
+*/
 
-// Détails Image
-//$details = $image->imageDetails($id_image);
 
-//$image->deleteImage('123456');
+// Desactivate Images
+/*
+echo "Desactivate image : </br>";
+echo $id."</br>";
+$App->setPostParam('id', $id);
+$err = $image->action("desactivateImage");
+echo "</br>";
+*/
 
-//$image->desactivateImage($id_image);
-//$image->reactivateImage($id_image);
 
-//$file_name = "/home/yogg/Downloads/TinyCore-6.4.1.iso";
-//$image->uploadImage($id_image, $file_name);
+// Reactivate Images
+/*
+echo $id."</br>";
+$App->setPostParam('id', $res);
+$image->action("reactivateImage");
+*/
 
-//$image->downloadImage($id_image);
 
 /*
-$opt_update = Array();
-$opt_update['name'] = "Test";
-$opt_update['tags'] = null;
-
-$update = $image->updateImage($id_image, $opt_update);
-echo $update->name;
+// Details images
+echo "Update image :</br>";
+$optUpdate = Array();
+$optUpdate['tags'] = ['ciros', 'testUpdate'];
+$App->setPostParam('id', $id);
+$App->setPostParam('opt', $optUpdate);
+$image->action("updateImage");
+$retDetails = json_decode($App->show(), true)["Images"];
+foreach ($retDetails['tags'] as $tag) { // Tags
+        echo $tag."</br>";
+}
 */
 
+
+/*
+echo "Flavors: ";
+echo "</br>";
+$compute->action("listFlavors");
+$flavors = json_decode($App->show(), true)["Flavors"];
+
+foreach($flavors as $f){
+    echo "Id=".$f['id'].", ";
+    echo "name=".$f['name'].", ";
+    echo "ram=".$f['ram'].", ";
+    echo "disk=".$f['disk'].", ";
+    echo "vcpus=".$f['vcpus'];
+    echo "</br>";
+ }
+*/
 ?>
\ No newline at end of file