Merge branch 'develop' into Eole_Graph

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

1 files changed, 26 insertions, 0 deletions

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>";
+}
+
+
+
+
+
+
+
+
+