Merge branch 'develop' into Eole_Graph

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

1 files changed, 20 insertions, 0 deletions

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