From 154d49d1089d34ada6744556cca8028d1ec11430 Mon Sep 17 00:00:00 2001
From: root <root@kabir-PC>
Date: Tue, 23 Feb 2016 21:36:07 +0100
Subject: la premiere version de la classe netork

---
 server/core/Network.php | 104 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 103 insertions(+), 1 deletion(-)

(limited to 'server/core/Network.php')

diff --git a/server/core/Network.php b/server/core/Network.php
index 8d1c8b6..38e20be 100644
--- a/server/core/Network.php
+++ b/server/core/Network.php
@@ -1 +1,103 @@
- 
+<?php
+
+class network{ 
+	
+	protected $app;
+	
+	protected $libClass;
+	
+	protected $networking;
+
+	protected $actions = array();
+
+	
+	/**
+	* Image constructor
+	*
+	* @param App $app the main app object
+	*
+	* @throws [Type] [<description>]
+	*
+	* @return Image
+	*/
+	public function __construct($app, $openstack){
+		$this->app = $app;
+		$this->libClass = $app->getLibClass("networkingV2");
+		$this->networking = $openstack->networkingV2(["region"=>"RegionOne"]);
+	}
+
+
+	
+
+	
+	public function create_network(array $options)
+	{
+		
+		$network = $networking->createNetworks($options);
+		
+
+		return $network;
+	}
+
+	public function create_subnet(array $options)
+	{
+		
+		$subnet = $networking->createSubnet($options);
+		
+
+		return $subnet;
+	}
+	
+	public function list_network_ids()
+	{
+		
+		$ln = $networking->listNetworks();
+		
+		$list_ids = array();
+
+		
+		foreach($ln as $n)
+		{
+			
+			$list_ids[] =  $n->id;
+		
+
+		}
+
+	return $list_ids;
+	}
+
+	public function list_network_names()
+	{
+		
+		$ln = $networking->listNetworks();
+		
+		$list_names = array();
+
+		
+		foreach($ln as $n)
+		{
+			
+			$list_names[] =  $n->name;
+		
+
+		}
+
+	return $list_names;
+	}
+
+	public function list_cidr()
+	{
+		
+		$ls = $networking->listSubnets();
+		$list_cidr = array();
+		foreach ($ls as $subnet)
+		 {
+     		
+			$list_cidr[] = $subnet->cidr;
+		 }
+
+	return $list_names;
+	}
+	
+	
-- 
cgit v1.2.3


From 38ba61c6eebadb79a23044b06671fd7c73975516 Mon Sep 17 00:00:00 2001
From: root <root@kabir-PC>
Date: Wed, 24 Feb 2016 19:42:01 +0100
Subject: modification dans network

---
 server/core/Network.php | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

(limited to 'server/core/Network.php')

diff --git a/server/core/Network.php b/server/core/Network.php
index 38e20be..2e09508 100644
--- a/server/core/Network.php
+++ b/server/core/Network.php
@@ -6,34 +6,29 @@ class network{
 	
 	protected $libClass;
 	
-	protected $networking;
+	
 
-	protected $actions = array();
+	
 
 	
-	/**
-	* Image constructor
-	*
-	* @param App $app the main app object
-	*
-	* @throws [Type] [<description>]
-	*
-	* @return Image
-	*/
-	public function __construct($app, $openstack){
+	public function __construct($app){
 		$this->app = $app;
-		$this->libClass = $app->getLibClass("networkingV2");
-		$this->networking = $openstack->networkingV2(["region"=>"RegionOne"]);
+		$this->libClass = $app->getLibClass("network");
+		
 	}
 
 
-	
+	public function action($action){
+		
+		 $this->{$action.""}();
+		
+	}
 
 	
 	public function create_network(array $options)
 	{
 		
-		$network = $networking->createNetworks($options);
+		$network = $this->libClass->createNetworks($options);
 		
 
 		return $network;
@@ -42,7 +37,7 @@ class network{
 	public function create_subnet(array $options)
 	{
 		
-		$subnet = $networking->createSubnet($options);
+		$subnet = $this->libClass->createSubnet($options);
 		
 
 		return $subnet;
@@ -51,7 +46,7 @@ class network{
 	public function list_network_ids()
 	{
 		
-		$ln = $networking->listNetworks();
+		$ln = $this->libClass->listNetworks();
 		
 		$list_ids = array();
 
@@ -70,7 +65,7 @@ class network{
 	public function list_network_names()
 	{
 		
-		$ln = $networking->listNetworks();
+		$ln = $this->libClass->listNetworks();
 		
 		$list_names = array();
 
@@ -89,7 +84,7 @@ class network{
 	public function list_cidr()
 	{
 		
-		$ls = $networking->listSubnets();
+		$ls = $this->libClass->listSubnets();
 		$list_cidr = array();
 		foreach ($ls as $subnet)
 		 {
-- 
cgit v1.2.3


From 70fcf3553abb4a25672ee198dafb89e430e2bd79 Mon Sep 17 00:00:00 2001
From: root <root@kabir-PC>
Date: Wed, 2 Mar 2016 01:34:10 +0100
Subject: ajout des fonctions

---
 server/Test/getIdNetwork.php | 34 +++++++++++++++
 server/Test/getNetwork.php   | 26 ++++++++++++
 server/core/Network.php      | 98 +++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 157 insertions(+), 1 deletion(-)
 create mode 100644 server/Test/getIdNetwork.php
 create mode 100644 server/Test/getNetwork.php

(limited to 'server/core/Network.php')

diff --git a/server/Test/getIdNetwork.php b/server/Test/getIdNetwork.php
new file mode 100644
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 100644
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/core/Network.php b/server/core/Network.php
index 2e09508..6363fdb 100644
--- a/server/core/Network.php
+++ b/server/core/Network.php
@@ -94,5 +94,101 @@ class network{
 
 	return $list_names;
 	}
+	//option array()
+	public function getNetwork($idNet)
+	{
+		$network="";
+		
+		try
+		{	$newtork = $networking->getNetwork($idNet);
+			$network->retrieve();
+
+			
+		}
+
+		catch (OpenStack\Common\Error\BadResponseError $e)
+		{
+			$network = "Id non existant ";
+	        }
+		catch (Exception $e)
+		{
+			$network = 'Exception reçue : ',  $e->getMessage(), "\n";
+		}
+
+	return $network;
+	}
+
+	public function getSubnet($idSub)
+	{
+		$sbnet="";
+		
+		try
+		{	$subnet = $networking->getSubnet($idSub);
+			$subnet->retrieve();
+
+			
+		}
+
+		catch (OpenStack\Common\Error\BadResponseError $e)
+		{
+			$sbnet = "Id non existant ";
+	        }
+		catch (Exception $e)
+		{
+			$sbnet = 'Exception reçue : ',  $e->getMessage(), "\n";
+		}
+
+	return $sbnet;
+	}	
+
+        public function updateNetwork($idNet,$name,$shared,$adminStateUp)
+     	{
+		$network = getNetwork($idNet);
+		if(!is_null($name))
+		{
+			$network->name = $name;	
+		}
+		if(!is_null($shared))
+		{
+			$network->shared = $shared;	
+		}
+		if(!is_null($adminStateUp))
+		{
+			$network->adminStateUp = $shared;	
+		}
+		$network->update();
+	}
 	
-	
+	public function updateSubnet($idSub,$name,$networkId,$ipVersion,$cidr)
+     	{
+		$subnet = getNetwork($idSub);
+		if(!is_null($name))
+		{
+			$subnet->name = $name;	
+		}
+		if(!is_null($networkId))
+		{
+			$subnet->networkId = $networkId;	
+		}
+		if(!is_null($ipVersion))
+		{
+			$subnet->ipVersion = $ipVersion;	
+		}
+		if(!is_null($cidr))
+		{
+			$subnet->cidr = $cidr;	
+		}
+		$subnet->update();
+	}
+
+	public function deleteNetwork($idNet)
+     	{
+		$network = getNetwork($idNet);
+		$network->delete();
+	}
+
+	public function deleteSubnet($idSub)
+     	{
+		$subnet = getNetwork($idSub);
+		$subnet->delete();
+	}
-- 
cgit v1.2.3


From a51bcad21a526b5077f52bb8e12417e4b921f06b Mon Sep 17 00:00:00 2001
From: root <root@kabir-PC>
Date: Tue, 8 Mar 2016 00:26:20 +0100
Subject: terminaison des fonctions

---
 server/core/Network.php | 276 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 265 insertions(+), 11 deletions(-)

(limited to 'server/core/Network.php')

diff --git a/server/core/Network.php b/server/core/Network.php
index 6363fdb..75ba2fd 100644
--- a/server/core/Network.php
+++ b/server/core/Network.php
@@ -25,18 +25,77 @@ class network{
 	}
 
 	
-	public function create_network(array $options)
+	public function create_network($name,$adminStateUp,$shared,$tenantId)
 	{
-		
+		$options = array();
+		if (!is_null($name))
+		{
+			$options['name'] = $name; 
+		}
+		if (!is_null($adminStateUp))
+		{
+			$options['adminStateUp'] = $adminStateUp; 
+		}
+		if (!is_null($shared))
+		{
+			$options['shared'] = $shared; 
+		}
+		if (!is_null($tenantId))
+		{
+			$options['tenantId'] = $tenantId; 
+		}
 		$network = $this->libClass->createNetworks($options);
 		
 
 		return $network;
 	}
 
-	public function create_subnet(array $options)
-	{
-		
+	public function create_subnet($networkId,$ipVersion,$cidr,$name,$gatewayIp,$dnsNameservers,$allocationPools,$hostRoutes,$enableDhcp,$tenantId)
+	{	$options = array();
+		if (!is_null($networkId))
+		{
+			$options['networkId'] = $networkId; 
+		}
+		if (!is_null($ipVersion))
+		{
+			$options['ipVersion'] = $ipVersion; 
+		}
+		if (!is_null($cidr))
+		{
+			$options['cidr'] = $cidr; 
+		}
+		if (!is_null($tenantId))
+		{
+			$options['tenantId'] = $tenantId; 
+		}
+		if (!is_null($name))
+		{
+			$options['name'] = $name; 
+		}
+		if (!is_null($gatewayIp))
+		{
+			$options['gatewayIp'] = $gatewayIp; 
+		}
+		if (!is_null($dnsNameservers))
+		{
+			$options['dnsNameservers'] = $dnsNameservers; 
+		}
+		if (!is_null($allocationPools))
+		{
+			$options['allocationPools'] = $allocationPools; 
+		}
+		if (!is_null($hostRoutes))
+		{
+			$options['hostRoutes'] = $hostRoutes; 
+		}
+		if (!is_null($enableDhcp))
+		{
+			$options['enableDhcp'] = $enableDhcp; 
+		}
+		if (!is_null($tenantId))
+		{
+			$options['tenantId'] = $tenantId; 
+		}
 		$subnet = $this->libClass->createSubnet($options);
 		
 
@@ -100,7 +159,7 @@ class network{
 		$network="";
 		
 		try
-		{	$newtork = $networking->getNetwork($idNet);
+		{	$newtork = $this->libClass->getNetwork($idNet);
 			$network->retrieve();
 
 			
@@ -123,22 +182,22 @@ class network{
 		$sbnet="";
 		
 		try
-		{	$subnet = $networking->getSubnet($idSub);
+		{	$subnet = $this->libClass->getSubnet($idSub);
 			$subnet->retrieve();
 
-			
+			return $sbnet;
 		}
 
 		catch (OpenStack\Common\Error\BadResponseError $e)
 		{
-			$sbnet = "Id non existant ";
+			echo  "Id non existant ";
 	        }
 		catch (Exception $e)
 		{
-			$sbnet = 'Exception reçue : ',  $e->getMessage(), "\n";
+			echo  'Exception reçue : ',  $e->getMessage(), "\n";
 		}
 
-	return $sbnet;
+	
 	}	
 
         public function updateNetwork($idNet,$name,$shared,$adminStateUp)
@@ -192,3 +251,198 @@ class network{
 		$subnet = getNetwork($idSub);
 		$subnet->delete();
 	}
+
+	public function createPort($networkId,$name,$adminStateUp,$macAddress,$fixedIps,$deviceId,$deviceOwner,$securityGroups,$tenantId)
+	{
+		$options = array();
+		if (!is_null($networkId))
+		{
+			$options['networkId'] = $networkId; 
+		}
+		if (!is_null($name))
+		{
+			$options['name'] = $name; 
+		}
+		if (!is_null($adminStateUp))
+		{
+			$options['adminStateUp'] = $adminStateUp; 
+		}
+		if (!is_null($macAddress))
+		{
+			$options['macAddress'] = $macAddress; 
+		}
+		if (!is_null($fixedIps))
+		{
+			$options['fixedIps'] = $fixedIps; 
+		}
+		if (!is_null($deviceId))
+		{
+			$options['deviceId'] = $deviceId; 
+		}
+		if (!is_null($deviceOwner))
+		{
+			$options['deviceOwner'] = $deviceOwner; 
+		}
+		if (!is_null($securityGroups))
+		{
+			$options['securityGroups'] = $securityGroups; 
+		}
+		if (!is_null($tenantId))
+		{
+			$options['tenantId'] = $tenantId; 
+		}
+		
+		$this->libClass->createPort($options);	
+	}
+
+	public function listPorts()
+	{
+		return $this->libClass->listPorts();
+	}
+
+	public function getPort($portId)
+	{
+		try
+		{
+			$port = $this->libClass->getport($portId);
+			return $port;
+		}
+		catch (Exception $e)
+		{
+			echo 'id fourni non disponible';
+		}
+	
+	}	
+
+	public function updatePort($networkId,$name,$adminStateUp,$macAddress,$fixedIps,$deviceId,$deviceOwner,$securityGroups,$tenantId)
+	{
+		$options = array();
+		if (!is_null($networkId))
+		{
+			$options['networkId'] = $networkId; 
+		}
+		if (!is_null($name))
+		{
+			$options['name'] = $name; 
+		}
+		if (!is_null($adminStateUp))
+		{
+			$options['adminStateUp'] = $adminStateUp; 
+		}
+		if (!is_null($macAddress))
+		{
+			$options['macAddress'] = $macAddress; 
+		}
+		if (!is_null($fixedIps))
+		{
+			$options['fixedIps'] = $fixedIps; 
+		}
+		if (!is_null($deviceId))
+		{
+			$options['deviceId'] = $deviceId; 
+		}
+		if (!is_null($deviceOwner))
+		{
+			$options['deviceOwner'] = $deviceOwner; 
+		}
+		if (!is_null($securityGroups))
+		{
+			$options['securityGroups'] = $securityGroups; 
+		}
+		if (!is_null($tenantId))
+		{
+			$options['tenantId'] = $tenantId; 
+		}
+		
+		$this->libClass->update($options);	
+	}
+
+	public function deletePort($portId)
+     	{
+		$port = getPort($portId);
+		$port->delete();
+	}
+	
+	public function createSecurityGroup($name,$description)
+	{
+		$options = array();
+		if (!is_null($name))
+		{
+			$options['name'] = $name; 
+		}
+		if (!is_null($description))
+		{
+			$options['description'] = $description; 
+		}
+		
+		$this->libClass->createSecurityGroup($options);
+	}
+
+	public function createSecurityGroupRule($securityGroupId,$direction,$ethertype,$portRangeMin,$portRangeMax,$protocol,$remoteGroupId,$remoteIpPrefix)
+	{
+		$options = array();
+		if (!is_null($securityGroupId))
+		{
+			$options['securityGroupId'] = $securityGroupId; 
+		}
+		if (!is_null($direction))
+		{
+			$options['direction'] = $direction; 
+		}
+		if (!is_null($ethertype))
+		{
+			$options['ethertype'] = $ethertype; 
+		}
+		if (!is_null($portRangeMin))
+		{
+			$options['portRangeMin'] = $portRangeMin; 
+		}
+		if (!is_null($portRangeMax))
+		{
+			$options['portRangeMax'] = $portRangeMax; 
+		}
+		if (!is_null($protocol))
+		{
+			$options['protocol'] = $protocol; 
+		}
+		if (!is_null($remoteGroupId))
+		{
+			$options['remoteGroupId'] = $remoteGroupId; 
+		}
+		if (!is_null($remoteIpPrefix))
+		{
+			$options['remoteIpPrefix'] = $remoteIpPrefix; 
+		}
+		$this->libClass->createSecurityGroupRule($options);
+	}
+
+
+	public function listSecurityGroupe()
+	{
+		return $this->libClass->listSecurityGroups();
+	}
+
+	public function listSecurityGroupeRule()
+	{
+		return $this->libClass->listSecurityGroupRules();
+	}
+
+	public function getSecurityGroupe($securityGroupeId)
+	{
+		try
+		{
+			$securityGroupe = $this->libClass->getSecurityGroupe($securityGroupeId);
+			return $securityGroupe;
+		}
+		catch (Exception $e)
+		{
+			echo 'id fourni non disponible';
+		}
+	
+	}
+
+	public function deleteSecurityGroupe($securityGroupeId)
+     	{
+		$securityGroupe = getSecurityGroupe($securityGroupeId);
+		$securityGroupe->delete();
+	}	
-- 
cgit v1.2.3


From 20f8eb41d3ae5e53fd4bb53e55f0627ff7b7f15c Mon Sep 17 00:00:00 2001
From: Othmane Kabir <16008902@e003m10.istic.univ-rennes1.fr>
Date: Wed, 9 Mar 2016 16:13:20 +0100
Subject: commit finale

---
 server/core/Network.php  | 880 +++++++++++++++++++++++++++++++++----------
 server/core/Network.php~ | 952 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1644 insertions(+), 188 deletions(-)
 create mode 100644 server/core/Network.php~

(limited to 'server/core/Network.php')

diff --git a/server/core/Network.php b/server/core/Network.php
index 75ba2fd..65de962 100644
--- a/server/core/Network.php
+++ b/server/core/Network.php
@@ -25,279 +25,595 @@ class network{
 	}
 
 	
-	public function create_network($name,$adminStateUp,$shared,$tenantId)
+	public function create_network()
 	{
 		$options = array();
-		if (!is_null($name))
+		if (isset($this->app->getPostParam("name")))
 		{
-			$options['name'] = $name; 
+			$options['name'] = $this->app->getPostParam("name"); 
 		}
-		if (!is_null($adminStateUp))
+		if (isset($this->app->getPostParam("adminStateUp")))
 		{
-			$options['adminStateUp'] = $adminStateUp; 
+			$options['adminStateUp'] = $this->app->getPostParam("adminStateUp"); 
 		}
-		if (!is_null($shared))
+		if (isset($this->app->getPostParam("shared")))
 		{
-			$options['shared'] = $shared; 
+			$options['shared'] = $this->app->getPostParam("shared"); 
 		}
-		if (!is_null($tenantId))
+		if (isset($this->app->getPostParam("tenantId")))
 		{
-			$options['tenantId'] = $tenantId; 
+			$options['tenantId'] = $this->app->getPostParam("tenantId"); 
 		}
+		try
+		{
 		$network = $this->libClass->createNetworks($options);
-		
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}		
 
-		return $network;
+		
 	}
 
-	public function create_subnet($networkId,$ipVersion,$cidr,$name,$gatewayIp,$dnsNameservers,$allocationPools,$hostRoutes,$enableDhcp,$tenantId)
+	public function create_subnet()
 	{	$options = array();
-		if (!is_null($networkId))
+		if (isset($this->app->getPostParam("networkId")))
 		{
 			$options['networkId'] = $networkId; 
 		}
-		if (!is_null($ipVersion))
+		if (isset($this->app->getPostParam("ipVersion")))
 		{
-			$options['ipVersion'] = $ipVersion; 
+			$options['ipVersion'] = $this->app->getPostParam("ipVersion"); 
 		}
-		if (!is_null($cidr))
+		if (isset($this->app->getPostParam("cidr")))
 		{
-			$options['cidr'] = $cidr; 
+			$options['cidr'] = $this->app->getPostParam("cidr"); 
 		}
-		if (!is_null($tenantId))
+		if (isset($this->app->getPostParam("tenantId")))
 		{
-			$options['tenantId'] = $tenantId; 
+			$options['tenantId'] = $this->app->getPostParam("tenantId"); 
 		}
-		if (!is_null($name))
+		if (isset($this->app->getPostParam("name")))
 		{
-			$options['name'] = $name; 
+			$options['name'] = $$this->app->getPostParam("name"); 
 		}
-		if (!is_null($gatewayIp))
+		if (isset($this->app->getPostParam("gatewayIp")))
 		{
-			$options['gatewayIp'] = $gatewayIp; 
+			$options['gatewayIp'] = $this->app->getPostParam("gatewayIp"); 
 		}
-		if (!is_null($dnsNameservers))
+		if (isset($this->app->getPostParam("dnsNameservers")))
 		{
-			$options['dnsNameservers'] = $dnsNameservers; 
+			$options['dnsNameservers'] = $this->app->getPostParam("dnsNameservers"); 
 		}
-		if (!is_null($allocationPools))
+		if (isset($this->app->getPostParam("allocationPools")))
 		{
-			$options['allocationPools'] = $allocationPools; 
+			$options['allocationPools'] = $this->app->getPostParam("allocationPools"); 
 		}
-		if (!is_null($hostRoutes))
+		if (isset($this->app->getPostParam("hostRoutes")))
 		{
-			$options['hostRoutes'] = $hostRoutes; 
+			$options['hostRoutes'] = $this->app->getPostParam("hostRoutes"); 
 		}
-		if (!is_null($enableDhcp))
+		if (isset($this->app->getPostParam("enableDhcp")))
 		{
-			$options['enableDhcp'] = $enableDhcp; 
+			$options['enableDhcp'] = $this->app->getPostParam("enableDhcp"); 
 		}
-		if (!is_null($tenantId))
+		if (isset($this->app->getPostParam("tenantId")))
 		{
-			$options['tenantId'] = $tenantId; 
+			$options['tenantId'] = $this->app->getPostParam("tenantId"); 
 		}
-		$subnet = $this->libClass->createSubnet($options);
 		
+		try
+		{
+		$subnet = $this->libClass->createSubnet($options);
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
 
-		return $subnet;
+		
 	}
 	
 	public function list_network_ids()
 	{
+		try
+		{
+			$ln = $this->libClass->listNetworks();
 		
-		$ln = $this->libClass->listNetworks();
-		
-		$list_ids = array();
+			$list_ids = array();
 
 		
-		foreach($ln as $n)
-		{
+			foreach($ln as $n)
+			{
 			
-			$list_ids[] =  $n->id;
+				$list_ids[] =  $n->id;
 		
 
+			}
 		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
 
-	return $list_ids;
+	$this->app->setOutput("ListNetworkIds", $list_ids);
 	}
 
 	public function list_network_names()
 	{
+		try
+		{
+			$ln = $this->libClass->listNetworks();
 		
-		$ln = $this->libClass->listNetworks();
-		
-		$list_names = array();
+			$list_names = array();
 
 		
-		foreach($ln as $n)
-		{
+			foreach($ln as $n)
+			{
 			
-			$list_names[] =  $n->name;
+				$list_names[] =  $n->name;
 		
 
+			}
+		
 		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
 
-	return $list_names;
+	$this->app->setOutput("ListNetworkNames", $list_names);
 	}
 
 	public function list_cidr()
 	{
-		
-		$ls = $this->libClass->listSubnets();
-		$list_cidr = array();
-		foreach ($ls as $subnet)
-		 {
-     		
-			$list_cidr[] = $subnet->cidr;
-		 }
-
-	return $list_names;
+		try
+		{
+				$ls = $this->libClass->listSubnets();
+				$list_cidr = array();
+				foreach ($ls as $subnet)
+				 {
+		     		
+					$list_cidr[] = $subnet->cidr;
+				 }
+
+				$this->app->setOutput("ListCidr", $list_cidr);
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
 	}
-	//option array()
-	public function getNetwork($idNet)
+	
+	public function getNetwork()
 	{
 		$network="";
 		
 		try
-		{	$newtork = $this->libClass->getNetwork($idNet);
+		{	$newtork = $this->libClass->getNetwork($this->app->getPostParam("networkId"));
 			$network->retrieve();
 
 			
 		}
 
-		catch (OpenStack\Common\Error\BadResponseError $e)
+		
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
 		{
-			$network = "Id non existant ";
-	        }
-		catch (Exception $e)
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
 		{
-			$network = 'Exception reçue : ',  $e->getMessage(), "\n";
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
+
+	$this->app->setOutput("Network", $network);
+	}
+
+	public function getNetwork($netId)
+	{
+		$network="";
+		
+		try
+		{	$newtork = $this->libClass->getNetwork($netId);
+			$network->retrieve();
+
+			
 		}
 
+		
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
+
 	return $network;
 	}
 
-	public function getSubnet($idSub)
+	public function getSubnet()
 	{
 		$sbnet="";
 		
 		try
-		{	$subnet = $this->libClass->getSubnet($idSub);
+		{	$subnet = $this->libClass->getSubnet($this->app->getPostParam("subnetId"));
 			$subnet->retrieve();
 
-			return $sbnet;
+			
 		}
 
-		catch (OpenStack\Common\Error\BadResponseError $e)
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
 		{
-			echo  "Id non existant ";
-	        }
-		catch (Exception $e)
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
 		{
-			echo  'Exception reçue : ',  $e->getMessage(), "\n";
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
+		$this->app->setOutput("Subnet", subnet);
+	
+	}
+
+	public function getSubnet($subnetId)
+	{
+		$subnet="";
+		
+		try
+		{	$subnet = $this->libClass->getSubnet($subnetId);
+			$subnet->retrieve();
+
+			
 		}
 
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
+		return $subnet;
 	
-	}	
+	}		
 
-        public function updateNetwork($idNet,$name,$shared,$adminStateUp)
-     	{
-		$network = getNetwork($idNet);
-		if(!is_null($name))
+        public function updateNetwork()
+     	{	
+		$options = array();
+		if(isset($this->app->getPostParam("name")))
 		{
-			$network->name = $name;	
+			$options['name'] = $this->app->getPostParam("name");	
 		}
-		if(!is_null($shared))
+		if(isset($this->app->getPostParam("shared")))
 		{
-			$network->shared = $shared;	
+			$options['shared'] = $this->app->getPostParam("shared");	
 		}
-		if(!is_null($adminStateUp))
+		if(isset($this->app->getPostParam("adminStateUp")))
 		{
-			$network->adminStateUp = $shared;	
+			$options['adminStateUp'] = $this->app->getPostParam("adminStateUp");	
 		}
-		$network->update();
+		try
+		{		
+			$network = getNetwork($this->app->getPostParam("networkId"));
+		
+			$network->update($options);
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
 	}
 	
-	public function updateSubnet($idSub,$name,$networkId,$ipVersion,$cidr)
-     	{
-		$subnet = getNetwork($idSub);
-		if(!is_null($name))
+	public function updateSubnet()
+     	{	
+		$options = array();
+		if(isset($this->app->getPostParam("name")))
 		{
-			$subnet->name = $name;	
+			$options['name'] = $this->app->getPostParam("name");	
 		}
-		if(!is_null($networkId))
+		if(isset($this->app->getPostParam("networkId")))
 		{
-			$subnet->networkId = $networkId;	
+			$options['networkId'] = $this->app->getPostParam("networkId");	
 		}
-		if(!is_null($ipVersion))
+		if(isset($this->app->getPostParam("ipVersion")))
 		{
-			$subnet->ipVersion = $ipVersion;	
+			$options['ipVersion'] = $this->app->getPostParam("ipVersion");	
 		}
-		if(!is_null($cidr))
+		if(isset($this->app->getPostParam("cidr")))
 		{
-			$subnet->cidr = $cidr;	
+			$options['cidr'] = $this->app->getPostParam("cidr");	
 		}
-		$subnet->update();
+		try
+		{
+			$subnet = getSubnet($this->app->getPostParam("networkId"));
+		
+			$subnet->update($options);
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
 	}
 
-	public function deleteNetwork($idNet)
+	public function deleteNetwork()
      	{
-		$network = getNetwork($idNet);
-		$network->delete();
+		try
+		{
+				
+			$network = getNetwork($this->app->getPostParam("networkId"));
+			$network->delete();
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
 	}
 
-	public function deleteSubnet($idSub)
+	public function deleteSubnet()
      	{
-		$subnet = getNetwork($idSub);
-		$subnet->delete();
+		try
+		{		
+			$subnet = getNetwork($this->app->getPostParam("subnetId"));
+			$subnet->delete();
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
 	}
 
-	public function createPort($networkId,$name,$adminStateUp,$macAddress,$fixedIps,$deviceId,$deviceOwner,$securityGroups,$tenantId)
+	public function createPort()
 	{
 		$options = array();
-		if (!is_null($networkId))
+		if (isset($this->app->getPostParam("networkId")))
 		{
-			$options['networkId'] = $networkId; 
+			$options['networkId'] = $this->app->getPostParam("networkId"); 
 		}
-		if (!is_null($name))
+		if (isset($this->app->getPostParam("name")))
 		{
-			$options['name'] = $name; 
+			$options['name'] = $this->app->getPostParam("name"); 
 		}
-		if (!is_null($adminStateUp))
+		if (isset($this->app->getPostParam("adminStateUp")))
 		{
-			$options['adminStateUp'] = $adminStateUp; 
+			$options['adminStateUp'] = $this->app->getPostParam("adminStateUp"); 
 		}
-		if (!is_null($macAddress))
+		if (isset($this->app->getPostParam("macAddress")))
 		{
-			$options['macAddress'] = $macAddress; 
+			$options['macAddress'] = $this->app->getPostParam("macAddress"); 
 		}
-		if (!is_null($fixedIps))
+		if (isset($this->app->getPostParam("fixedIps")))
 		{
-			$options['fixedIps'] = $fixedIps; 
+			$options['fixedIps'] = $this->app->getPostParam("fixedIps"); 
 		}
-		if (!is_null($deviceId))
+		if (isset($this->app->getPostParam("deviceId")))
 		{
-			$options['deviceId'] = $deviceId; 
+			$options['deviceId'] = $this->app->getPostParam("deviceId"); 
 		}
-		if (!is_null($deviceOwner))
+		if (isset($this->app->getPostParam("deviceOwner")))
 		{
-			$options['deviceOwner'] = $deviceOwner; 
+			$options['deviceOwner'] = $this->app->getPostParam("deviceOwner"); 
 		}
-		if (!is_null($securityGroups))
+		if (isset($this->app->getPostParam("securityGroups")))
 		{
-			$options['securityGroups'] = $securityGroups; 
+			$options['securityGroups'] = $this->app->getPostParam("securityGroups"); 
 		}
-		if (!is_null($tenantId))
+		if (isset($this->app->getPostParam("tenantId")))
 		{
-			$options['tenantId'] = $tenantId; 
+			$options['tenantId'] = $this->app->getPostParam("tenantId"); 
 		}
-		
-		$this->libClass->createPort($options);	
+		try
+		{
+			$this->libClass->createPort($options);	
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
 	}
 
 	public function listPorts()
 	{
-		return $this->libClass->listPorts();
+		try
+		{		
+			$this->app->setOutput("listPorts", $this->libClass->listPorts()); 
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		}
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}
+	}
+
+	public function getPort()
+	{
+		try
+		{
+			$port = $this->libClass->getport($this->app->getPostParam("portId"));
+			$this->app->setOutput("Port", $port);
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		}
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}
+	
 	}
 
 	public function getPort($portId)
@@ -307,124 +623,280 @@ class network{
 			$port = $this->libClass->getport($portId);
 			return $port;
 		}
-		catch (Exception $e)
+		catch(BadResponseError $e)
 		{
-			echo 'id fourni non disponible';
-		}
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		}
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}
 	
-	}	
+	}		
 
-	public function updatePort($networkId,$name,$adminStateUp,$macAddress,$fixedIps,$deviceId,$deviceOwner,$securityGroups,$tenantId)
+	public function updatePort()
 	{
 		$options = array();
-		if (!is_null($networkId))
+		
+		if (isset($this->app->getPostParam("networkId")))
 		{
-			$options['networkId'] = $networkId; 
+			$options['networkId'] = $this->app->getPostParam("networkId"); 
 		}
-		if (!is_null($name))
+		if (isset($this->app->getPostParam("name")))
 		{
-			$options['name'] = $name; 
+			$options['name'] =$this->app->getPostParam("name"); 
 		}
-		if (!is_null($adminStateUp))
+		if (isset($this->app->getPostParam("adminStateUp")))
 		{
-			$options['adminStateUp'] = $adminStateUp; 
+			$options['adminStateUp'] =$this->app->getPostParam("adminStateUp"); 
 		}
-		if (!is_null($macAddress))
+		if (isset($this->app->getPostParam("macAddress")))
 		{
-			$options['macAddress'] = $macAddress; 
+			$options['macAddress'] = $this->app->getPostParam("macAddress"); 
 		}
-		if (!is_null($fixedIps))
+		if (isset($this->app->getPostParam("fixedIps")))
 		{
-			$options['fixedIps'] = $fixedIps; 
+			$options['fixedIps'] = $this->app->getPostParam("fixedIps"); 
 		}
-		if (!is_null($deviceId))
+		if (isset($this->app->getPostParam("deviceId")))
 		{
-			$options['deviceId'] = $deviceId; 
+			$options['deviceId'] = $this->app->getPostParam("deviceId"); 
 		}
-		if (!is_null($deviceOwner))
+		if (isset($this->app->getPostParam("deviceOwner")))
 		{
-			$options['deviceOwner'] = $deviceOwner; 
+			$options['deviceOwner'] = $this->app->getPostParam("deviceOwner"); 
 		}
-		if (!is_null($securityGroups))
+		if (isset($this->app->getPostParam("networkId")))
 		{
-			$options['securityGroups'] = $securityGroups; 
+			$options['securityGroups'] = $this->app->getPostParam("securityGroups"); 
 		}
-		if (!is_null($tenantId))
+		if (isset($this->app->getPostParam("tenantId")))
 		{
-			$options['tenantId'] = $tenantId; 
+			$options['tenantId'] = $this->app->getPostParam("tenantId"); 
 		}
-		
-		$this->libClass->update($options);	
+		try
+		{
+			$port = getPort($this->app->getPostParam("networkId"));
+			$port->update($options);
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		}
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
 	}
 
-	public function deletePort($portId)
+	public function deletePort()
      	{
-		$port = getPort($portId);
-		$port->delete();
+		
+		try
+		{
+			$port = getPort($this->app->getPostParam("portId"));
+			$port->delete();
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		}
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}
 	}
 	
-	public function createSecurityGroup($name,$description)
+	public function createSecurityGroup()
 	{
 		$options = array();
-		if (!is_null($name))
+		if (isset($this->app->getPostParam("name")))
 		{
-			$options['name'] = $name; 
+			$options['name'] = $this->app->getPostParam("name"); 
 		}
-		if (!is_null($description))
+		if (isset($this->app->getPostParam("description")))
 		{
-			$options['description'] = $description; 
+			$options['description'] = $this->app->getPostParam("description"); 
 		}
-		
-		$this->libClass->createSecurityGroup($options);
+		try
+		{
+			$this->libClass->createSecurityGroup($options);
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		}
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}
+	
 	}
 
-	public function createSecurityGroupRule($securityGroupId,$direction,$ethertype,$portRangeMin,$portRangeMax,$protocol,$remoteGroupId,$remoteIpPrefix)
+	public function createSecurityGroupRule()
 	{
 		$options = array();
-		if (!is_null($securityGroupId))
+		if (isset($this->app->getPostParam("securityGroupId")))
 		{
-			$options['securityGroupId'] = $securityGroupId; 
+			$options['securityGroupId'] = $this->app->getPostParam("securityGroupId"); 
 		}
-		if (!is_null($direction))
+		if (isset($this->app->getPostParam("direction")))
 		{
-			$options['direction'] = $direction; 
+			$options['direction'] = $this->app->getPostParam("direction"); 
 		}
-		if (!is_null($ethertype))
+		if (isset($this->app->getPostParam("ethertype")))
 		{
-			$options['ethertype'] = $ethertype; 
+			$options['ethertype'] = $this->app->getPostParam("ethertype"); 
 		}
-		if (!is_null($portRangeMin))
+		if (isset($this->app->getPostParam("portRangeMin")))
 		{
-			$options['portRangeMin'] = $portRangeMin; 
+			$options['portRangeMin'] = $this->app->getPostParam("portRangeMin"); 
 		}
-		if (!is_null($portRangeMax))
+		if (isset($this->app->getPostParam("portRangeMax")))
 		{
-			$options['portRangeMax'] = $portRangeMax; 
+			$options['portRangeMax'] = $this->app->getPostParam("portRangeMax"); 
 		}
-		if (!is_null($protocol))
+		if (isset($this->app->getPostParam("protocol")))
 		{
-			$options['protocol'] = $protocol; 
+			$options['protocol'] = $this->app->getPostParam("protocol"); 
 		}
-		if (!is_null($remoteGroupId))
+		if (isset($this->app->getPostParam("remoteGroupId")))
 		{
-			$options['remoteGroupId'] = $remoteGroupId; 
+			$options['remoteGroupId'] = $this->app->getPostParam("remoteGroupId"); 
 		}
-		if (!is_null($remoteIpPrefix))
+		if (isset($this->app->getPostParam("remoteIpPrefix")))
 		{
-			$options['remoteIpPrefix'] = $remoteIpPrefix; 
+			$options['remoteIpPrefix'] = $this->app->getPostParam("remoteIpPrefix"); 
 		}
-		$this->libClass->createSecurityGroupRule($options);
+		try
+		{
+			$this->libClass->createSecurityGroupRule($options);
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		}
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}
 	}
 
 
 	public function listSecurityGroupe()
 	{
-		return $this->libClass->listSecurityGroups();
+		try
+		{
+			$this->app->setOutput("listSecurityGroups", $this->libClass->listSecurityGroups());
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		}
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}
 	}
 
 	public function listSecurityGroupeRule()
 	{
-		return $this->libClass->listSecurityGroupRules();
+		try
+		{
+		 
+		$this->app->setOutput("listSecurityGroupeRule", $this->libClass->listSecurityGroupRules());
+
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		}
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}
+	}
+
+	public function getSecurityGroupe()
+	{
+		try
+		{
+			$securityGroupe = $this->libClass->getSecurityGroupe($this->app->getPostParam("securityGroupeId"));
+			$this->app->setOutput("securityGroupe", $securityGroupe);
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		}
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}
+	
 	}
 
 	public function getSecurityGroupe($securityGroupeId)
@@ -434,15 +906,47 @@ class network{
 			$securityGroupe = $this->libClass->getSecurityGroupe($securityGroupeId);
 			return $securityGroupe;
 		}
-		catch (Exception $e)
+		catch(BadResponseError $e)
 		{
-			echo 'id fourni non disponible';
-		}
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		}
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}
 	
 	}
 
-	public function deleteSecurityGroupe($securityGroupeId)
-     	{
-		$securityGroupe = getSecurityGroupe($securityGroupeId);
-		$securityGroupe->delete();
+	public function deleteSecurityGroupe()
+     	{	
+		try
+		{
+		
+			$securityGroupe = getSecurityGroupe($this->app->getPostParam("securityGroupeId"));
+			$securityGroupe->delete();
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		}
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}
 	}	
diff --git a/server/core/Network.php~ b/server/core/Network.php~
new file mode 100644
index 0000000..65de962
--- /dev/null
+++ b/server/core/Network.php~
@@ -0,0 +1,952 @@
+<?php
+
+class network{ 
+	
+	protected $app;
+	
+	protected $libClass;
+	
+	
+
+	
+
+	
+	public function __construct($app){
+		$this->app = $app;
+		$this->libClass = $app->getLibClass("network");
+		
+	}
+
+
+	public function action($action){
+		
+		 $this->{$action.""}();
+		
+	}
+
+	
+	public function create_network()
+	{
+		$options = array();
+		if (isset($this->app->getPostParam("name")))
+		{
+			$options['name'] = $this->app->getPostParam("name"); 
+		}
+		if (isset($this->app->getPostParam("adminStateUp")))
+		{
+			$options['adminStateUp'] = $this->app->getPostParam("adminStateUp"); 
+		}
+		if (isset($this->app->getPostParam("shared")))
+		{
+			$options['shared'] = $this->app->getPostParam("shared"); 
+		}
+		if (isset($this->app->getPostParam("tenantId")))
+		{
+			$options['tenantId'] = $this->app->getPostParam("tenantId"); 
+		}
+		try
+		{
+		$network = $this->libClass->createNetworks($options);
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}		
+
+		
+	}
+
+	public function create_subnet()
+	{	$options = array();
+		if (isset($this->app->getPostParam("networkId")))
+		{
+			$options['networkId'] = $networkId; 
+		}
+		if (isset($this->app->getPostParam("ipVersion")))
+		{
+			$options['ipVersion'] = $this->app->getPostParam("ipVersion"); 
+		}
+		if (isset($this->app->getPostParam("cidr")))
+		{
+			$options['cidr'] = $this->app->getPostParam("cidr"); 
+		}
+		if (isset($this->app->getPostParam("tenantId")))
+		{
+			$options['tenantId'] = $this->app->getPostParam("tenantId"); 
+		}
+		if (isset($this->app->getPostParam("name")))
+		{
+			$options['name'] = $$this->app->getPostParam("name"); 
+		}
+		if (isset($this->app->getPostParam("gatewayIp")))
+		{
+			$options['gatewayIp'] = $this->app->getPostParam("gatewayIp"); 
+		}
+		if (isset($this->app->getPostParam("dnsNameservers")))
+		{
+			$options['dnsNameservers'] = $this->app->getPostParam("dnsNameservers"); 
+		}
+		if (isset($this->app->getPostParam("allocationPools")))
+		{
+			$options['allocationPools'] = $this->app->getPostParam("allocationPools"); 
+		}
+		if (isset($this->app->getPostParam("hostRoutes")))
+		{
+			$options['hostRoutes'] = $this->app->getPostParam("hostRoutes"); 
+		}
+		if (isset($this->app->getPostParam("enableDhcp")))
+		{
+			$options['enableDhcp'] = $this->app->getPostParam("enableDhcp"); 
+		}
+		if (isset($this->app->getPostParam("tenantId")))
+		{
+			$options['tenantId'] = $this->app->getPostParam("tenantId"); 
+		}
+		
+		try
+		{
+		$subnet = $this->libClass->createSubnet($options);
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
+
+		
+	}
+	
+	public function list_network_ids()
+	{
+		try
+		{
+			$ln = $this->libClass->listNetworks();
+		
+			$list_ids = array();
+
+		
+			foreach($ln as $n)
+			{
+			
+				$list_ids[] =  $n->id;
+		
+
+			}
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
+
+	$this->app->setOutput("ListNetworkIds", $list_ids);
+	}
+
+	public function list_network_names()
+	{
+		try
+		{
+			$ln = $this->libClass->listNetworks();
+		
+			$list_names = array();
+
+		
+			foreach($ln as $n)
+			{
+			
+				$list_names[] =  $n->name;
+		
+
+			}
+		
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
+
+	$this->app->setOutput("ListNetworkNames", $list_names);
+	}
+
+	public function list_cidr()
+	{
+		try
+		{
+				$ls = $this->libClass->listSubnets();
+				$list_cidr = array();
+				foreach ($ls as $subnet)
+				 {
+		     		
+					$list_cidr[] = $subnet->cidr;
+				 }
+
+				$this->app->setOutput("ListCidr", $list_cidr);
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
+	}
+	
+	public function getNetwork()
+	{
+		$network="";
+		
+		try
+		{	$newtork = $this->libClass->getNetwork($this->app->getPostParam("networkId"));
+			$network->retrieve();
+
+			
+		}
+
+		
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
+
+	$this->app->setOutput("Network", $network);
+	}
+
+	public function getNetwork($netId)
+	{
+		$network="";
+		
+		try
+		{	$newtork = $this->libClass->getNetwork($netId);
+			$network->retrieve();
+
+			
+		}
+
+		
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
+
+	return $network;
+	}
+
+	public function getSubnet()
+	{
+		$sbnet="";
+		
+		try
+		{	$subnet = $this->libClass->getSubnet($this->app->getPostParam("subnetId"));
+			$subnet->retrieve();
+
+			
+		}
+
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
+		$this->app->setOutput("Subnet", subnet);
+	
+	}
+
+	public function getSubnet($subnetId)
+	{
+		$subnet="";
+		
+		try
+		{	$subnet = $this->libClass->getSubnet($subnetId);
+			$subnet->retrieve();
+
+			
+		}
+
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
+		return $subnet;
+	
+	}		
+
+        public function updateNetwork()
+     	{	
+		$options = array();
+		if(isset($this->app->getPostParam("name")))
+		{
+			$options['name'] = $this->app->getPostParam("name");	
+		}
+		if(isset($this->app->getPostParam("shared")))
+		{
+			$options['shared'] = $this->app->getPostParam("shared");	
+		}
+		if(isset($this->app->getPostParam("adminStateUp")))
+		{
+			$options['adminStateUp'] = $this->app->getPostParam("adminStateUp");	
+		}
+		try
+		{		
+			$network = getNetwork($this->app->getPostParam("networkId"));
+		
+			$network->update($options);
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
+	}
+	
+	public function updateSubnet()
+     	{	
+		$options = array();
+		if(isset($this->app->getPostParam("name")))
+		{
+			$options['name'] = $this->app->getPostParam("name");	
+		}
+		if(isset($this->app->getPostParam("networkId")))
+		{
+			$options['networkId'] = $this->app->getPostParam("networkId");	
+		}
+		if(isset($this->app->getPostParam("ipVersion")))
+		{
+			$options['ipVersion'] = $this->app->getPostParam("ipVersion");	
+		}
+		if(isset($this->app->getPostParam("cidr")))
+		{
+			$options['cidr'] = $this->app->getPostParam("cidr");	
+		}
+		try
+		{
+			$subnet = getSubnet($this->app->getPostParam("networkId"));
+		
+			$subnet->update($options);
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
+	}
+
+	public function deleteNetwork()
+     	{
+		try
+		{
+				
+			$network = getNetwork($this->app->getPostParam("networkId"));
+			$network->delete();
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
+	}
+
+	public function deleteSubnet()
+     	{
+		try
+		{		
+			$subnet = getNetwork($this->app->getPostParam("subnetId"));
+			$subnet->delete();
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
+	}
+
+	public function createPort()
+	{
+		$options = array();
+		if (isset($this->app->getPostParam("networkId")))
+		{
+			$options['networkId'] = $this->app->getPostParam("networkId"); 
+		}
+		if (isset($this->app->getPostParam("name")))
+		{
+			$options['name'] = $this->app->getPostParam("name"); 
+		}
+		if (isset($this->app->getPostParam("adminStateUp")))
+		{
+			$options['adminStateUp'] = $this->app->getPostParam("adminStateUp"); 
+		}
+		if (isset($this->app->getPostParam("macAddress")))
+		{
+			$options['macAddress'] = $this->app->getPostParam("macAddress"); 
+		}
+		if (isset($this->app->getPostParam("fixedIps")))
+		{
+			$options['fixedIps'] = $this->app->getPostParam("fixedIps"); 
+		}
+		if (isset($this->app->getPostParam("deviceId")))
+		{
+			$options['deviceId'] = $this->app->getPostParam("deviceId"); 
+		}
+		if (isset($this->app->getPostParam("deviceOwner")))
+		{
+			$options['deviceOwner'] = $this->app->getPostParam("deviceOwner"); 
+		}
+		if (isset($this->app->getPostParam("securityGroups")))
+		{
+			$options['securityGroups'] = $this->app->getPostParam("securityGroups"); 
+		}
+		if (isset($this->app->getPostParam("tenantId")))
+		{
+			$options['tenantId'] = $this->app->getPostParam("tenantId"); 
+		}
+		try
+		{
+			$this->libClass->createPort($options);	
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		 }
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
+	}
+
+	public function listPorts()
+	{
+		try
+		{		
+			$this->app->setOutput("listPorts", $this->libClass->listPorts()); 
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		}
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}
+	}
+
+	public function getPort()
+	{
+		try
+		{
+			$port = $this->libClass->getport($this->app->getPostParam("portId"));
+			$this->app->setOutput("Port", $port);
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		}
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}
+	
+	}
+
+	public function getPort($portId)
+	{
+		try
+		{
+			$port = $this->libClass->getport($portId);
+			return $port;
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		}
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}
+	
+	}		
+
+	public function updatePort()
+	{
+		$options = array();
+		
+		if (isset($this->app->getPostParam("networkId")))
+		{
+			$options['networkId'] = $this->app->getPostParam("networkId"); 
+		}
+		if (isset($this->app->getPostParam("name")))
+		{
+			$options['name'] =$this->app->getPostParam("name"); 
+		}
+		if (isset($this->app->getPostParam("adminStateUp")))
+		{
+			$options['adminStateUp'] =$this->app->getPostParam("adminStateUp"); 
+		}
+		if (isset($this->app->getPostParam("macAddress")))
+		{
+			$options['macAddress'] = $this->app->getPostParam("macAddress"); 
+		}
+		if (isset($this->app->getPostParam("fixedIps")))
+		{
+			$options['fixedIps'] = $this->app->getPostParam("fixedIps"); 
+		}
+		if (isset($this->app->getPostParam("deviceId")))
+		{
+			$options['deviceId'] = $this->app->getPostParam("deviceId"); 
+		}
+		if (isset($this->app->getPostParam("deviceOwner")))
+		{
+			$options['deviceOwner'] = $this->app->getPostParam("deviceOwner"); 
+		}
+		if (isset($this->app->getPostParam("networkId")))
+		{
+			$options['securityGroups'] = $this->app->getPostParam("securityGroups"); 
+		}
+		if (isset($this->app->getPostParam("tenantId")))
+		{
+			$options['tenantId'] = $this->app->getPostParam("tenantId"); 
+		}
+		try
+		{
+			$port = getPort($this->app->getPostParam("networkId"));
+			$port->update($options);
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		}
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}	
+	}
+
+	public function deletePort()
+     	{
+		
+		try
+		{
+			$port = getPort($this->app->getPostParam("portId"));
+			$port->delete();
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		}
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}
+	}
+	
+	public function createSecurityGroup()
+	{
+		$options = array();
+		if (isset($this->app->getPostParam("name")))
+		{
+			$options['name'] = $this->app->getPostParam("name"); 
+		}
+		if (isset($this->app->getPostParam("description")))
+		{
+			$options['description'] = $this->app->getPostParam("description"); 
+		}
+		try
+		{
+			$this->libClass->createSecurityGroup($options);
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		}
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}
+	
+	}
+
+	public function createSecurityGroupRule()
+	{
+		$options = array();
+		if (isset($this->app->getPostParam("securityGroupId")))
+		{
+			$options['securityGroupId'] = $this->app->getPostParam("securityGroupId"); 
+		}
+		if (isset($this->app->getPostParam("direction")))
+		{
+			$options['direction'] = $this->app->getPostParam("direction"); 
+		}
+		if (isset($this->app->getPostParam("ethertype")))
+		{
+			$options['ethertype'] = $this->app->getPostParam("ethertype"); 
+		}
+		if (isset($this->app->getPostParam("portRangeMin")))
+		{
+			$options['portRangeMin'] = $this->app->getPostParam("portRangeMin"); 
+		}
+		if (isset($this->app->getPostParam("portRangeMax")))
+		{
+			$options['portRangeMax'] = $this->app->getPostParam("portRangeMax"); 
+		}
+		if (isset($this->app->getPostParam("protocol")))
+		{
+			$options['protocol'] = $this->app->getPostParam("protocol"); 
+		}
+		if (isset($this->app->getPostParam("remoteGroupId")))
+		{
+			$options['remoteGroupId'] = $this->app->getPostParam("remoteGroupId"); 
+		}
+		if (isset($this->app->getPostParam("remoteIpPrefix")))
+		{
+			$options['remoteIpPrefix'] = $this->app->getPostParam("remoteIpPrefix"); 
+		}
+		try
+		{
+			$this->libClass->createSecurityGroupRule($options);
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		}
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}
+	}
+
+
+	public function listSecurityGroupe()
+	{
+		try
+		{
+			$this->app->setOutput("listSecurityGroups", $this->libClass->listSecurityGroups());
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		}
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}
+	}
+
+	public function listSecurityGroupeRule()
+	{
+		try
+		{
+		 
+		$this->app->setOutput("listSecurityGroupeRule", $this->libClass->listSecurityGroupRules());
+
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		}
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}
+	}
+
+	public function getSecurityGroupe()
+	{
+		try
+		{
+			$securityGroupe = $this->libClass->getSecurityGroupe($this->app->getPostParam("securityGroupeId"));
+			$this->app->setOutput("securityGroupe", $securityGroupe);
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		}
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}
+	
+	}
+
+	public function getSecurityGroupe($securityGroupeId)
+	{
+		try
+		{
+			$securityGroupe = $this->libClass->getSecurityGroupe($securityGroupeId);
+			return $securityGroupe;
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		}
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}
+	
+	}
+
+	public function deleteSecurityGroupe()
+     	{	
+		try
+		{
+		
+			$securityGroupe = getSecurityGroupe($this->app->getPostParam("securityGroupeId"));
+			$securityGroupe->delete();
+		}
+		catch(BadResponseError $e)
+		{
+			$this->app->getErrorInstance->BadResponseHandler($e);
+       		}
+		catch(UserInputError $e)
+		{
+			$this->app->getErrorInstance->UserInputHandler($e);
+        	}
+		catch(BaseError $e)
+		{
+			$this->app->getErrorInstance->BaseErrorHandler($e);
+       		}
+		catch(NotImplementedError $e)
+		{
+			$this->app->getErrorInstance->NotImplementedHandler($e);
+        	}
+	}	
-- 
cgit v1.2.3


From 3c336f00d29ba927d41e2029a3c1d893cee43f9d Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Mon, 21 Mar 2016 06:47:01 +0100
Subject: Add login check witouth reloading page

---
 .gitignore                                         |   2 +-
 client/index.html                                  |   5 +-
 client/js/app.js                                   |   2 +-
 client/js/controllers/home/home.js                 |   2 +-
 client/js/controllers/image/image.js               |   3 --
 client/js/controllers/image/upload.js              |  60 +++++++++++++++++++++
 client/js/controllers/login.js                     |  16 +++---
 client/js/controllers/status.js                    |   4 +-
 client/js/services/Identity.js                     |  15 ++++--
 client/js/services/Image.js                        |  37 ++++++++++---
 client/partials/image/upload.html                  |  13 +++--
 .../vendors/angularjs/angular-file-upload.min.js   |   7 +++
 client/vendors/angularjs/angular-upload.min.js     |   1 +
 client/vendors/jquery/dmuploader.min.js            |   9 ++++
 server/Readme.md                                   |   0
 server/Test/DisplayNetIds.php                      |   0
 server/Test/computeTest.php                        |   0
 server/Test/create_network.php                     |   0
 server/Test/create_subnet.php                      |   0
 server/Test/genTokenOptionsTest.php                |   0
 server/Test/imageTests.php                         |   0
 server/composer.json                               |   0
 server/composer.lock                               |   0
 server/composer.phar                               | Bin
 server/config.inc.php                              |   0
 server/core/CoreInterface.php                      |   0
 server/core/LibOverride/projectTokenData/demo      |   0
 server/core/Network.php                            |   0
 server/core/Plugin.php                             |   0
 server/core/Plugin_Api.php                         |   0
 server/core/Readme.txt                             |   0
 server/create_serv.php                             |   0
 server/modules/Readme.txt                          |   0
 server/vendor/autoload.php                         |   0
 server/vendor/composer/ClassLoader.php             |   0
 server/vendor/composer/LICENSE                     |   0
 server/vendor/composer/autoload_classmap.php       |   0
 server/vendor/composer/autoload_files.php          |   0
 server/vendor/composer/autoload_namespaces.php     |   0
 server/vendor/composer/autoload_psr4.php           |   0
 server/vendor/composer/autoload_real.php           |   0
 server/vendor/composer/installed.json              |   0
 server/vendor/guzzlehttp/guzzle/.travis.yml        |   0
 server/vendor/guzzlehttp/guzzle/CHANGELOG.md       |   0
 server/vendor/guzzlehttp/guzzle/LICENSE            |   0
 server/vendor/guzzlehttp/guzzle/README.md          |   0
 server/vendor/guzzlehttp/guzzle/UPGRADING.md       |   0
 server/vendor/guzzlehttp/guzzle/composer.json      |   0
 server/vendor/guzzlehttp/guzzle/src/Client.php     |   0
 .../guzzlehttp/guzzle/src/ClientInterface.php      |   0
 .../guzzlehttp/guzzle/src/Cookie/CookieJar.php     |   0
 .../guzzle/src/Cookie/CookieJarInterface.php       |   0
 .../guzzlehttp/guzzle/src/Cookie/FileCookieJar.php |   0
 .../guzzle/src/Cookie/SessionCookieJar.php         |   0
 .../guzzlehttp/guzzle/src/Cookie/SetCookie.php     |   0
 .../guzzle/src/Exception/BadResponseException.php  |   0
 .../guzzle/src/Exception/ClientException.php       |   0
 .../guzzle/src/Exception/ConnectException.php      |   0
 .../guzzle/src/Exception/GuzzleException.php       |   0
 .../guzzle/src/Exception/RequestException.php      |   0
 .../guzzle/src/Exception/SeekException.php         |   0
 .../guzzle/src/Exception/ServerException.php       |   0
 .../src/Exception/TooManyRedirectsException.php    |   0
 .../guzzle/src/Exception/TransferException.php     |   0
 .../guzzlehttp/guzzle/src/Handler/CurlFactory.php  |   0
 .../guzzle/src/Handler/CurlFactoryInterface.php    |   0
 .../guzzlehttp/guzzle/src/Handler/CurlHandler.php  |   0
 .../guzzle/src/Handler/CurlMultiHandler.php        |   0
 .../guzzlehttp/guzzle/src/Handler/EasyHandle.php   |   0
 .../guzzlehttp/guzzle/src/Handler/MockHandler.php  |   0
 .../vendor/guzzlehttp/guzzle/src/Handler/Proxy.php |   0
 .../guzzle/src/Handler/StreamHandler.php           |   0
 .../vendor/guzzlehttp/guzzle/src/HandlerStack.php  |   0
 .../guzzlehttp/guzzle/src/MessageFormatter.php     |   0
 server/vendor/guzzlehttp/guzzle/src/Middleware.php |   0
 server/vendor/guzzlehttp/guzzle/src/Pool.php       |   0
 .../guzzle/src/PrepareBodyMiddleware.php           |   0
 .../guzzlehttp/guzzle/src/RedirectMiddleware.php   |   0
 .../guzzlehttp/guzzle/src/RequestOptions.php       |   0
 .../guzzlehttp/guzzle/src/RetryMiddleware.php      |   0
 .../vendor/guzzlehttp/guzzle/src/TransferStats.php |   0
 .../vendor/guzzlehttp/guzzle/src/UriTemplate.php   |   0
 server/vendor/guzzlehttp/guzzle/src/functions.php  |   0
 .../guzzlehttp/guzzle/src/functions_include.php    |   0
 server/vendor/guzzlehttp/promises/.gitignore       |   0
 server/vendor/guzzlehttp/promises/.travis.yml      |   0
 server/vendor/guzzlehttp/promises/CHANGELOG.md     |   0
 server/vendor/guzzlehttp/promises/LICENSE          |   0
 server/vendor/guzzlehttp/promises/Makefile         |   0
 server/vendor/guzzlehttp/promises/README.md        |   0
 server/vendor/guzzlehttp/promises/composer.json    |   0
 server/vendor/guzzlehttp/promises/phpunit.xml.dist |   0
 .../guzzlehttp/promises/src/AggregateException.php |   0
 .../promises/src/CancellationException.php         |   0
 .../vendor/guzzlehttp/promises/src/EachPromise.php |   0
 .../guzzlehttp/promises/src/FulfilledPromise.php   |   0
 server/vendor/guzzlehttp/promises/src/Promise.php  |   0
 .../guzzlehttp/promises/src/PromiseInterface.php   |   0
 .../guzzlehttp/promises/src/PromisorInterface.php  |   0
 .../guzzlehttp/promises/src/RejectedPromise.php    |   0
 .../guzzlehttp/promises/src/RejectionException.php |   0
 .../vendor/guzzlehttp/promises/src/TaskQueue.php   |   0
 .../vendor/guzzlehttp/promises/src/functions.php   |   0
 .../guzzlehttp/promises/src/functions_include.php  |   0
 .../promises/tests/AggregateExceptionTest.php      |   0
 .../guzzlehttp/promises/tests/EachPromiseTest.php  |   0
 .../promises/tests/FulfilledPromiseTest.php        |   0
 .../promises/tests/NotPromiseInstance.php          |   0
 .../guzzlehttp/promises/tests/PromiseTest.php      |   0
 .../promises/tests/RejectedPromiseTest.php         |   0
 .../promises/tests/RejectionExceptionTest.php      |   0
 .../guzzlehttp/promises/tests/TaskQueueTest.php    |   0
 .../vendor/guzzlehttp/promises/tests/Thennable.php |   0
 .../vendor/guzzlehttp/promises/tests/bootstrap.php |   0
 .../guzzlehttp/promises/tests/functionsTest.php    |   0
 server/vendor/guzzlehttp/psr7/.gitignore           |   0
 server/vendor/guzzlehttp/psr7/.travis.yml          |   0
 server/vendor/guzzlehttp/psr7/CHANGELOG.md         |   0
 server/vendor/guzzlehttp/psr7/LICENSE              |   0
 server/vendor/guzzlehttp/psr7/Makefile             |   0
 server/vendor/guzzlehttp/psr7/README.md            |   0
 server/vendor/guzzlehttp/psr7/composer.json        |   0
 server/vendor/guzzlehttp/psr7/phpunit.xml.dist     |   0
 server/vendor/guzzlehttp/psr7/src/AppendStream.php |   0
 server/vendor/guzzlehttp/psr7/src/BufferStream.php |   0
 .../vendor/guzzlehttp/psr7/src/CachingStream.php   |   0
 .../vendor/guzzlehttp/psr7/src/DroppingStream.php  |   0
 server/vendor/guzzlehttp/psr7/src/FnStream.php     |   0
 .../vendor/guzzlehttp/psr7/src/InflateStream.php   |   0
 .../vendor/guzzlehttp/psr7/src/LazyOpenStream.php  |   0
 server/vendor/guzzlehttp/psr7/src/LimitStream.php  |   0
 server/vendor/guzzlehttp/psr7/src/MessageTrait.php |   0
 .../vendor/guzzlehttp/psr7/src/MultipartStream.php |   0
 server/vendor/guzzlehttp/psr7/src/NoSeekStream.php |   0
 server/vendor/guzzlehttp/psr7/src/PumpStream.php   |   0
 server/vendor/guzzlehttp/psr7/src/Request.php      |   0
 server/vendor/guzzlehttp/psr7/src/Response.php     |   0
 server/vendor/guzzlehttp/psr7/src/Stream.php       |   0
 .../guzzlehttp/psr7/src/StreamDecoratorTrait.php   |   0
 .../vendor/guzzlehttp/psr7/src/StreamWrapper.php   |   0
 server/vendor/guzzlehttp/psr7/src/Uri.php          |   0
 server/vendor/guzzlehttp/psr7/src/functions.php    |   0
 .../guzzlehttp/psr7/src/functions_include.php      |   0
 .../guzzlehttp/psr7/tests/AppendStreamTest.php     |   0
 .../guzzlehttp/psr7/tests/BufferStreamTest.php     |   0
 .../guzzlehttp/psr7/tests/CachingStreamTest.php    |   0
 .../guzzlehttp/psr7/tests/DroppingStreamTest.php   |   0
 .../vendor/guzzlehttp/psr7/tests/FnStreamTest.php  |   0
 .../vendor/guzzlehttp/psr7/tests/FunctionsTest.php |   0
 .../guzzlehttp/psr7/tests/InflateStreamTest.php    |   0
 .../guzzlehttp/psr7/tests/LazyOpenStreamTest.php   |   0
 .../guzzlehttp/psr7/tests/LimitStreamTest.php      |   0
 .../guzzlehttp/psr7/tests/MultipartStreamTest.php  |   0
 .../guzzlehttp/psr7/tests/NoSeekStreamTest.php     |   0
 .../guzzlehttp/psr7/tests/PumpStreamTest.php       |   0
 .../vendor/guzzlehttp/psr7/tests/RequestTest.php   |   0
 .../vendor/guzzlehttp/psr7/tests/ResponseTest.php  |   0
 .../psr7/tests/StreamDecoratorTraitTest.php        |   0
 server/vendor/guzzlehttp/psr7/tests/StreamTest.php |   0
 .../guzzlehttp/psr7/tests/StreamWrapperTest.php    |   0
 server/vendor/guzzlehttp/psr7/tests/UriTest.php    |   0
 server/vendor/guzzlehttp/psr7/tests/bootstrap.php  |   0
 .../justinrainbow/json-schema/.gitattributes       |   0
 server/vendor/justinrainbow/json-schema/LICENSE    |   0
 server/vendor/justinrainbow/json-schema/README.md  |   0
 .../justinrainbow/json-schema/bin/validate-json    |   0
 .../vendor/justinrainbow/json-schema/composer.json |   0
 .../justinrainbow/json-schema/phpunit.xml.dist     |   0
 .../Constraints/CollectionConstraint.php           |   0
 .../src/JsonSchema/Constraints/Constraint.php      |   0
 .../JsonSchema/Constraints/ConstraintInterface.php |   0
 .../src/JsonSchema/Constraints/EnumConstraint.php  |   0
 .../src/JsonSchema/Constraints/Factory.php         |   0
 .../JsonSchema/Constraints/FormatConstraint.php    |   0
 .../JsonSchema/Constraints/NumberConstraint.php    |   0
 .../JsonSchema/Constraints/ObjectConstraint.php    |   0
 .../JsonSchema/Constraints/SchemaConstraint.php    |   0
 .../JsonSchema/Constraints/StringConstraint.php    |   0
 .../src/JsonSchema/Constraints/TypeConstraint.php  |   0
 .../JsonSchema/Constraints/UndefinedConstraint.php |   0
 .../Exception/InvalidArgumentException.php         |   0
 .../Exception/InvalidSchemaMediaTypeException.php  |   0
 .../Exception/InvalidSourceUriException.php        |   0
 .../JsonSchema/Exception/JsonDecodingException.php |   0
 .../Exception/ResourceNotFoundException.php        |   0
 .../JsonSchema/Exception/UriResolverException.php  |   0
 .../json-schema/src/JsonSchema/RefResolver.php     |   0
 .../Uri/Retrievers/AbstractRetriever.php           |   0
 .../src/JsonSchema/Uri/Retrievers/Curl.php         |   0
 .../JsonSchema/Uri/Retrievers/FileGetContents.php  |   0
 .../JsonSchema/Uri/Retrievers/PredefinedArray.php  |   0
 .../Uri/Retrievers/UriRetrieverInterface.php       |   0
 .../json-schema/src/JsonSchema/Uri/UriResolver.php |   0
 .../src/JsonSchema/Uri/UriRetriever.php            |   0
 .../json-schema/src/JsonSchema/Validator.php       |   0
 server/vendor/php-opencloud/common/.gitignore      |   0
 server/vendor/php-opencloud/common/composer.json   |   0
 .../vendor/php-opencloud/common/phpunit.xml.dist   |   0
 .../common/src/Common/Api/AbstractApi.php          |   0
 .../common/src/Common/Api/AbstractParams.php       |   0
 .../common/src/Common/Api/ApiInterface.php         |   0
 .../common/src/Common/Api/Operation.php            |   0
 .../common/src/Common/Api/Operator.php             |   0
 .../common/src/Common/Api/OperatorInterface.php    |   0
 .../common/src/Common/Api/Parameter.php            |   0
 .../common/src/Common/ArrayAccessTrait.php         |   0
 .../common/src/Common/Auth/AuthHandler.php         |   0
 .../common/src/Common/Auth/Catalog.php             |   0
 .../common/src/Common/Auth/IdentityService.php     |   0
 .../php-opencloud/common/src/Common/Auth/Token.php |   0
 .../common/src/Common/Error/BadResponseError.php   |   0
 .../common/src/Common/Error/BaseError.php          |   0
 .../common/src/Common/Error/Builder.php            |   0
 .../src/Common/Error/NotImplementedError.php       |   0
 .../common/src/Common/Error/UserInputError.php     |   0
 .../common/src/Common/HydratorStrategyTrait.php    |   0
 .../php-opencloud/common/src/Common/JsonPath.php   |   0
 .../common/src/Common/JsonSchema/JsonPatch.php     |   0
 .../common/src/Common/JsonSchema/Schema.php        |   0
 .../src/Common/Resource/AbstractResource.php       |   0
 .../common/src/Common/Resource/Creatable.php       |   0
 .../common/src/Common/Resource/Deletable.php       |   0
 .../common/src/Common/Resource/HasMetadata.php     |   0
 .../common/src/Common/Resource/HasWaiterTrait.php  |   0
 .../common/src/Common/Resource/Iterator.php        |   0
 .../common/src/Common/Resource/Listable.php        |   0
 .../src/Common/Resource/ResourceInterface.php      |   0
 .../common/src/Common/Resource/Retrievable.php     |   0
 .../common/src/Common/Resource/Updateable.php      |   0
 .../common/src/Common/Service/AbstractService.php  |   0
 .../common/src/Common/Service/Builder.php          |   0
 .../common/src/Common/Service/ServiceInterface.php |   0
 .../common/src/Common/Transport/HandlerStack.php   |   0
 .../common/src/Common/Transport/JsonSerializer.php |   0
 .../common/src/Common/Transport/Middleware.php     |   0
 .../src/Common/Transport/RequestSerializer.php     |   0
 .../common/src/Common/Transport/Utils.php          |   0
 .../common/tests/integration/DefaultLogger.php     |   0
 .../common/tests/integration/Runner.php            |   0
 .../common/tests/integration/SampleManager.php     |   0
 .../tests/integration/SampleManagerInterface.php   |   0
 .../common/tests/integration/TestCase.php          |   0
 .../common/tests/integration/TestInterface.php     |   0
 .../common/tests/integration/Utils.php             |   0
 .../php-opencloud/common/tests/integration/run.php |   0
 .../common/tests/unit/Common/Api/OperationTest.php |   0
 .../common/tests/unit/Common/Api/OperatorTest.php  |   0
 .../common/tests/unit/Common/Api/ParameterTest.php |   0
 .../tests/unit/Common/Api/fixtures/headers.php     |   0
 .../tests/unit/Common/Api/fixtures/jsonBody.php    |   0
 .../tests/unit/Common/ArrayAccessTraitTest.php     |   0
 .../tests/unit/Common/Auth/AuthHandlerTest.php     |   0
 .../common/tests/unit/Common/DateTime.php          |   0
 .../unit/Common/Error/BadResponseErrorTest.php     |   0
 .../common/tests/unit/Common/Error/BuilderTest.php |   0
 .../tests/unit/Common/HydratorStrategyTraitTes.php |   0
 .../common/tests/unit/Common/JsonPathTest.php      |   0
 .../Common/JsonSchema/Fixtures/jsonPatchTests.json |   0
 .../tests/unit/Common/JsonSchema/JsonPatchTest.php |   0
 .../tests/unit/Common/JsonSchema/SchemaTest.php    |   0
 .../unit/Common/Resource/AbstractResourceTest.php  |   0
 .../Common/Resource/Fixtures/servers-empty.resp    |   0
 .../Common/Resource/Fixtures/servers-page1.resp    |   0
 .../Common/Resource/Fixtures/servers-page2.resp    |   0
 .../tests/unit/Common/Service/BuilderTest.php      |   0
 .../unit/Common/Transport/HandlerStackTest.php     |   0
 .../unit/Common/Transport/JsonSerializerTest.php   |   0
 .../tests/unit/Common/Transport/MiddlewareTest.php |   0
 .../Common/Transport/RequestSerializerTest.php     |   0
 .../tests/unit/Common/Transport/UtilsTest.php      |   0
 .../common/tests/unit/Fixtures/ComputeV2Api.php    |   0
 .../common/tests/unit/Fixtures/IdentityV2Api.php   |   0
 .../common/tests/unit/Fixtures/IdentityV3Api.php   |   0
 .../php-opencloud/common/tests/unit/TestCase.php   |   0
 server/vendor/psr/http-message/LICENSE             |   0
 server/vendor/psr/http-message/README.md           |   0
 server/vendor/psr/http-message/composer.json       |   0
 .../psr/http-message/src/MessageInterface.php      |   0
 .../psr/http-message/src/RequestInterface.php      |   0
 .../psr/http-message/src/ResponseInterface.php     |   0
 .../http-message/src/ServerRequestInterface.php    |   0
 .../psr/http-message/src/StreamInterface.php       |   0
 .../psr/http-message/src/UploadedFileInterface.php |   0
 .../vendor/psr/http-message/src/UriInterface.php   |   0
 284 files changed, 143 insertions(+), 33 deletions(-)
 create mode 100644 client/js/controllers/image/upload.js
 create mode 100644 client/vendors/angularjs/angular-file-upload.min.js
 create mode 100644 client/vendors/angularjs/angular-upload.min.js
 create mode 100644 client/vendors/jquery/dmuploader.min.js
 mode change 100644 => 100755 server/Readme.md
 mode change 100644 => 100755 server/Test/DisplayNetIds.php
 mode change 100644 => 100755 server/Test/computeTest.php
 mode change 100644 => 100755 server/Test/create_network.php
 mode change 100644 => 100755 server/Test/create_subnet.php
 mode change 100644 => 100755 server/Test/genTokenOptionsTest.php
 mode change 100644 => 100755 server/Test/imageTests.php
 mode change 100644 => 100755 server/composer.json
 mode change 100644 => 100755 server/composer.lock
 mode change 100644 => 100755 server/composer.phar
 mode change 100644 => 100755 server/config.inc.php
 mode change 100644 => 100755 server/core/CoreInterface.php
 mode change 100644 => 100755 server/core/LibOverride/projectTokenData/demo
 mode change 100644 => 100755 server/core/Network.php
 mode change 100644 => 100755 server/core/Plugin.php
 mode change 100644 => 100755 server/core/Plugin_Api.php
 mode change 100644 => 100755 server/core/Readme.txt
 mode change 100644 => 100755 server/create_serv.php
 mode change 100644 => 100755 server/modules/Readme.txt
 mode change 100644 => 100755 server/vendor/autoload.php
 mode change 100644 => 100755 server/vendor/composer/ClassLoader.php
 mode change 100644 => 100755 server/vendor/composer/LICENSE
 mode change 100644 => 100755 server/vendor/composer/autoload_classmap.php
 mode change 100644 => 100755 server/vendor/composer/autoload_files.php
 mode change 100644 => 100755 server/vendor/composer/autoload_namespaces.php
 mode change 100644 => 100755 server/vendor/composer/autoload_psr4.php
 mode change 100644 => 100755 server/vendor/composer/autoload_real.php
 mode change 100644 => 100755 server/vendor/composer/installed.json
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/.travis.yml
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/CHANGELOG.md
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/LICENSE
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/README.md
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/UPGRADING.md
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/composer.json
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/Client.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/ClientInterface.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/Exception/ClientException.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/Exception/SeekException.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/Handler/CurlHandler.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/Handler/EasyHandle.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/HandlerStack.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/MessageFormatter.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/Middleware.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/Pool.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/RequestOptions.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/TransferStats.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/UriTemplate.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/functions.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/guzzle/src/functions_include.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/.gitignore
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/.travis.yml
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/CHANGELOG.md
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/LICENSE
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/Makefile
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/README.md
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/composer.json
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/phpunit.xml.dist
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/src/AggregateException.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/src/CancellationException.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/src/EachPromise.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/src/FulfilledPromise.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/src/Promise.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/src/PromiseInterface.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/src/PromisorInterface.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/src/RejectedPromise.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/src/RejectionException.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/src/TaskQueue.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/src/functions.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/src/functions_include.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/tests/AggregateExceptionTest.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/tests/EachPromiseTest.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/tests/FulfilledPromiseTest.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/tests/NotPromiseInstance.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/tests/PromiseTest.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/tests/RejectedPromiseTest.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/tests/RejectionExceptionTest.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/tests/TaskQueueTest.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/tests/Thennable.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/tests/bootstrap.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/promises/tests/functionsTest.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/.gitignore
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/.travis.yml
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/CHANGELOG.md
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/LICENSE
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/Makefile
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/README.md
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/composer.json
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/phpunit.xml.dist
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/src/AppendStream.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/src/BufferStream.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/src/CachingStream.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/src/DroppingStream.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/src/FnStream.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/src/InflateStream.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/src/LazyOpenStream.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/src/LimitStream.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/src/MessageTrait.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/src/MultipartStream.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/src/NoSeekStream.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/src/PumpStream.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/src/Request.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/src/Response.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/src/Stream.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/src/StreamDecoratorTrait.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/src/StreamWrapper.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/src/Uri.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/src/functions.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/src/functions_include.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/tests/AppendStreamTest.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/tests/BufferStreamTest.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/tests/CachingStreamTest.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/tests/DroppingStreamTest.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/tests/FnStreamTest.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/tests/FunctionsTest.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/tests/InflateStreamTest.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/tests/LazyOpenStreamTest.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/tests/LimitStreamTest.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/tests/MultipartStreamTest.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/tests/NoSeekStreamTest.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/tests/PumpStreamTest.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/tests/RequestTest.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/tests/ResponseTest.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/tests/StreamDecoratorTraitTest.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/tests/StreamTest.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/tests/StreamWrapperTest.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/tests/UriTest.php
 mode change 100644 => 100755 server/vendor/guzzlehttp/psr7/tests/bootstrap.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/.gitattributes
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/LICENSE
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/README.md
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/bin/validate-json
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/composer.json
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/phpunit.xml.dist
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/CollectionConstraint.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Constraint.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/ConstraintInterface.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/EnumConstraint.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Factory.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/FormatConstraint.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/NumberConstraint.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/ObjectConstraint.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/SchemaConstraint.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/StringConstraint.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/TypeConstraint.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/UndefinedConstraint.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/Exception/InvalidArgumentException.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/Exception/InvalidSchemaMediaTypeException.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/Exception/InvalidSourceUriException.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/Exception/JsonDecodingException.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/Exception/ResourceNotFoundException.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/Exception/UriResolverException.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/RefResolver.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/Uri/Retrievers/AbstractRetriever.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/Uri/Retrievers/Curl.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/Uri/Retrievers/FileGetContents.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/Uri/Retrievers/PredefinedArray.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/Uri/Retrievers/UriRetrieverInterface.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/Uri/UriResolver.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/Uri/UriRetriever.php
 mode change 100644 => 100755 server/vendor/justinrainbow/json-schema/src/JsonSchema/Validator.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/.gitignore
 mode change 100644 => 100755 server/vendor/php-opencloud/common/composer.json
 mode change 100644 => 100755 server/vendor/php-opencloud/common/phpunit.xml.dist
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Api/AbstractApi.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Api/AbstractParams.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Api/ApiInterface.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Api/Operation.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Api/Operator.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Api/OperatorInterface.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Api/Parameter.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/ArrayAccessTrait.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Auth/AuthHandler.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Auth/Catalog.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Auth/IdentityService.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Auth/Token.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Error/BadResponseError.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Error/BaseError.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Error/Builder.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Error/NotImplementedError.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Error/UserInputError.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/HydratorStrategyTrait.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/JsonPath.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/JsonSchema/JsonPatch.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/JsonSchema/Schema.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Resource/AbstractResource.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Resource/Creatable.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Resource/Deletable.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Resource/HasMetadata.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Resource/HasWaiterTrait.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Resource/Iterator.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Resource/Listable.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Resource/ResourceInterface.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Resource/Retrievable.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Resource/Updateable.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Service/AbstractService.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Service/Builder.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Service/ServiceInterface.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Transport/HandlerStack.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Transport/JsonSerializer.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Transport/Middleware.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Transport/RequestSerializer.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/src/Common/Transport/Utils.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/integration/DefaultLogger.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/integration/Runner.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/integration/SampleManager.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/integration/SampleManagerInterface.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/integration/TestCase.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/integration/TestInterface.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/integration/Utils.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/integration/run.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Common/Api/OperationTest.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Common/Api/OperatorTest.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Common/Api/ParameterTest.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Common/Api/fixtures/headers.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Common/Api/fixtures/jsonBody.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Common/ArrayAccessTraitTest.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Common/Auth/AuthHandlerTest.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Common/DateTime.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Common/Error/BadResponseErrorTest.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Common/Error/BuilderTest.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Common/HydratorStrategyTraitTes.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Common/JsonPathTest.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Common/JsonSchema/Fixtures/jsonPatchTests.json
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Common/JsonSchema/JsonPatchTest.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Common/JsonSchema/SchemaTest.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Common/Resource/AbstractResourceTest.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Common/Resource/Fixtures/servers-empty.resp
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Common/Resource/Fixtures/servers-page1.resp
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Common/Resource/Fixtures/servers-page2.resp
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Common/Service/BuilderTest.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Common/Transport/HandlerStackTest.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Common/Transport/JsonSerializerTest.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Common/Transport/MiddlewareTest.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Common/Transport/RequestSerializerTest.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Common/Transport/UtilsTest.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Fixtures/ComputeV2Api.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Fixtures/IdentityV2Api.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/Fixtures/IdentityV3Api.php
 mode change 100644 => 100755 server/vendor/php-opencloud/common/tests/unit/TestCase.php
 mode change 100644 => 100755 server/vendor/psr/http-message/LICENSE
 mode change 100644 => 100755 server/vendor/psr/http-message/README.md
 mode change 100644 => 100755 server/vendor/psr/http-message/composer.json
 mode change 100644 => 100755 server/vendor/psr/http-message/src/MessageInterface.php
 mode change 100644 => 100755 server/vendor/psr/http-message/src/RequestInterface.php
 mode change 100644 => 100755 server/vendor/psr/http-message/src/ResponseInterface.php
 mode change 100644 => 100755 server/vendor/psr/http-message/src/ServerRequestInterface.php
 mode change 100644 => 100755 server/vendor/psr/http-message/src/StreamInterface.php
 mode change 100644 => 100755 server/vendor/psr/http-message/src/UploadedFileInterface.php
 mode change 100644 => 100755 server/vendor/psr/http-message/src/UriInterface.php

(limited to 'server/core/Network.php')

diff --git a/.gitignore b/.gitignore
index 00495dc..424829c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/nbproject
\ No newline at end of file
+nbproject
\ No newline at end of file
diff --git a/client/index.html b/client/index.html
index 08be038..97e0734 100644
--- a/client/index.html
+++ b/client/index.html
@@ -66,7 +66,8 @@
     
     <!-- Include JQuery -->
     <script src="./vendors/jquery/jquery-2.2.0.min.js"></script>
-	
+	<script src="./vendors/jquery/dmuploader.min.js"></script>
+
     <!-- Include Bootstrap -->
     <script src="./vendors/bootstrap/js/bootstrap.min.js"></script>
     
@@ -75,6 +76,7 @@
     <script src="./vendors/angularjs/angular-route.min.js"></script>
     <script src="./vendors/angularjs/angular-sanitize.min.js"></script>
     <script src="./vendors/angularjs/angular-cookies.min.js"></script>
+	<script src="./vendors/angularjs/angular-upload.min.js"></script>
     <script src="./js/app.js"></script>
     
     <!-- Include services -->
@@ -90,6 +92,7 @@
     <script src="./js/controllers/home/machineDetails.js"></script>	
     <script src="./js/controllers/network/network.js"></script>
 	<script src="./js/controllers/image/image.js"></script>
+	<script src="./js/controllers/image/upload.js"></script>
 
     
     
diff --git a/client/js/app.js b/client/js/app.js
index 1602e65..f571cb7 100644
--- a/client/js/app.js
+++ b/client/js/app.js
@@ -3,7 +3,7 @@
  * The main app module instance
  * @type angular.module.angular-1_3_6_L1749.moduleInstance
  */
-var mainApp=angular.module("mainApp",['ngRoute', 'ngSanitize', 'ngCookies']);
+var mainApp=angular.module("mainApp",['ngRoute', 'ngSanitize', 'ngCookies','lr.upload']);
 
 /**
  * Configure routeProvider
diff --git a/client/js/controllers/home/home.js b/client/js/controllers/home/home.js
index 2b355b1..835d6ac 100644
--- a/client/js/controllers/home/home.js
+++ b/client/js/controllers/home/home.js
@@ -29,7 +29,7 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
 
 	
 	if(Identity.isAlreadyLogin()){
-		if(Compute.getData().machines == null{
+		if(Compute.getData().machines == null){
 			Loading.start();
 			Compute.pullData(callMeAfterPullData);		
 		}
diff --git a/client/js/controllers/image/image.js b/client/js/controllers/image/image.js
index b0b162b..d9a9c06 100644
--- a/client/js/controllers/image/image.js
+++ b/client/js/controllers/image/image.js
@@ -11,9 +11,6 @@ mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', 'Identity', funct
 		Loading.stop();
 	};
 
-	$scope.doUpload = function () {
-		Image.uploadImage($scope.myFile,function(){});
-	};
 	
 	if(Identity.isAlreadyLogin()){
 
diff --git a/client/js/controllers/image/upload.js b/client/js/controllers/image/upload.js
new file mode 100644
index 0000000..eca9406
--- /dev/null
+++ b/client/js/controllers/image/upload.js
@@ -0,0 +1,60 @@
+/**
+ * The image controller
+ * 
+ * @param {$scope} $scope The $scope service from angular
+ */
+mainApp.controller('uploadImageCtrl', ['$scope', 'Image', 'Loading', 'Identity', 'upload', function ($scope, Image, Loading, Identity,upload)
+{
+        /*$scope.uploader = new FileUploader({
+					"token" : Identity.getToken(),
+					"task" : "image",
+					'action':'uploadImage',
+					'id':'6564'
+				});
+        $scope.uploader.url='../server/index.php'
+        $scope.uploader.alias='file_name'
+        $scope.uploader.formData={
+					"token" : Identity.getToken(),
+					"task" : "image",
+					'action':'uploadImage',
+					'id':'6564'
+				}
+	*/
+
+	$scope.doUpload = function () {
+		console.log($('#imageToUpload').prop('files')[0]); 
+		Image.uploadImage($('#imageToUpload').prop('files')[0], function(){alert("done")})
+		/*$("#drop-area-div").dmUploader({
+				extraData: 	{
+				"token" : Identity.getToken(),
+				"task" : "image",
+				'action':'uploadImage',
+				'id':'6564'},
+				url:"../server/index.php"
+		});
+		*/
+		
+		/*upload({
+			url: '../server/index.php',
+			method: 'POST',
+			data: {
+			"token" : Identity.getToken(),
+			"task" : "image",
+			'action':'uploadImage',
+			'id':'6564',
+			"file_name": $scope.myFile, // a jqLite type="file" element, upload() will extract all the files from the input and put them into the FormData object before sending.
+			}
+		}).then(
+			  function (response) {
+				console.log(response.data); // will output whatever you choose to return from the server on a successful upload
+			  },
+			  function (response) {
+				  console.error(response); //  Will return if status code is above 200 and lower than 300, same as $http
+			  }
+		);*/
+    
+    
+	};
+	
+
+}]);
diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js
index 63cb6d1..fed358d 100644
--- a/client/js/controllers/login.js
+++ b/client/js/controllers/login.js
@@ -9,15 +9,15 @@
  */
 mainApp.controller('loginCtrl', ['$scope','$sce','Identity', function ($scope,$sce, Identity)
 {
-	// Check for login and define default states
-	if(!Identity.isAlreadyLogin()){
-		$('#loginModal').modal({backdrop: 'static', keyboard: false});
-	}
+    // Check for login and define default states
+    if(!Identity.isAlreadyLogin()){
+        $('#loginModal').modal({backdrop: 'static', keyboard: false});
+    }
 
-	// Manager logout event
-	$scope.$on('logoutEvent', function(){
-		$('#loginModal').modal({backdrop: 'static', keyboard: false});
-	});
+    // Manager logout event
+    $scope.$on('logoutEvent', function(){
+        $('#loginModal').modal({backdrop: 'static', keyboard: false});
+    });
 
 
 	
diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js
index b4a5dd9..15850f4 100644
--- a/client/js/controllers/status.js
+++ b/client/js/controllers/status.js
@@ -15,7 +15,7 @@ mainApp.controller('statusCtrl', ['$scope','Identity', '$rootScope', function ($
 	
     // Function to logout
     $scope.logout=function(){
-		Identity.logout();
-	};
+        Identity.logout();
+    };
 
 }]);
diff --git a/client/js/services/Identity.js b/client/js/services/Identity.js
index f9d1df4..1e8d9ff 100644
--- a/client/js/services/Identity.js
+++ b/client/js/services/Identity.js
@@ -1,5 +1,5 @@
 
-mainApp.factory('Identity',[ '$http', '$cookies',  function($http, $cookies){
+mainApp.factory('Identity',[ '$http', '$cookies', '$rootScope', function($http, $cookies, $rootScope){
 
 	/* Create profile structure to store informations
 	 * about current session
@@ -27,17 +27,20 @@ mainApp.factory('Identity',[ '$http', '$cookies',  function($http, $cookies){
 		   && typeof tokenPart_1InCookie !== 'undefined'
 		  ){
 
-			if(token!==null){
+			//if(token!==null){
 				// If yes, put it into variables
 				angular.extend(profile, profileInCookie);
 				token=tokenPart_0InCookie+tokenPart_1InCookie;
 				
-			}
+			//}
 
 			// Return I'm Login
 			return true;
 		}
-
+                
+                // Show the login overlay
+                $rootScope.$broadcast("logoutEvent");
+                
 		// Return I'm not Login
 		return false;
 	}
@@ -56,7 +59,9 @@ mainApp.factory('Identity',[ '$http', '$cookies',  function($http, $cookies){
 		profile.projectname=null;
 
 		// Reload Page
-		location.reload();
+		//location.reload();
+                $rootScope.$broadcast("logoutEvent");
+
 	}
 
 	
diff --git a/client/js/services/Image.js b/client/js/services/Image.js
index decb5b2..d427e51 100644
--- a/client/js/services/Image.js
+++ b/client/js/services/Image.js
@@ -45,17 +45,42 @@ mainApp.factory('Image',[ '$http', 'Identity', function($http, Identity){
 	};
 
 	var uploadImage=function(fileToUpload, callback) {
-
-
-		var result=$http.post('../server/index.php',
-							  $.param({"token" : Identity.getToken(), "task" : "image", 'action':'uploadImage', 'filename':fileToUpload, 'id':'6564'}));  
+		var form_data = new FormData();                  
+		form_data.append('file', fileToUpload);
+		console.log(fileToUpload)
+		form_data.append("task" , "image")
+		form_data.append("token" , Identity.getToken())
+		form_data.append('action',"uploadImage")
+		form_data.append('id','6564')
+		form_data.append('file_name', fileToUpload.name);
+
+		$.ajax({
+		url: "../server/index.php", // Url to which the request is send
+		type: "POST",             // Type of request to be send, called as method
+		data: form_data, // Data sent to server, a set of key/value pairs (i.e. form fields and values)
+		file_name:fileToUpload.name,
+		token : Identity.getToken(),
+		task : "image",
+		action:'uploadImage',
+		id:'6564',
+		contentType: false,       // The content type used when sending data to the server.
+		cache: false,             // To unable request pages to be cached
+		processData:false,        // To send DOMDocument or non processed data file it is set to false
+		success: function(data)   // A function to be called if request succeeds
+			{
+				alert("success")
+			}
+		});
+
+		//var result=$http.post('../server/index.php',
+			//				  $.param({"token" : Identity.getToken(), "task" : "image", 'action':'uploadImage', 'file_name':form_data, 'id':'6564'}));  
 
 		// Wait and handle the response
-        result.then(function (response){
+     /*   result.then(function (response){
 			callback(parseUploadImageAnswer(response, false));
         },function(response){
 			callback(parseUploadImageAnswer(response, true));
-        });
+        });*/
 
 
 		  
diff --git a/client/partials/image/upload.html b/client/partials/image/upload.html
index 9049abf..72a8e01 100644
--- a/client/partials/image/upload.html
+++ b/client/partials/image/upload.html
@@ -1,4 +1,4 @@
-<div class="modal fade" id="uploadImageModal" ng-controller="loginCtrl">
+<div class="modal fade" id="uploadImageModal" ng-controller="uploadImageCtrl">
     <div class="modal-dialog">
         <div class="modal-content"></div>
     </div>
@@ -12,13 +12,16 @@
 			
             <div class="modal-body">
 
-				<label class="control-label">Select File</label>
-				<input id="input-1" type="file" class="file">
-				<p></p>
+
+
+					Choose a file to upload: <input id="imageToUpload" name="uploaded_file" type="file" />
+					<input type="submit" value="Upload" />
+				
+				
 				<div class="modal-footer"> 
                 <!--<a href="#" data-dismiss="modal" class="btn btn-default">Close</a>-->
                 
-                <a href="#" class="btn btn-lg btn-primary btn-block" id="loginButton">Upload</a>
+                <a class="btn btn-lg btn-primary btn-block" id="loginButton" ng-click="doUpload()">Upload</a>
             </div>
         </div>
     </div>
diff --git a/client/vendors/angularjs/angular-file-upload.min.js b/client/vendors/angularjs/angular-file-upload.min.js
new file mode 100644
index 0000000..871ca34
--- /dev/null
+++ b/client/vendors/angularjs/angular-file-upload.min.js
@@ -0,0 +1,7 @@
+/*
+ angular-file-upload v2.2.0
+ https://github.com/nervgh/angular-file-upload
+*/
+
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports["angular-file-upload"]=t():e["angular-file-upload"]=t()}(this,function(){return function(e){function t(r){if(n[r])return n[r].exports;var i=n[r]={exports:{},id:r,loaded:!1};return e[r].call(i.exports,i,i.exports,t),i.loaded=!0,i.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([function(e,t,n){"use strict";var r=function(e){return e&&e.__esModule?e["default"]:e},i=r(n(1)),o=r(n(2)),s=r(n(3)),a=r(n(4)),u=r(n(5)),l=r(n(6)),c=r(n(7)),f=r(n(8)),p=r(n(9)),d=r(n(10)),v=r(n(11)),h=r(n(12));angular.module(i.name,[]).value("fileUploaderOptions",o).factory("FileUploader",s).factory("FileLikeObject",a).factory("FileItem",u).factory("FileDirective",l).factory("FileSelect",c).factory("FileDrop",f).factory("FileOver",p).directive("nvFileSelect",d).directive("nvFileDrop",v).directive("nvFileOver",h).run(["FileUploader","FileLikeObject","FileItem","FileDirective","FileSelect","FileDrop","FileOver",function(e,t,n,r,i,o,s){e.FileLikeObject=t,e.FileItem=n,e.FileDirective=r,e.FileSelect=i,e.FileDrop=o,e.FileOver=s}])},function(e,t){e.exports={name:"angularFileUpload"}},function(e,t){"use strict";e.exports={url:"/",alias:"file",headers:{},queue:[],progress:0,autoUpload:!1,removeAfterUpload:!1,method:"POST",filters:[],formData:[],queueLimit:Number.MAX_VALUE,withCredentials:!1}},function(e,t,n){"use strict";var r=function(e){return e&&e.__esModule?e["default"]:e},i=function(){function e(e,t){for(var n in t){var r=t[n];r.configurable=!0,r.value&&(r.writable=!0)}Object.defineProperties(e,t)}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),o=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},s=(r(n(1)),angular.copy),a=angular.extend,u=angular.forEach,l=angular.isObject,c=angular.isNumber,f=angular.isDefined,p=angular.isArray,d=angular.element;e.exports=function(e,t,n,r,v,h){var m=r.File,g=r.FormData,_=function(){function r(t){o(this,r);var n=s(e);a(this,n,t,{isUploading:!1,_nextIndex:0,_failFilterIndex:-1,_directives:{select:[],drop:[],over:[]}}),this.filters.unshift({name:"queueLimit",fn:this._queueLimitFilter}),this.filters.unshift({name:"folder",fn:this._folderFilter})}return i(r,{addToQueue:{value:function(e,t,n){var r=this,i=this.isArrayLikeObject(e)?e:[e],o=this._getFilters(n),s=this.queue.length,a=[];u(i,function(e){var n=new v(e);if(r._isValidFile(n,o,t)){var i=new h(r,e,t);a.push(i),r.queue.push(i),r._onAfterAddingFile(i)}else{var s=o[r._failFilterIndex];r._onWhenAddingFileFailed(n,s,t)}}),this.queue.length!==s&&(this._onAfterAddingAll(a),this.progress=this._getTotalProgress()),this._render(),this.autoUpload&&this.uploadAll()}},removeFromQueue:{value:function(e){var t=this.getIndexOfItem(e),n=this.queue[t];n.isUploading&&n.cancel(),this.queue.splice(t,1),n._destroy(),this.progress=this._getTotalProgress()}},clearQueue:{value:function(){for(;this.queue.length;)this.queue[0].remove();this.progress=0}},uploadItem:{value:function(e){var t=this.getIndexOfItem(e),n=this.queue[t],r=this.isHTML5?"_xhrTransport":"_iframeTransport";n._prepareToUploading(),this.isUploading||(this.isUploading=!0,this[r](n))}},cancelItem:{value:function(e){var t=this.getIndexOfItem(e),n=this.queue[t],r=this.isHTML5?"_xhr":"_form";n&&n.isUploading&&n[r].abort()}},uploadAll:{value:function(){var e=this.getNotUploadedItems().filter(function(e){return!e.isUploading});e.length&&(u(e,function(e){return e._prepareToUploading()}),e[0].upload())}},cancelAll:{value:function(){var e=this.getNotUploadedItems();u(e,function(e){return e.cancel()})}},isFile:{value:function(e){return this.constructor.isFile(e)}},isFileLikeObject:{value:function(e){return this.constructor.isFileLikeObject(e)}},isArrayLikeObject:{value:function(e){return this.constructor.isArrayLikeObject(e)}},getIndexOfItem:{value:function(e){return c(e)?e:this.queue.indexOf(e)}},getNotUploadedItems:{value:function(){return this.queue.filter(function(e){return!e.isUploaded})}},getReadyItems:{value:function(){return this.queue.filter(function(e){return e.isReady&&!e.isUploading}).sort(function(e,t){return e.index-t.index})}},destroy:{value:function(){var e=this;u(this._directives,function(t){u(e._directives[t],function(e){e.destroy()})})}},onAfterAddingAll:{value:function(e){}},onAfterAddingFile:{value:function(e){}},onWhenAddingFileFailed:{value:function(e,t,n){}},onBeforeUploadItem:{value:function(e){}},onProgressItem:{value:function(e,t){}},onProgressAll:{value:function(e){}},onSuccessItem:{value:function(e,t,n,r){}},onErrorItem:{value:function(e,t,n,r){}},onCancelItem:{value:function(e,t,n,r){}},onCompleteItem:{value:function(e,t,n,r){}},onCompleteAll:{value:function(){}},_getTotalProgress:{value:function(e){if(this.removeAfterUpload)return e||0;var t=this.getNotUploadedItems().length,n=t?this.queue.length-t:this.queue.length,r=100/this.queue.length,i=(e||0)*r/100;return Math.round(n*r+i)}},_getFilters:{value:function(e){if(!e)return this.filters;if(p(e))return e;var t=e.match(/[^\s,]+/g);return this.filters.filter(function(e){return-1!==t.indexOf(e.name)})}},_render:{value:function(){t.$$phase||t.$apply()}},_folderFilter:{value:function(e){return!(!e.size&&!e.type)}},_queueLimitFilter:{value:function(){return this.queue.length<this.queueLimit}},_isValidFile:{value:function(e,t,n){var r=this;return this._failFilterIndex=-1,t.length?t.every(function(t){return r._failFilterIndex++,t.fn.call(r,e,n)}):!0}},_isSuccessCode:{value:function(e){return e>=200&&300>e||304===e}},_transformResponse:{value:function(e,t){var r=this._headersGetter(t);return u(n.defaults.transformResponse,function(t){e=t(e,r)}),e}},_parseHeaders:{value:function(e){var t,n,r,i={};return e?(u(e.split("\n"),function(e){r=e.indexOf(":"),t=e.slice(0,r).trim().toLowerCase(),n=e.slice(r+1).trim(),t&&(i[t]=i[t]?i[t]+", "+n:n)}),i):i}},_headersGetter:{value:function(e){return function(t){return t?e[t.toLowerCase()]||null:e}}},_xhrTransport:{value:function(e){var t=this,n=e._xhr=new XMLHttpRequest,r=new g;if(this._onBeforeUploadItem(e),u(e.formData,function(e){u(e,function(e,t){r.append(t,e)})}),"number"!=typeof e._file.size)throw new TypeError("The file specified is no longer valid");r.append(e.alias,e._file,e.file.name),n.upload.onprogress=function(n){var r=Math.round(n.lengthComputable?100*n.loaded/n.total:0);t._onProgressItem(e,r)},n.onload=function(){var r=t._parseHeaders(n.getAllResponseHeaders()),i=t._transformResponse(n.response,r),o=t._isSuccessCode(n.status)?"Success":"Error",s="_on"+o+"Item";t[s](e,i,n.status,r),t._onCompleteItem(e,i,n.status,r)},n.onerror=function(){var r=t._parseHeaders(n.getAllResponseHeaders()),i=t._transformResponse(n.response,r);t._onErrorItem(e,i,n.status,r),t._onCompleteItem(e,i,n.status,r)},n.onabort=function(){var r=t._parseHeaders(n.getAllResponseHeaders()),i=t._transformResponse(n.response,r);t._onCancelItem(e,i,n.status,r),t._onCompleteItem(e,i,n.status,r)},n.open(e.method,e.url,!0),n.withCredentials=e.withCredentials,u(e.headers,function(e,t){n.setRequestHeader(t,e)}),n.send(r),this._render()}},_iframeTransport:{value:function(e){var t=this,n=d('<form style="display: none;" />'),r=d('<iframe name="iframeTransport'+Date.now()+'">'),i=e._input;e._form&&e._form.replaceWith(i),e._form=n,this._onBeforeUploadItem(e),i.prop("name",e.alias),u(e.formData,function(e){u(e,function(e,t){var r=d('<input type="hidden" name="'+t+'" />');r.val(e),n.append(r)})}),n.prop({action:e.url,method:"POST",target:r.prop("name"),enctype:"multipart/form-data",encoding:"multipart/form-data"}),r.bind("load",function(){var n="",i=200;try{n=r[0].contentDocument.body.innerHTML}catch(o){i=500}var s={response:n,status:i,dummy:!0},a={},u=t._transformResponse(s.response,a);t._onSuccessItem(e,u,s.status,a),t._onCompleteItem(e,u,s.status,a)}),n.abort=function(){var o,s={status:0,dummy:!0},a={};r.unbind("load").prop("src","javascript:false;"),n.replaceWith(i),t._onCancelItem(e,o,s.status,a),t._onCompleteItem(e,o,s.status,a)},i.after(n),n.append(i).append(r),n[0].submit(),this._render()}},_onWhenAddingFileFailed:{value:function(e,t,n){this.onWhenAddingFileFailed(e,t,n)}},_onAfterAddingFile:{value:function(e){this.onAfterAddingFile(e)}},_onAfterAddingAll:{value:function(e){this.onAfterAddingAll(e)}},_onBeforeUploadItem:{value:function(e){e._onBeforeUpload(),this.onBeforeUploadItem(e)}},_onProgressItem:{value:function(e,t){var n=this._getTotalProgress(t);this.progress=n,e._onProgress(t),this.onProgressItem(e,t),this.onProgressAll(n),this._render()}},_onSuccessItem:{value:function(e,t,n,r){e._onSuccess(t,n,r),this.onSuccessItem(e,t,n,r)}},_onErrorItem:{value:function(e,t,n,r){e._onError(t,n,r),this.onErrorItem(e,t,n,r)}},_onCancelItem:{value:function(e,t,n,r){e._onCancel(t,n,r),this.onCancelItem(e,t,n,r)}},_onCompleteItem:{value:function(e,t,n,r){e._onComplete(t,n,r),this.onCompleteItem(e,t,n,r);var i=this.getReadyItems()[0];return this.isUploading=!1,f(i)?void i.upload():(this.onCompleteAll(),this.progress=this._getTotalProgress(),void this._render())}}},{isFile:{value:function(e){return m&&e instanceof m}},isFileLikeObject:{value:function(e){return e instanceof v}},isArrayLikeObject:{value:function(e){return l(e)&&"length"in e}},inherit:{value:function(e,t){e.prototype=Object.create(t.prototype),e.prototype.constructor=e,e.super_=t}}}),r}();return _.prototype.isHTML5=!(!m||!g),_.isHTML5=_.prototype.isHTML5,_},e.exports.$inject=["fileUploaderOptions","$rootScope","$http","$window","FileLikeObject","FileItem"]},function(e,t,n){"use strict";var r=function(e){return e&&e.__esModule?e["default"]:e},i=function(){function e(e,t){for(var n in t){var r=t[n];r.configurable=!0,r.value&&(r.writable=!0)}Object.defineProperties(e,t)}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),o=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},s=(r(n(1)),angular.copy),a=angular.isElement,u=angular.isString;e.exports=function(){var e=function(){function e(t){o(this,e);var n=a(t),r=n?t.value:t,i=u(r)?"FakePath":"Object",s="_createFrom"+i;this[s](r)}return i(e,{_createFromFakePath:{value:function(e){this.lastModifiedDate=null,this.size=null,this.type="like/"+e.slice(e.lastIndexOf(".")+1).toLowerCase(),this.name=e.slice(e.lastIndexOf("/")+e.lastIndexOf("\\")+2)}},_createFromObject:{value:function(e){this.lastModifiedDate=s(e.lastModifiedDate),this.size=e.size,this.type=e.type,this.name=e.name}}}),e}();return e},e.exports.$inject=[]},function(e,t,n){"use strict";var r=function(e){return e&&e.__esModule?e["default"]:e},i=function(){function e(e,t){for(var n in t){var r=t[n];r.configurable=!0,r.value&&(r.writable=!0)}Object.defineProperties(e,t)}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),o=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},s=(r(n(1)),angular.copy),a=angular.extend,u=angular.element,l=angular.isElement;e.exports=function(e,t){var n=function(){function n(e,r,i){o(this,n);var c=l(r),f=c?u(r):null,p=c?null:r;a(this,{url:e.url,alias:e.alias,headers:s(e.headers),formData:s(e.formData),removeAfterUpload:e.removeAfterUpload,withCredentials:e.withCredentials,method:e.method},i,{uploader:e,file:new t(r),isReady:!1,isUploading:!1,isUploaded:!1,isSuccess:!1,isCancel:!1,isError:!1,progress:0,index:null,_file:p,_input:f}),f&&this._replaceNode(f)}return i(n,{upload:{value:function(){try{this.uploader.uploadItem(this)}catch(e){this.uploader._onCompleteItem(this,"",0,[]),this.uploader._onErrorItem(this,"",0,[])}}},cancel:{value:function(){this.uploader.cancelItem(this)}},remove:{value:function(){this.uploader.removeFromQueue(this)}},onBeforeUpload:{value:function(){}},onProgress:{value:function(e){}},onSuccess:{value:function(e,t,n){}},onError:{value:function(e,t,n){}},onCancel:{value:function(e,t,n){}},onComplete:{value:function(e,t,n){}},_onBeforeUpload:{value:function(){this.isReady=!0,this.isUploading=!0,this.isUploaded=!1,this.isSuccess=!1,this.isCancel=!1,this.isError=!1,this.progress=0,this.onBeforeUpload()}},_onProgress:{value:function(e){this.progress=e,this.onProgress(e)}},_onSuccess:{value:function(e,t,n){this.isReady=!1,this.isUploading=!1,this.isUploaded=!0,this.isSuccess=!0,this.isCancel=!1,this.isError=!1,this.progress=100,this.index=null,this.onSuccess(e,t,n)}},_onError:{value:function(e,t,n){this.isReady=!1,this.isUploading=!1,this.isUploaded=!0,this.isSuccess=!1,this.isCancel=!1,this.isError=!0,this.progress=0,this.index=null,this.onError(e,t,n)}},_onCancel:{value:function(e,t,n){this.isReady=!1,this.isUploading=!1,this.isUploaded=!1,this.isSuccess=!1,this.isCancel=!0,this.isError=!1,this.progress=0,this.index=null,this.onCancel(e,t,n)}},_onComplete:{value:function(e,t,n){this.onComplete(e,t,n),this.removeAfterUpload&&this.remove()}},_destroy:{value:function(){this._input&&this._input.remove(),this._form&&this._form.remove(),delete this._form,delete this._input}},_prepareToUploading:{value:function(){this.index=this.index||++this.uploader._nextIndex,this.isReady=!0}},_replaceNode:{value:function(t){var n=e(t.clone())(t.scope());n.prop("value",null),t.css("display","none"),t.after(n)}}}),n}();return n},e.exports.$inject=["$compile","FileLikeObject"]},function(e,t,n){"use strict";var r=function(e){return e&&e.__esModule?e["default"]:e},i=function(){function e(e,t){for(var n in t){var r=t[n];r.configurable=!0,r.value&&(r.writable=!0)}Object.defineProperties(e,t)}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),o=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},s=(r(n(1)),angular.extend);e.exports=function(){var e=function(){function e(t){o(this,e),s(this,t),this.uploader._directives[this.prop].push(this),this._saveLinks(),this.bind()}return i(e,{bind:{value:function(){for(var e in this.events){var t=this.events[e];this.element.bind(e,this[t])}}},unbind:{value:function(){for(var e in this.events)this.element.unbind(e,this.events[e])}},destroy:{value:function(){var e=this.uploader._directives[this.prop].indexOf(this);this.uploader._directives[this.prop].splice(e,1),this.unbind()}},_saveLinks:{value:function(){for(var e in this.events){var t=this.events[e];this[t]=this[t].bind(this)}}}}),e}();return e.prototype.events={},e},e.exports.$inject=[]},function(e,t,n){"use strict";var r=function(e){return e&&e.__esModule?e["default"]:e},i=function(){function e(e,t){for(var n in t){var r=t[n];r.configurable=!0,r.value&&(r.writable=!0)}Object.defineProperties(e,t)}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),o=function l(e,t,n){var r=Object.getOwnPropertyDescriptor(e,t);if(void 0===r){var i=Object.getPrototypeOf(e);return null===i?void 0:l(i,t,n)}if("value"in r&&r.writable)return r.value;var o=r.get;return void 0===o?void 0:o.call(n)},s=function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(e.__proto__=t)},a=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},u=(r(n(1)),angular.extend);e.exports=function(e){var t=function(e){function t(e){a(this,t);var n=u(e,{events:{$destroy:"destroy",change:"onChange"},prop:"select"});o(Object.getPrototypeOf(t.prototype),"constructor",this).call(this,n),this.uploader.isHTML5||this.element.removeAttr("multiple"),this.element.prop("value",null)}return s(t,e),i(t,{getOptions:{value:function(){}},getFilters:{value:function(){}},isEmptyAfterSelection:{value:function(){return!!this.element.attr("multiple")}},onChange:{value:function(){var e=this.uploader.isHTML5?this.element[0].files:this.element[0],t=this.getOptions(),n=this.getFilters();this.uploader.isHTML5||this.destroy(),this.uploader.addToQueue(e,t,n),this.isEmptyAfterSelection()&&(this.element.prop("value",null),this.element.replaceWith(this.element=this.element.clone(!0)))}}}),t}(e);return t},e.exports.$inject=["FileDirective"]},function(e,t,n){"use strict";var r=function(e){return e&&e.__esModule?e["default"]:e},i=function(){function e(e,t){for(var n in t){var r=t[n];r.configurable=!0,r.value&&(r.writable=!0)}Object.defineProperties(e,t)}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),o=function c(e,t,n){var r=Object.getOwnPropertyDescriptor(e,t);if(void 0===r){var i=Object.getPrototypeOf(e);return null===i?void 0:c(i,t,n)}if("value"in r&&r.writable)return r.value;var o=r.get;return void 0===o?void 0:o.call(n)},s=function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(e.__proto__=t)},a=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},u=(r(n(1)),angular.extend),l=angular.forEach;e.exports=function(e){var t=function(e){function t(e){a(this,t);var n=u(e,{events:{$destroy:"destroy",drop:"onDrop",dragover:"onDragOver",dragleave:"onDragLeave"},prop:"drop"});o(Object.getPrototypeOf(t.prototype),"constructor",this).call(this,n)}return s(t,e),i(t,{getOptions:{value:function(){}},getFilters:{value:function(){}},onDrop:{value:function(e){var t=this._getTransfer(e);if(t){var n=this.getOptions(),r=this.getFilters();this._preventAndStop(e),l(this.uploader._directives.over,this._removeOverClass,this),this.uploader.addToQueue(t.files,n,r)}}},onDragOver:{value:function(e){var t=this._getTransfer(e);this._haveFiles(t.types)&&(t.dropEffect="copy",this._preventAndStop(e),l(this.uploader._directives.over,this._addOverClass,this))}},onDragLeave:{value:function(e){e.currentTarget!==this.element[0]&&(this._preventAndStop(e),l(this.uploader._directives.over,this._removeOverClass,this))}},_getTransfer:{value:function(e){return e.dataTransfer?e.dataTransfer:e.originalEvent.dataTransfer}},_preventAndStop:{value:function(e){e.preventDefault(),e.stopPropagation()}},_haveFiles:{value:function(e){return e?e.indexOf?-1!==e.indexOf("Files"):e.contains?e.contains("Files"):!1:!1}},_addOverClass:{value:function(e){e.addOverClass()}},_removeOverClass:{value:function(e){e.removeOverClass()}}}),t}(e);return t},e.exports.$inject=["FileDirective"]},function(e,t,n){"use strict";var r=function(e){return e&&e.__esModule?e["default"]:e},i=function(){function e(e,t){for(var n in t){var r=t[n];r.configurable=!0,r.value&&(r.writable=!0)}Object.defineProperties(e,t)}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),o=function l(e,t,n){var r=Object.getOwnPropertyDescriptor(e,t);if(void 0===r){var i=Object.getPrototypeOf(e);return null===i?void 0:l(i,t,n)}if("value"in r&&r.writable)return r.value;var o=r.get;return void 0===o?void 0:o.call(n)},s=function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(e.__proto__=t)},a=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")},u=(r(n(1)),angular.extend);e.exports=function(e){var t=function(e){function t(e){a(this,t);var n=u(e,{events:{$destroy:"destroy"},prop:"over",overClass:"nv-file-over"});o(Object.getPrototypeOf(t.prototype),"constructor",this).call(this,n)}return s(t,e),i(t,{addOverClass:{value:function(){this.element.addClass(this.getOverClass())}},removeOverClass:{value:function(){this.element.removeClass(this.getOverClass())}},getOverClass:{value:function(){return this.overClass}}}),t}(e);return t},e.exports.$inject=["FileDirective"]},function(e,t,n){"use strict";var r=function(e){return e&&e.__esModule?e["default"]:e};r(n(1));e.exports=function(e,t,n){return{link:function(r,i,o){var s=r.$eval(o.uploader);if(!(s instanceof t))throw new TypeError('"Uploader" must be an instance of FileUploader');var a=new n({uploader:s,element:i});a.getOptions=e(o.options).bind(a,r),a.getFilters=function(){return o.filters}}}},e.exports.$inject=["$parse","FileUploader","FileSelect"]},function(e,t,n){"use strict";var r=function(e){return e&&e.__esModule?e["default"]:e};r(n(1));e.exports=function(e,t,n){return{link:function(r,i,o){var s=r.$eval(o.uploader);if(!(s instanceof t))throw new TypeError('"Uploader" must be an instance of FileUploader');if(s.isHTML5){var a=new n({uploader:s,element:i});a.getOptions=e(o.options).bind(a,r),a.getFilters=function(){return o.filters}}}}},e.exports.$inject=["$parse","FileUploader","FileDrop"]},function(e,t,n){"use strict";var r=function(e){return e&&e.__esModule?e["default"]:e};r(n(1));e.exports=function(e,t){return{link:function(n,r,i){var o=n.$eval(i.uploader);if(!(o instanceof e))throw new TypeError('"Uploader" must be an instance of FileUploader');var s=new t({uploader:o,element:r});s.getOverClass=function(){return i.overClass||s.overClass}}}},e.exports.$inject=["FileUploader","FileOver"]}])});
+//# sourceMappingURL=angular-file-upload.min.js.map
\ No newline at end of file
diff --git a/client/vendors/angularjs/angular-upload.min.js b/client/vendors/angularjs/angular-upload.min.js
new file mode 100644
index 0000000..d75b94b
--- /dev/null
+++ b/client/vendors/angularjs/angular-upload.min.js
@@ -0,0 +1 @@
+"use strict";angular.module("lr.upload",["lr.upload.formdata","lr.upload.iframe","lr.upload.directives"]),angular.module("lr.upload.directives",[]),angular.module("lr.upload.directives").directive("uploadButton",["upload",function(a){return{restrict:"EA",scope:{data:"=?data",url:"@",id:"@",param:"@",method:"@",onUpload:"&",onSuccess:"&",onError:"&",onComplete:"&"},link:function(b,c,d){var e=angular.element(c),f=angular.element('<input id="'+b.id+'" type="file" />');if(e.append(f),f.on("change",function(){var c=angular.element(this);if(!c[0].files||0!==c[0].files.length){var e={url:b.url,method:b.method||"POST",forceIFrameUpload:b.$eval(d.forceIframeUpload)||!1,data:b.data||{}};e.data[b.param||"file"]=c,b.$apply(function(){b.onUpload({files:c[0].files})}),a(e).then(function(a){b.onSuccess({response:a}),b.onComplete({response:a})},function(a){b.onError({response:a}),b.onComplete({response:a})})}}),"required"in d&&d.$observe("required",function(a){var d=""===a?!0:b.$eval(a);f.attr("required",d),c.toggleClass("ng-valid",!d),c.toggleClass("ng-invalid ng-invalid-required",d)}),"accept"in d&&d.$observe("accept",function(a){f.attr("accept",a)}),a.support.formData){var g=function(){f.attr("multiple",!(!b.$eval(d.multiple)||b.$eval(d.forceIframeUpload)))};d.$observe("multiple",g),d.$observe("forceIframeUpload",g)}}}}]),angular.module("lr.upload.formdata",[]).factory("formDataTransform",function(){return function(a){var b=new FormData;return angular.forEach(a,function(a,c){if(angular.isElement(a)){var d=[];angular.forEach(a,function(a){angular.forEach(a.files,function(a){d.push(a)}),a.value=""}),0!==d.length&&(d.length>1?angular.forEach(d,function(a,d){b.append(c+"["+d+"]",a)}):b.append(c,d[0]))}else b.append(c,a)}),b}}).factory("formDataUpload",["$http","formDataTransform",function(a,b){return function(c){return c.transformRequest=b,c.method=c.method||"POST",c.headers=angular.extend(c.headers||{},{"Content-Type":void 0}),a(c)}}]),angular.module("lr.upload.iframe",[]).factory("iFrameUpload",["$q","$http","$document","$rootScope",function(a,b,c,d){function e(a,b){if(a.indexOf)return a.indexOf(b);for(var c=0;c<a.length;c++)if(b===a[c])return c;return-1}function f(f){var g=[],h=a.defer(),i=h.promise;angular.forEach(f.data||{},function(a,b){angular.isElement(a)&&(delete f.data[b],a.attr("name",b),g.push(a))});var j=/\?/.test(f.url)?"&":"?";"DELETE"===f.method?(f.url=f.url+j+"_method=DELETE",f.method="POST"):"PUT"===f.method?(f.url=f.url+j+"_method=PUT",f.method="POST"):"PATCH"===f.method&&(f.url=f.url+j+"_method=PATCH",f.method="POST");var k=angular.element(c[0].body),l=d.$new(),m="iframe-transport-"+l.$id;l.$destroy();var n=angular.element("<form></form>");n.attr("target",m),n.attr("action",f.url),n.attr("method",f.method||"POST"),n.css("display","none"),g.length&&(n.attr("enctype","multipart/form-data"),n.attr("encoding","multipart/form-data"));var o=angular.element('<iframe name="'+m+'" src="javascript:false;"></iframe>');return o.on("load",function(){function a(a,b){var c=[];return angular.isFunction(b)?b(a,c):(angular.forEach(b,function(b){a=b(a,c)}),a)}function c(){var a=e(b.pendingRequests,f);-1!==a&&(b.pendingRequests.splice(a,1),f.$iframeTransportForm.remove(),delete f.$iframeTransportForm)}o.off("load").on("load",function(){var c;try{var d=this.contentWindow?this.contentWindow.document:this.contentDocument;if(c=angular.element(d.body).text(),!c.length)throw new Error}catch(e){}n.append(angular.element('<iframe src="javascript:false;"></iframe>'));try{c=a(c,b.defaults.transformResponse)}catch(e){}h.resolve({data:c,status:200,headers:[],config:f})}),angular.forEach(f.data,function(a,b){var c=angular.element('<input type="hidden" />');c.attr("name",b),c.val(a),n.append(c)}),angular.forEach(g,function(a){var b=a.clone(!0);a.after(b),n.append(a)}),f.$iframeTransportForm=n,b.pendingRequests.push(f),n[0].submit(),i.then(c,c)}),n.append(o),k.append(n),i}return f}]),angular.module("lr.upload").factory("upload",["$window","formDataUpload","iFrameUpload",function(a,b,c){function d(a){return e.formData&&!a.forceIFrameUpload?b(a):c(a)}var e={fileInput:!(new RegExp("(Android (1\\.[0156]|2\\.[01]))|(Windows Phone (OS 7|8\\.0))|(XBLWP)|(ZuneWP)|(WPDesktop)|(w(eb)?OSBrowser)|(webOS)|(Kindle/(1\\.0|2\\.[05]|3\\.0))").test(a.navigator.userAgent)||angular.element('<input type="file">').prop("disabled")),fileUpload:!(!a.XMLHttpRequestUpload||!a.FileReader),formData:!!a.FormData};return d.support=e,d}]);
\ No newline at end of file
diff --git a/client/vendors/jquery/dmuploader.min.js b/client/vendors/jquery/dmuploader.min.js
new file mode 100644
index 0000000..3c3231c
--- /dev/null
+++ b/client/vendors/jquery/dmuploader.min.js
@@ -0,0 +1,9 @@
+/*
+ * dmuploader.min.js - Jquery File Uploader - 0.1
+ * http://www.daniel.com.uy/projects/jquery-file-uploader/
+ * 
+ * Copyright (c) 2013 Daniel Morales
+ * Dual licensed under the MIT and GPL licenses.
+ * http://www.daniel.com.uy/doc/license/
+ */
+(function(t){var n="dmUploader";var r={url:document.URL,method:"POST",extraData:{},maxFileSize:0,allowedTypes:"*",extFilter:null,dataType:null,fileName:"file",onInit:function(){},onFallbackMode:function(){message},onNewFile:function(e,t){},onBeforeUpload:function(e){},onComplete:function(){},onUploadProgress:function(e,t){},onUploadSuccess:function(e,t){},onUploadError:function(e,t){},onFileTypeError:function(e){},onFileSizeError:function(e){},onFileExtError:function(e){}};var i=function(e,n){this.element=t(e);this.settings=t.extend({},r,n);if(!this.checkBrowser()){return false}this.init();return true};i.prototype.checkBrowser=function(){if(window.FormData===undefined){this.settings.onFallbackMode.call(this.element,"Browser doesn't support Form API");return false}if(this.element.find("input[type=file]").length>0){return true}if(!this.checkEvent("drop",this.element)||!this.checkEvent("dragstart",this.element)){this.settings.onFallbackMode.call(this.element,"Browser doesn't support Ajax Drag and Drop");return false}return true};i.prototype.checkEvent=function(e,t){var t=t||document.createElement("div");var e="on"+e;var n=e in t;if(!n){if(!t.setAttribute){t=document.createElement("div")}if(t.setAttribute&&t.removeAttribute){t.setAttribute(e,"");n=typeof t[e]=="function";if(typeof t[e]!="undefined"){t[e]=undefined}t.removeAttribute(e)}}t=null;return n};i.prototype.init=function(){var e=this;e.queue=new Array;e.queuePos=-1;e.queueRunning=false;e.element.on("drop",function(t){t.preventDefault();var n=t.originalEvent.dataTransfer.files;e.queueFiles(n)});e.element.find("input[type=file]").on("change",function(n){var r=n.target.files;e.queueFiles(r);t(this).val("")});this.settings.onInit.call(this.element)};i.prototype.queueFiles=function(e){var n=this.queue.length;for(var r=0;r<e.length;r++){var i=e[r];if(this.settings.maxFileSize>0&&i.size>this.settings.maxFileSize){this.settings.onFileSizeError.call(this.element,i);continue}if(this.settings.allowedTypes!="*"&&!i.type.match(this.settings.allowedTypes)){this.settings.onFileTypeError.call(this.element,i);continue}if(this.settings.extFilter!=null){var s=this.settings.extFilter.toLowerCase().split(";");var o=i.name.toLowerCase().split(".").pop();if(t.inArray(o,s)<0){this.settings.onFileExtError.call(this.element,i);continue}}this.queue.push(i);var u=this.queue.length-1;this.settings.onNewFile.call(this.element,u,i)}if(this.queueRunning){return false}if(this.queue.length==n){return false}this.processQueue();return true};i.prototype.processQueue=function(){var n=this;n.queuePos++;if(n.queuePos>=n.queue.length){n.settings.onComplete.call(n.element);n.queuePos=n.queue.length-1;n.queueRunning=false;return}var r=n.queue[n.queuePos];var i=new FormData;i.append(n.settings.fileName,r);n.settings.onBeforeUpload.call(n.element,n.queuePos);t.each(n.settings.extraData,function(e,t){i.append(e,t)});n.queueRunning=true;t.ajax({url:n.settings.url,type:n.settings.method,dataType:n.settings.dataType,data:i,cache:false,contentType:false,processData:false,forceSync:false,xhr:function(){var r=t.ajaxSettings.xhr();if(r.upload){r.upload.addEventListener("progress",function(t){var r=0;var i=t.loaded||t.position;var s=t.total||e.totalSize;if(t.lengthComputable){r=Math.ceil(i/s*100)}n.settings.onUploadProgress.call(n.element,n.queuePos,r)},false)}return r},success:function(e,t,r){n.settings.onUploadSuccess.call(n.element,n.queuePos,e)},error:function(e,t,r){n.settings.onUploadError.call(n.element,n.queuePos,r)},complete:function(e,t){n.processQueue()}})};t.fn.dmUploader=function(e){return this.each(function(){if(!t.data(this,n)){t.data(this,n,new i(this,e))}})};t(document).on("dragenter",function(e){e.stopPropagation();e.preventDefault()});t(document).on("dragover",function(e){e.stopPropagation();e.preventDefault()});t(document).on("drop",function(e){e.stopPropagation();e.preventDefault()})})(jQuery)
diff --git a/server/Readme.md b/server/Readme.md
old mode 100644
new mode 100755
diff --git a/server/Test/DisplayNetIds.php b/server/Test/DisplayNetIds.php
old mode 100644
new mode 100755
diff --git a/server/Test/computeTest.php b/server/Test/computeTest.php
old mode 100644
new mode 100755
diff --git a/server/Test/create_network.php b/server/Test/create_network.php
old mode 100644
new mode 100755
diff --git a/server/Test/create_subnet.php b/server/Test/create_subnet.php
old mode 100644
new mode 100755
diff --git a/server/Test/genTokenOptionsTest.php b/server/Test/genTokenOptionsTest.php
old mode 100644
new mode 100755
diff --git a/server/Test/imageTests.php b/server/Test/imageTests.php
old mode 100644
new mode 100755
diff --git a/server/composer.json b/server/composer.json
old mode 100644
new mode 100755
diff --git a/server/composer.lock b/server/composer.lock
old mode 100644
new mode 100755
diff --git a/server/composer.phar b/server/composer.phar
old mode 100644
new mode 100755
diff --git a/server/config.inc.php b/server/config.inc.php
old mode 100644
new mode 100755
diff --git a/server/core/CoreInterface.php b/server/core/CoreInterface.php
old mode 100644
new mode 100755
diff --git a/server/core/LibOverride/projectTokenData/demo b/server/core/LibOverride/projectTokenData/demo
old mode 100644
new mode 100755
diff --git a/server/core/Network.php b/server/core/Network.php
old mode 100644
new mode 100755
diff --git a/server/core/Plugin.php b/server/core/Plugin.php
old mode 100644
new mode 100755
diff --git a/server/core/Plugin_Api.php b/server/core/Plugin_Api.php
old mode 100644
new mode 100755
diff --git a/server/core/Readme.txt b/server/core/Readme.txt
old mode 100644
new mode 100755
diff --git a/server/create_serv.php b/server/create_serv.php
old mode 100644
new mode 100755
diff --git a/server/modules/Readme.txt b/server/modules/Readme.txt
old mode 100644
new mode 100755
diff --git a/server/vendor/autoload.php b/server/vendor/autoload.php
old mode 100644
new mode 100755
diff --git a/server/vendor/composer/ClassLoader.php b/server/vendor/composer/ClassLoader.php
old mode 100644
new mode 100755
diff --git a/server/vendor/composer/LICENSE b/server/vendor/composer/LICENSE
old mode 100644
new mode 100755
diff --git a/server/vendor/composer/autoload_classmap.php b/server/vendor/composer/autoload_classmap.php
old mode 100644
new mode 100755
diff --git a/server/vendor/composer/autoload_files.php b/server/vendor/composer/autoload_files.php
old mode 100644
new mode 100755
diff --git a/server/vendor/composer/autoload_namespaces.php b/server/vendor/composer/autoload_namespaces.php
old mode 100644
new mode 100755
diff --git a/server/vendor/composer/autoload_psr4.php b/server/vendor/composer/autoload_psr4.php
old mode 100644
new mode 100755
diff --git a/server/vendor/composer/autoload_real.php b/server/vendor/composer/autoload_real.php
old mode 100644
new mode 100755
diff --git a/server/vendor/composer/installed.json b/server/vendor/composer/installed.json
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/.travis.yml b/server/vendor/guzzlehttp/guzzle/.travis.yml
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/CHANGELOG.md b/server/vendor/guzzlehttp/guzzle/CHANGELOG.md
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/LICENSE b/server/vendor/guzzlehttp/guzzle/LICENSE
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/README.md b/server/vendor/guzzlehttp/guzzle/README.md
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/UPGRADING.md b/server/vendor/guzzlehttp/guzzle/UPGRADING.md
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/composer.json b/server/vendor/guzzlehttp/guzzle/composer.json
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/Client.php b/server/vendor/guzzlehttp/guzzle/src/Client.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/ClientInterface.php b/server/vendor/guzzlehttp/guzzle/src/ClientInterface.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php b/server/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php b/server/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php b/server/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php b/server/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php b/server/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php b/server/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/Exception/ClientException.php b/server/vendor/guzzlehttp/guzzle/src/Exception/ClientException.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php b/server/vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php b/server/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php b/server/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/Exception/SeekException.php b/server/vendor/guzzlehttp/guzzle/src/Exception/SeekException.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php b/server/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php b/server/vendor/guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php b/server/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php b/server/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php b/server/vendor/guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/Handler/CurlHandler.php b/server/vendor/guzzlehttp/guzzle/src/Handler/CurlHandler.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php b/server/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/Handler/EasyHandle.php b/server/vendor/guzzlehttp/guzzle/src/Handler/EasyHandle.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php b/server/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php b/server/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php b/server/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/HandlerStack.php b/server/vendor/guzzlehttp/guzzle/src/HandlerStack.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/MessageFormatter.php b/server/vendor/guzzlehttp/guzzle/src/MessageFormatter.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/Middleware.php b/server/vendor/guzzlehttp/guzzle/src/Middleware.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/Pool.php b/server/vendor/guzzlehttp/guzzle/src/Pool.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php b/server/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php b/server/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/RequestOptions.php b/server/vendor/guzzlehttp/guzzle/src/RequestOptions.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php b/server/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/TransferStats.php b/server/vendor/guzzlehttp/guzzle/src/TransferStats.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/UriTemplate.php b/server/vendor/guzzlehttp/guzzle/src/UriTemplate.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/functions.php b/server/vendor/guzzlehttp/guzzle/src/functions.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/guzzle/src/functions_include.php b/server/vendor/guzzlehttp/guzzle/src/functions_include.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/.gitignore b/server/vendor/guzzlehttp/promises/.gitignore
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/.travis.yml b/server/vendor/guzzlehttp/promises/.travis.yml
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/CHANGELOG.md b/server/vendor/guzzlehttp/promises/CHANGELOG.md
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/LICENSE b/server/vendor/guzzlehttp/promises/LICENSE
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/Makefile b/server/vendor/guzzlehttp/promises/Makefile
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/README.md b/server/vendor/guzzlehttp/promises/README.md
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/composer.json b/server/vendor/guzzlehttp/promises/composer.json
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/phpunit.xml.dist b/server/vendor/guzzlehttp/promises/phpunit.xml.dist
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/src/AggregateException.php b/server/vendor/guzzlehttp/promises/src/AggregateException.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/src/CancellationException.php b/server/vendor/guzzlehttp/promises/src/CancellationException.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/src/EachPromise.php b/server/vendor/guzzlehttp/promises/src/EachPromise.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/src/FulfilledPromise.php b/server/vendor/guzzlehttp/promises/src/FulfilledPromise.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/src/Promise.php b/server/vendor/guzzlehttp/promises/src/Promise.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/src/PromiseInterface.php b/server/vendor/guzzlehttp/promises/src/PromiseInterface.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/src/PromisorInterface.php b/server/vendor/guzzlehttp/promises/src/PromisorInterface.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/src/RejectedPromise.php b/server/vendor/guzzlehttp/promises/src/RejectedPromise.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/src/RejectionException.php b/server/vendor/guzzlehttp/promises/src/RejectionException.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/src/TaskQueue.php b/server/vendor/guzzlehttp/promises/src/TaskQueue.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/src/functions.php b/server/vendor/guzzlehttp/promises/src/functions.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/src/functions_include.php b/server/vendor/guzzlehttp/promises/src/functions_include.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/tests/AggregateExceptionTest.php b/server/vendor/guzzlehttp/promises/tests/AggregateExceptionTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/tests/EachPromiseTest.php b/server/vendor/guzzlehttp/promises/tests/EachPromiseTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/tests/FulfilledPromiseTest.php b/server/vendor/guzzlehttp/promises/tests/FulfilledPromiseTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/tests/NotPromiseInstance.php b/server/vendor/guzzlehttp/promises/tests/NotPromiseInstance.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/tests/PromiseTest.php b/server/vendor/guzzlehttp/promises/tests/PromiseTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/tests/RejectedPromiseTest.php b/server/vendor/guzzlehttp/promises/tests/RejectedPromiseTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/tests/RejectionExceptionTest.php b/server/vendor/guzzlehttp/promises/tests/RejectionExceptionTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/tests/TaskQueueTest.php b/server/vendor/guzzlehttp/promises/tests/TaskQueueTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/tests/Thennable.php b/server/vendor/guzzlehttp/promises/tests/Thennable.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/tests/bootstrap.php b/server/vendor/guzzlehttp/promises/tests/bootstrap.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/promises/tests/functionsTest.php b/server/vendor/guzzlehttp/promises/tests/functionsTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/.gitignore b/server/vendor/guzzlehttp/psr7/.gitignore
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/.travis.yml b/server/vendor/guzzlehttp/psr7/.travis.yml
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/CHANGELOG.md b/server/vendor/guzzlehttp/psr7/CHANGELOG.md
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/LICENSE b/server/vendor/guzzlehttp/psr7/LICENSE
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/Makefile b/server/vendor/guzzlehttp/psr7/Makefile
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/README.md b/server/vendor/guzzlehttp/psr7/README.md
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/composer.json b/server/vendor/guzzlehttp/psr7/composer.json
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/phpunit.xml.dist b/server/vendor/guzzlehttp/psr7/phpunit.xml.dist
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/src/AppendStream.php b/server/vendor/guzzlehttp/psr7/src/AppendStream.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/src/BufferStream.php b/server/vendor/guzzlehttp/psr7/src/BufferStream.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/src/CachingStream.php b/server/vendor/guzzlehttp/psr7/src/CachingStream.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/src/DroppingStream.php b/server/vendor/guzzlehttp/psr7/src/DroppingStream.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/src/FnStream.php b/server/vendor/guzzlehttp/psr7/src/FnStream.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/src/InflateStream.php b/server/vendor/guzzlehttp/psr7/src/InflateStream.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/src/LazyOpenStream.php b/server/vendor/guzzlehttp/psr7/src/LazyOpenStream.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/src/LimitStream.php b/server/vendor/guzzlehttp/psr7/src/LimitStream.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/src/MessageTrait.php b/server/vendor/guzzlehttp/psr7/src/MessageTrait.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/src/MultipartStream.php b/server/vendor/guzzlehttp/psr7/src/MultipartStream.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/src/NoSeekStream.php b/server/vendor/guzzlehttp/psr7/src/NoSeekStream.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/src/PumpStream.php b/server/vendor/guzzlehttp/psr7/src/PumpStream.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/src/Request.php b/server/vendor/guzzlehttp/psr7/src/Request.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/src/Response.php b/server/vendor/guzzlehttp/psr7/src/Response.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/src/Stream.php b/server/vendor/guzzlehttp/psr7/src/Stream.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/src/StreamDecoratorTrait.php b/server/vendor/guzzlehttp/psr7/src/StreamDecoratorTrait.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/src/StreamWrapper.php b/server/vendor/guzzlehttp/psr7/src/StreamWrapper.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/src/Uri.php b/server/vendor/guzzlehttp/psr7/src/Uri.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/src/functions.php b/server/vendor/guzzlehttp/psr7/src/functions.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/src/functions_include.php b/server/vendor/guzzlehttp/psr7/src/functions_include.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/tests/AppendStreamTest.php b/server/vendor/guzzlehttp/psr7/tests/AppendStreamTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/tests/BufferStreamTest.php b/server/vendor/guzzlehttp/psr7/tests/BufferStreamTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/tests/CachingStreamTest.php b/server/vendor/guzzlehttp/psr7/tests/CachingStreamTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/tests/DroppingStreamTest.php b/server/vendor/guzzlehttp/psr7/tests/DroppingStreamTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/tests/FnStreamTest.php b/server/vendor/guzzlehttp/psr7/tests/FnStreamTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/tests/FunctionsTest.php b/server/vendor/guzzlehttp/psr7/tests/FunctionsTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/tests/InflateStreamTest.php b/server/vendor/guzzlehttp/psr7/tests/InflateStreamTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/tests/LazyOpenStreamTest.php b/server/vendor/guzzlehttp/psr7/tests/LazyOpenStreamTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/tests/LimitStreamTest.php b/server/vendor/guzzlehttp/psr7/tests/LimitStreamTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/tests/MultipartStreamTest.php b/server/vendor/guzzlehttp/psr7/tests/MultipartStreamTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/tests/NoSeekStreamTest.php b/server/vendor/guzzlehttp/psr7/tests/NoSeekStreamTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/tests/PumpStreamTest.php b/server/vendor/guzzlehttp/psr7/tests/PumpStreamTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/tests/RequestTest.php b/server/vendor/guzzlehttp/psr7/tests/RequestTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/tests/ResponseTest.php b/server/vendor/guzzlehttp/psr7/tests/ResponseTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/tests/StreamDecoratorTraitTest.php b/server/vendor/guzzlehttp/psr7/tests/StreamDecoratorTraitTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/tests/StreamTest.php b/server/vendor/guzzlehttp/psr7/tests/StreamTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/tests/StreamWrapperTest.php b/server/vendor/guzzlehttp/psr7/tests/StreamWrapperTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/tests/UriTest.php b/server/vendor/guzzlehttp/psr7/tests/UriTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/guzzlehttp/psr7/tests/bootstrap.php b/server/vendor/guzzlehttp/psr7/tests/bootstrap.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/.gitattributes b/server/vendor/justinrainbow/json-schema/.gitattributes
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/LICENSE b/server/vendor/justinrainbow/json-schema/LICENSE
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/README.md b/server/vendor/justinrainbow/json-schema/README.md
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/bin/validate-json b/server/vendor/justinrainbow/json-schema/bin/validate-json
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/composer.json b/server/vendor/justinrainbow/json-schema/composer.json
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/phpunit.xml.dist b/server/vendor/justinrainbow/json-schema/phpunit.xml.dist
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/CollectionConstraint.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/CollectionConstraint.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Constraint.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Constraint.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/ConstraintInterface.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/ConstraintInterface.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/EnumConstraint.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/EnumConstraint.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Factory.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Factory.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/FormatConstraint.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/FormatConstraint.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/NumberConstraint.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/NumberConstraint.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/ObjectConstraint.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/ObjectConstraint.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/SchemaConstraint.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/SchemaConstraint.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/StringConstraint.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/StringConstraint.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/TypeConstraint.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/TypeConstraint.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/UndefinedConstraint.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/UndefinedConstraint.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Exception/InvalidArgumentException.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Exception/InvalidArgumentException.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Exception/InvalidSchemaMediaTypeException.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Exception/InvalidSchemaMediaTypeException.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Exception/InvalidSourceUriException.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Exception/InvalidSourceUriException.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Exception/JsonDecodingException.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Exception/JsonDecodingException.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Exception/ResourceNotFoundException.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Exception/ResourceNotFoundException.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Exception/UriResolverException.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Exception/UriResolverException.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/RefResolver.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/RefResolver.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Uri/Retrievers/AbstractRetriever.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Uri/Retrievers/AbstractRetriever.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Uri/Retrievers/Curl.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Uri/Retrievers/Curl.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Uri/Retrievers/FileGetContents.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Uri/Retrievers/FileGetContents.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Uri/Retrievers/PredefinedArray.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Uri/Retrievers/PredefinedArray.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Uri/Retrievers/UriRetrieverInterface.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Uri/Retrievers/UriRetrieverInterface.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Uri/UriResolver.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Uri/UriResolver.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Uri/UriRetriever.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Uri/UriRetriever.php
old mode 100644
new mode 100755
diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Validator.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Validator.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/.gitignore b/server/vendor/php-opencloud/common/.gitignore
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/composer.json b/server/vendor/php-opencloud/common/composer.json
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/phpunit.xml.dist b/server/vendor/php-opencloud/common/phpunit.xml.dist
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Api/AbstractApi.php b/server/vendor/php-opencloud/common/src/Common/Api/AbstractApi.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Api/AbstractParams.php b/server/vendor/php-opencloud/common/src/Common/Api/AbstractParams.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Api/ApiInterface.php b/server/vendor/php-opencloud/common/src/Common/Api/ApiInterface.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Api/Operation.php b/server/vendor/php-opencloud/common/src/Common/Api/Operation.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Api/Operator.php b/server/vendor/php-opencloud/common/src/Common/Api/Operator.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Api/OperatorInterface.php b/server/vendor/php-opencloud/common/src/Common/Api/OperatorInterface.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Api/Parameter.php b/server/vendor/php-opencloud/common/src/Common/Api/Parameter.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/ArrayAccessTrait.php b/server/vendor/php-opencloud/common/src/Common/ArrayAccessTrait.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Auth/AuthHandler.php b/server/vendor/php-opencloud/common/src/Common/Auth/AuthHandler.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Auth/Catalog.php b/server/vendor/php-opencloud/common/src/Common/Auth/Catalog.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Auth/IdentityService.php b/server/vendor/php-opencloud/common/src/Common/Auth/IdentityService.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Auth/Token.php b/server/vendor/php-opencloud/common/src/Common/Auth/Token.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Error/BadResponseError.php b/server/vendor/php-opencloud/common/src/Common/Error/BadResponseError.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Error/BaseError.php b/server/vendor/php-opencloud/common/src/Common/Error/BaseError.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Error/Builder.php b/server/vendor/php-opencloud/common/src/Common/Error/Builder.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Error/NotImplementedError.php b/server/vendor/php-opencloud/common/src/Common/Error/NotImplementedError.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Error/UserInputError.php b/server/vendor/php-opencloud/common/src/Common/Error/UserInputError.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/HydratorStrategyTrait.php b/server/vendor/php-opencloud/common/src/Common/HydratorStrategyTrait.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/JsonPath.php b/server/vendor/php-opencloud/common/src/Common/JsonPath.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/JsonSchema/JsonPatch.php b/server/vendor/php-opencloud/common/src/Common/JsonSchema/JsonPatch.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/JsonSchema/Schema.php b/server/vendor/php-opencloud/common/src/Common/JsonSchema/Schema.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Resource/AbstractResource.php b/server/vendor/php-opencloud/common/src/Common/Resource/AbstractResource.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Resource/Creatable.php b/server/vendor/php-opencloud/common/src/Common/Resource/Creatable.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Resource/Deletable.php b/server/vendor/php-opencloud/common/src/Common/Resource/Deletable.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Resource/HasMetadata.php b/server/vendor/php-opencloud/common/src/Common/Resource/HasMetadata.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Resource/HasWaiterTrait.php b/server/vendor/php-opencloud/common/src/Common/Resource/HasWaiterTrait.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Resource/Iterator.php b/server/vendor/php-opencloud/common/src/Common/Resource/Iterator.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Resource/Listable.php b/server/vendor/php-opencloud/common/src/Common/Resource/Listable.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Resource/ResourceInterface.php b/server/vendor/php-opencloud/common/src/Common/Resource/ResourceInterface.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Resource/Retrievable.php b/server/vendor/php-opencloud/common/src/Common/Resource/Retrievable.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Resource/Updateable.php b/server/vendor/php-opencloud/common/src/Common/Resource/Updateable.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Service/AbstractService.php b/server/vendor/php-opencloud/common/src/Common/Service/AbstractService.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Service/Builder.php b/server/vendor/php-opencloud/common/src/Common/Service/Builder.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Service/ServiceInterface.php b/server/vendor/php-opencloud/common/src/Common/Service/ServiceInterface.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Transport/HandlerStack.php b/server/vendor/php-opencloud/common/src/Common/Transport/HandlerStack.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Transport/JsonSerializer.php b/server/vendor/php-opencloud/common/src/Common/Transport/JsonSerializer.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Transport/Middleware.php b/server/vendor/php-opencloud/common/src/Common/Transport/Middleware.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Transport/RequestSerializer.php b/server/vendor/php-opencloud/common/src/Common/Transport/RequestSerializer.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/src/Common/Transport/Utils.php b/server/vendor/php-opencloud/common/src/Common/Transport/Utils.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/integration/DefaultLogger.php b/server/vendor/php-opencloud/common/tests/integration/DefaultLogger.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/integration/Runner.php b/server/vendor/php-opencloud/common/tests/integration/Runner.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/integration/SampleManager.php b/server/vendor/php-opencloud/common/tests/integration/SampleManager.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/integration/SampleManagerInterface.php b/server/vendor/php-opencloud/common/tests/integration/SampleManagerInterface.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/integration/TestCase.php b/server/vendor/php-opencloud/common/tests/integration/TestCase.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/integration/TestInterface.php b/server/vendor/php-opencloud/common/tests/integration/TestInterface.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/integration/Utils.php b/server/vendor/php-opencloud/common/tests/integration/Utils.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/integration/run.php b/server/vendor/php-opencloud/common/tests/integration/run.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/Api/OperationTest.php b/server/vendor/php-opencloud/common/tests/unit/Common/Api/OperationTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/Api/OperatorTest.php b/server/vendor/php-opencloud/common/tests/unit/Common/Api/OperatorTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/Api/ParameterTest.php b/server/vendor/php-opencloud/common/tests/unit/Common/Api/ParameterTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/Api/fixtures/headers.php b/server/vendor/php-opencloud/common/tests/unit/Common/Api/fixtures/headers.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/Api/fixtures/jsonBody.php b/server/vendor/php-opencloud/common/tests/unit/Common/Api/fixtures/jsonBody.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/ArrayAccessTraitTest.php b/server/vendor/php-opencloud/common/tests/unit/Common/ArrayAccessTraitTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/Auth/AuthHandlerTest.php b/server/vendor/php-opencloud/common/tests/unit/Common/Auth/AuthHandlerTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/DateTime.php b/server/vendor/php-opencloud/common/tests/unit/Common/DateTime.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/Error/BadResponseErrorTest.php b/server/vendor/php-opencloud/common/tests/unit/Common/Error/BadResponseErrorTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/Error/BuilderTest.php b/server/vendor/php-opencloud/common/tests/unit/Common/Error/BuilderTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/HydratorStrategyTraitTes.php b/server/vendor/php-opencloud/common/tests/unit/Common/HydratorStrategyTraitTes.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/JsonPathTest.php b/server/vendor/php-opencloud/common/tests/unit/Common/JsonPathTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/JsonSchema/Fixtures/jsonPatchTests.json b/server/vendor/php-opencloud/common/tests/unit/Common/JsonSchema/Fixtures/jsonPatchTests.json
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/JsonSchema/JsonPatchTest.php b/server/vendor/php-opencloud/common/tests/unit/Common/JsonSchema/JsonPatchTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/JsonSchema/SchemaTest.php b/server/vendor/php-opencloud/common/tests/unit/Common/JsonSchema/SchemaTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/Resource/AbstractResourceTest.php b/server/vendor/php-opencloud/common/tests/unit/Common/Resource/AbstractResourceTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/Resource/Fixtures/servers-empty.resp b/server/vendor/php-opencloud/common/tests/unit/Common/Resource/Fixtures/servers-empty.resp
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/Resource/Fixtures/servers-page1.resp b/server/vendor/php-opencloud/common/tests/unit/Common/Resource/Fixtures/servers-page1.resp
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/Resource/Fixtures/servers-page2.resp b/server/vendor/php-opencloud/common/tests/unit/Common/Resource/Fixtures/servers-page2.resp
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/Service/BuilderTest.php b/server/vendor/php-opencloud/common/tests/unit/Common/Service/BuilderTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/Transport/HandlerStackTest.php b/server/vendor/php-opencloud/common/tests/unit/Common/Transport/HandlerStackTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/Transport/JsonSerializerTest.php b/server/vendor/php-opencloud/common/tests/unit/Common/Transport/JsonSerializerTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/Transport/MiddlewareTest.php b/server/vendor/php-opencloud/common/tests/unit/Common/Transport/MiddlewareTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/Transport/RequestSerializerTest.php b/server/vendor/php-opencloud/common/tests/unit/Common/Transport/RequestSerializerTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/Transport/UtilsTest.php b/server/vendor/php-opencloud/common/tests/unit/Common/Transport/UtilsTest.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Fixtures/ComputeV2Api.php b/server/vendor/php-opencloud/common/tests/unit/Fixtures/ComputeV2Api.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Fixtures/IdentityV2Api.php b/server/vendor/php-opencloud/common/tests/unit/Fixtures/IdentityV2Api.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/Fixtures/IdentityV3Api.php b/server/vendor/php-opencloud/common/tests/unit/Fixtures/IdentityV3Api.php
old mode 100644
new mode 100755
diff --git a/server/vendor/php-opencloud/common/tests/unit/TestCase.php b/server/vendor/php-opencloud/common/tests/unit/TestCase.php
old mode 100644
new mode 100755
diff --git a/server/vendor/psr/http-message/LICENSE b/server/vendor/psr/http-message/LICENSE
old mode 100644
new mode 100755
diff --git a/server/vendor/psr/http-message/README.md b/server/vendor/psr/http-message/README.md
old mode 100644
new mode 100755
diff --git a/server/vendor/psr/http-message/composer.json b/server/vendor/psr/http-message/composer.json
old mode 100644
new mode 100755
diff --git a/server/vendor/psr/http-message/src/MessageInterface.php b/server/vendor/psr/http-message/src/MessageInterface.php
old mode 100644
new mode 100755
diff --git a/server/vendor/psr/http-message/src/RequestInterface.php b/server/vendor/psr/http-message/src/RequestInterface.php
old mode 100644
new mode 100755
diff --git a/server/vendor/psr/http-message/src/ResponseInterface.php b/server/vendor/psr/http-message/src/ResponseInterface.php
old mode 100644
new mode 100755
diff --git a/server/vendor/psr/http-message/src/ServerRequestInterface.php b/server/vendor/psr/http-message/src/ServerRequestInterface.php
old mode 100644
new mode 100755
diff --git a/server/vendor/psr/http-message/src/StreamInterface.php b/server/vendor/psr/http-message/src/StreamInterface.php
old mode 100644
new mode 100755
diff --git a/server/vendor/psr/http-message/src/UploadedFileInterface.php b/server/vendor/psr/http-message/src/UploadedFileInterface.php
old mode 100644
new mode 100755
diff --git a/server/vendor/psr/http-message/src/UriInterface.php b/server/vendor/psr/http-message/src/UriInterface.php
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From 1342db60283cb61a1c3810993575d35b9fb33ac0 Mon Sep 17 00:00:00 2001
From: root <root@kabir-PC>
Date: Wed, 23 Mar 2016 11:22:12 +0100
Subject: insertion des commentaires

---
 server/core/Network.php | 301 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 281 insertions(+), 20 deletions(-)

(limited to 'server/core/Network.php')

diff --git a/server/core/Network.php b/server/core/Network.php
index 65de962..a4e0939 100644
--- a/server/core/Network.php
+++ b/server/core/Network.php
@@ -1,13 +1,42 @@
 <?php
+/**
+* File containing the Image Class.
+*
+* @version 1.0 Initialisation of this file
+* @since 1.0 Core application's file
+* 
+* @author KABIR Othmane
+* 
+* @todo Complete the functions with errors detection and finish the descriptions
+*/
+use OpenCloud\Common\Error\BadResponseError;
+use OpenCloud\Common\Error\BaseError;
+use OpenCloud\Common\Error\NotImplementedError;
+use OpenCloud\Common\Error\UserInputError;
+
+include("CoreInterface.php");
+
+/**
+* Network Class of the back-end application
+*
+* ADD CLASS DESCRIPTION
+*
+*/
 
 class network{ 
-	
+/** @var App $app protected, contains the main app object */	
 	protected $app;
-	
+/** @var OpenStack\Network $libClass protected, contains the library Network object */	
 	protected $libClass;
 	
 	
-
+	/**
+	* Image constructor
+	*
+	* @param App $app the main app object
+	*
+	* @return Network
+	*/
 	
 
 	
@@ -17,36 +46,55 @@ class network{
 		
 	}
 
-
+	/**
+	* Execute an action
+	*
+	* @param String $action name of another function of this class
+	*
+	* @return void
+	*/
 	public function action($action){
 		
 		 $this->{$action.""}();
 		
 	}
 
-	
+	/**
+	* Create a new network
+	*
+	* @param String name A human-readable name for the network. This name might not be unique
+	* @param String adminStateUp The administrative state of network. If false (down), the network does not forward packets
+	* @param String shared Specifies whether the network resource can be accessed by any tenant
+	* @param String tenantId Owner of network. Only admin users can specify a tenant ID other than their own
+	* 
+	* @return void
+	*/
 	public function create_network()
 	{
 		$options = array();
+		// check the name if it is null
 		if (isset($this->app->getPostParam("name")))
 		{
 			$options['name'] = $this->app->getPostParam("name"); 
 		}
+		// check the adminStateUp if it is null
 		if (isset($this->app->getPostParam("adminStateUp")))
 		{
 			$options['adminStateUp'] = $this->app->getPostParam("adminStateUp"); 
 		}
+		// check the shared if it is null
 		if (isset($this->app->getPostParam("shared")))
 		{
 			$options['shared'] = $this->app->getPostParam("shared"); 
 		}
+		// check the tenantId if it is null
 		if (isset($this->app->getPostParam("tenantId")))
 		{
 			$options['tenantId'] = $this->app->getPostParam("tenantId"); 
 		}
 		try
 		{
-		$network = $this->libClass->createNetworks($options);
+			$network = $this->libClass->createNetworks($options);
 		}
 		catch(BadResponseError $e)
 		{
@@ -68,6 +116,26 @@ class network{
 		
 	}
 
+	/**
+	* Create a new subnet
+	*
+	* @param String networkId A Network this subnet is associated with
+	* @param String ipVersion IP version (4 or 6)
+	* @param String cidr CIDR representing the IP address range for this subnet Exmple X.Y.W.Z/12
+	* @param String tenantId Owner of network. Only admin users can specify a tenant ID other than their own
+	* @param String name A human-readable name for the subnet. This name might not be unique
+	* @param String gatewayIp IP address of the default gateway used by devices on this subnet
+	* @param String dnsNameservers DNS nameservers used by hosts in this subnet
+	* @param String enableDhcp Specifies whether DHCP is enabled for this subnet
+	* @param String hostRoutes Routes that should be used by devices with IP addresses from this subnet (not including the local subnet route)
+	* @param BOOLEAN enableDhcp Specifies whether DHCP is enabled for this subnet
+	* @param String allocationPools Subranges of the CIDR available for dynamic allocation to ports
+	* 	
+	*  	
+	* 
+	* @return void
+	*/
+
 	public function create_subnet()
 	{	$options = array();
 		if (isset($this->app->getPostParam("networkId")))
@@ -139,6 +207,12 @@ class network{
 		
 	}
 	
+	/**
+	* List the ID of the NETWORKS
+	*
+	* @return List of Networks ID
+	*/
+
 	public function list_network_ids()
 	{
 		try
@@ -176,6 +250,12 @@ class network{
 	$this->app->setOutput("ListNetworkIds", $list_ids);
 	}
 
+	/**
+	* List the name of the NETWORKS
+	*
+	* @return List of Networks name
+	*/
+
 	public function list_network_names()
 	{
 		try
@@ -213,7 +293,11 @@ class network{
 
 	$this->app->setOutput("ListNetworkNames", $list_names);
 	}
-
+	/**
+	* List the CIDR of the SUBNETS
+	*
+	* @return List of SUBNETS CIDR
+	*/
 	public function list_cidr()
 	{
 		try
@@ -245,7 +329,12 @@ class network{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
         	}	
 	}
-	
+	/**
+	* retrieve a specific network
+	* @param networkId ID of network which we want to get
+	* @return Network
+	*/
+	retrieve a specific network 
 	public function getNetwork()
 	{
 		$network="";
@@ -277,8 +366,13 @@ class network{
 
 	$this->app->setOutput("Network", $network);
 	}
-
-	public function getNetwork($netId)
+	
+	/**
+	* internal function
+	* @param String netId ID of network which we want to get
+	* @return Network
+	*/
+	private function getNetwork($netId)
 	{
 		$network="";
 		
@@ -310,6 +404,11 @@ class network{
 	return $network;
 	}
 
+	/**
+	* retrieve a specific subnet
+	* @param subnetId ID of subnet which we want to get
+	* @return subnet
+	*/
 	public function getSubnet()
 	{
 		$sbnet="";
@@ -340,8 +439,12 @@ class network{
 		$this->app->setOutput("Subnet", subnet);
 	
 	}
-
-	public function getSubnet($subnetId)
+	/**
+	* internal function
+	* @param String subnetId ID of subnet which we want to get
+	* @return subnet
+	*/
+	private function getSubnet($subnetId)
 	{
 		$subnet="";
 		
@@ -371,6 +474,18 @@ class network{
 		return $subnet;
 	
 	}		
+	
+	/**
+	* Update a network given
+	*
+	* @param String name A human-readable name for the network. This name might not be unique
+	* @param String adminStateUp The administrative state of network. If false (down), the network does not forward packets
+	* @param String shared Specifies whether the network resource can be accessed by any tenant
+	* @param String tenantId Owner of network. Only admin users can specify a tenant ID other than their own
+	* 
+	*
+	* @return void	
+	**/	
 
         public function updateNetwork()
      	{	
@@ -411,6 +526,25 @@ class network{
         	}	
 	}
 	
+	/**
+	* Update a subnet given
+	*
+	* @param String networkId A Network this subnet is associated with
+	* @param String ipVersion IP version (4 or 6)
+	* @param String cidr CIDR representing the IP address range for this subnet Exmple X.Y.W.Z/12
+	* @param String tenantId Owner of network. Only admin users can specify a tenant ID other than their own
+	* @param String name A human-readable name for the subnet. This name might not be unique
+	* @param String gatewayIp IP address of the default gateway used by devices on this subnet
+	* @param String dnsNameservers DNS nameservers used by hosts in this subnet
+	* @param String enableDhcp Specifies whether DHCP is enabled for this subnet
+	* @param String hostRoutes Routes that should be used by devices with IP addresses from this subnet (not including the local subnet route)
+	* @param BOOLEAN enableDhcp Specifies whether DHCP is enabled for this subnet
+	* @param String allocationPools Subranges of the CIDR available for dynamic allocation to ports
+	* 
+	*
+	* @return void	
+	**/	
+
 	public function updateSubnet()
      	{	
 		$options = array();
@@ -453,7 +587,16 @@ class network{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
         	}	
 	}
-
+	
+	/**
+	* Delete a network given
+	*
+	* @param String networkId ID if network which we want to delete
+	
+	* 
+	*
+	* @return void	
+	**/	
 	public function deleteNetwork()
      	{
 		try
@@ -479,7 +622,16 @@ class network{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
         	}	
 	}
-
+	
+	/**
+	* Delete a subnet given
+	*
+	* @param String subnetId ID if network which we want to delete
+	
+	* 
+	*
+	* @return void	
+	**/
 	public function deleteSubnet()
      	{
 		try
@@ -505,6 +657,22 @@ class network{
         	}	
 	}
 
+	/**
+	* Create a new port
+	*
+	* @param String networkId 	Network this port is associated with
+	* @param String name 	A human-readable name for the port. This name might not be unique
+	* @param String adminStateUp 	The administrative state of port. If false (down), the port does not forward packets
+	* @param String macAddress 	MAC address to use on this port
+	* @param String fixedIps 	IP addresses for this port
+	* @param String deviceId 	Identifies the device (for example, virtual server) using this port
+	* @param String deviceOwner 	Identifies the entity (for example, DHCP agent) using this port
+	* @param String securityGroups 	Specifies the IDs of any security groups associated with this port
+	* @param String tenantId 	Owner of the port. Only admin users can specify a tenant ID other than their own.
+	*	
+	* @return void
+	*/
+	
 	public function createPort()
 	{
 		$options = array();
@@ -565,6 +733,12 @@ class network{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
         	}	
 	}
+	
+	/**
+	* List the of ports
+	*
+	* @return List of ports
+	*/
 
 	public function listPorts()
 	{
@@ -590,6 +764,12 @@ class network{
         	}
 	}
 
+	/**
+	* retrieve a specific port given
+	* @param portId ID of port which we want to get
+	* @return port
+	*/
+
 	public function getPort()
 	{
 		try
@@ -616,7 +796,14 @@ class network{
 	
 	}
 
-	public function getPort($portId)
+	/**
+	* internal function
+	* retrieve a specific port given
+	* @param portId ID of port which we want to get
+	* @return port
+	*/
+
+	private function getPort($portId)
 	{
 		try
 		{
@@ -642,6 +829,22 @@ class network{
 	
 	}		
 
+
+	/**
+	* Update port given
+	*
+	* @param String networkId 	Network this port is associated with
+	* @param String name 	A human-readable name for the port. This name might not be unique
+	* @param String adminStateUp 	The administrative state of port. If false (down), the port does not forward packets
+	* @param String macAddress 	MAC address to use on this port
+	* @param String fixedIps 	IP addresses for this port
+	* @param String deviceId 	Identifies the device (for example, virtual server) using this port
+	* @param String deviceOwner 	Identifies the entity (for example, DHCP agent) using this port
+	* @param String securityGroups 	Specifies the IDs of any security groups associated with this port
+	* @param String tenantId 	Owner of the port. Only admin users can specify a tenant ID other than their own.
+	*	
+	* @return void
+	*/
 	public function updatePort()
 	{
 		$options = array();
@@ -704,7 +907,13 @@ class network{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
         	}	
 	}
-
+	/**
+	* Delete a port given
+	*
+	* @param String portId 	id of port which we wante to delete
+	
+	* @return void
+	*/
 	public function deletePort()
      	{
 		
@@ -731,6 +940,15 @@ class network{
         	}
 	}
 	
+	/**
+	* Create a new security groupe 
+	*
+	* @param String name 	A human-readable name for the security group. This name might not be unique
+	* @param String description 	Description of the security group
+	*	
+	* @return void
+	*/
+
 	public function createSecurityGroup()
 	{
 		$options = array();
@@ -764,7 +982,21 @@ class network{
         	}
 	
 	}
-
+	
+	/**
+	* Create a new security groupe 
+	*
+	* @param String securityGroupId 	The security group ID to associate with this security group rule.
+	* @param String direction 	The direction in which the security group rule is applied. For a compute instance, an ingress security group 		*				rule is applied to incoming (ingress) traffic for that instance. An egress rule is applied 						to traffic leaving the instance.
+	* @param String ethertype 	Must be IPv4 or IPv6, and addresses represented in CIDR must match the ingress or egress rules.	
+	* @param String portRangeMin 	The minimum port number in the range that is matched by the security group rule. If the protocol is TCP or 						UDP, this value must be less than or equal to the value of the portRangeMax attribute. If the protocol is 						ICMP, this value must be an ICMP type
+	*@param String portRangeMax 	The maximum port number in the range that is matched by the security group rule. If the protocol is TCP or 						UDP, this value must be less than or equal to the value of the portRangeMax attribute. If the protocol is 						ICMP, this value must be an ICMP type.
+	*@param String protocol 	The protocol that is matched by the security group rule
+	*@param String remoteGroupId 	The remote group ID to be associated with this security group rule. You can specify either remoteGroupId or 						remoteGroupPrefix
+	*@param String remoteIpPrefix 	The remote IP prefix to be associated with this security group rule. You can specify either remoteGroupId or 						remoteGroupPrefix
+	*
+	* @return void
+	*/
 	public function createSecurityGroupRule()
 	{
 		$options = array();
@@ -822,6 +1054,12 @@ class network{
         	}
 	}
 
+	
+	/**
+	* List of Security Groupes
+	*
+	* @return List of Security Groupes
+	*/
 
 	public function listSecurityGroupe()
 	{
@@ -846,6 +1084,13 @@ class network{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
         	}
 	}
+	
+	
+	/**
+	* List of Security Groupe Rules
+	*
+	* @return List of Security Groupe Rules
+	*/
 
 	public function listSecurityGroupeRule()
 	{
@@ -872,6 +1117,12 @@ class network{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
         	}
 	}
+	
+	/**
+	* retrieve a specific Security Groupe given
+	* @param securityGroupeId ID of security Groupe which we want to get
+	* @return securityGroupe
+	*/
 
 	public function getSecurityGroupe()
 	{
@@ -898,8 +1149,14 @@ class network{
         	}
 	
 	}
-
-	public function getSecurityGroupe($securityGroupeId)
+	
+	/**
+	* internal function
+	* retrieve a specific Security Groupe given
+	* @param securityGroupeId ID of security Groupe which we want to get
+	* @return securityGroupe
+	*/
+	private function getSecurityGroupe($securityGroupeId)
 	{
 		try
 		{
@@ -924,7 +1181,11 @@ class network{
         	}
 	
 	}
-
+	/**
+	* Delete a specific Security Groupe given
+	* @param securityGroupeId ID of security Groupe which we want to get
+	* @return void
+	*/
 	public function deleteSecurityGroupe()
      	{	
 		try
-- 
cgit v1.2.3


From 750dcc61ceff516a9233cc10dc138a9c898a61f6 Mon Sep 17 00:00:00 2001
From: root <root@kabir-PC>
Date: Wed, 30 Mar 2016 12:40:16 +0200
Subject: mettre les private pour la classe network coté serveur et mes
 premières essaie pour angularjs notamement extraction des donnée
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/Test/index.html        | 19 +++++++++++++++++++
 client/js/services/Network.js | 27 ++++++++++++++++++++++++++
 client/js/services/Test.js    |  8 ++++++++
 server/core/Network.php       | 44 +++++++++++++++++++++----------------------
 4 files changed, 76 insertions(+), 22 deletions(-)
 create mode 100644 client/Test/index.html
 create mode 100644 client/js/services/Network.js
 create mode 100644 client/js/services/Test.js

(limited to 'server/core/Network.php')

diff --git a/client/Test/index.html b/client/Test/index.html
new file mode 100644
index 0000000..147745c
--- /dev/null
+++ b/client/Test/index.html
@@ -0,0 +1,19 @@
+<head>
+
+<script src="../vendors/angularjs/angular.min.js"></script>
+    <script src="../vendors/angularjs/angular-route.min.js"></script>
+    <script src="../vendors/angularjs/angular-sanitize.min.js"></script>
+    <script src="../vendors/angularjs/angular-cookies.min.js"></script>
+     <script src="../js/services/Test.js"></script>
+    <script src="../js/app.js"></script>
+</head>
+
+<body ng-app="mainApp">
+	<div ng-controller="hassan">
+		<ul>
+			<li ng-repeat="person in persons">
+				{{person.Name + ' : ' + person.Age}}
+			</li>
+		</ul>
+	</div>
+</body>
diff --git a/client/js/services/Network.js b/client/js/services/Network.js
new file mode 100644
index 0000000..bd2a24f
--- /dev/null
+++ b/client/js/services/Network.js
@@ -0,0 +1,27 @@
+
+mainApp.factory('Network',[ '$http', 'Identity', function($http, Identity){
+
+	var data={};
+	data.networks=null;
+
+var ListId=function(fileToUpload, callback) {
+
+
+		var result=$http.post('../server/index.php',
+							  $.param({"token" : Identity.getToken(), "task" : "network", 'action':'list_network_ids'}));  
+
+		// Wait and handle the response
+        result.then(function (response){
+			callback(parseUploadImageAnswer(response, false));
+        },function(response){
+			callback(parseUploadImageAnswer(response, true));
+        });
+
+		console.log(result)
+		  
+	}
+
+
+}]);
+
+
diff --git a/client/js/services/Test.js b/client/js/services/Test.js
new file mode 100644
index 0000000..f12c6b9
--- /dev/null
+++ b/client/js/services/Test.js
@@ -0,0 +1,8 @@
+var app = angular.module('mainApp',[]);
+app.controller('hassan', function($scope,$http){
+	$http.get('http://127.0.0.1/database.json').success(function(response){
+	$scope.persons = response.records;
+});
+
+
+});
diff --git a/server/core/Network.php b/server/core/Network.php
index a4e0939..ad0cbaf 100644
--- a/server/core/Network.php
+++ b/server/core/Network.php
@@ -69,7 +69,7 @@ class network{
 	* 
 	* @return void
 	*/
-	public function create_network()
+	private function create_network()
 	{
 		$options = array();
 		// check the name if it is null
@@ -136,7 +136,7 @@ class network{
 	* @return void
 	*/
 
-	public function create_subnet()
+	private function create_subnet()
 	{	$options = array();
 		if (isset($this->app->getPostParam("networkId")))
 		{
@@ -213,7 +213,7 @@ class network{
 	* @return List of Networks ID
 	*/
 
-	public function list_network_ids()
+	private function list_network_ids()
 	{
 		try
 		{
@@ -256,7 +256,7 @@ class network{
 	* @return List of Networks name
 	*/
 
-	public function list_network_names()
+	private function list_network_names()
 	{
 		try
 		{
@@ -298,7 +298,7 @@ class network{
 	*
 	* @return List of SUBNETS CIDR
 	*/
-	public function list_cidr()
+	private function list_cidr()
 	{
 		try
 		{
@@ -335,7 +335,7 @@ class network{
 	* @return Network
 	*/
 	retrieve a specific network 
-	public function getNetwork()
+	private function getNetwork()
 	{
 		$network="";
 		
@@ -409,7 +409,7 @@ class network{
 	* @param subnetId ID of subnet which we want to get
 	* @return subnet
 	*/
-	public function getSubnet()
+	private function getSubnet()
 	{
 		$sbnet="";
 		
@@ -487,7 +487,7 @@ class network{
 	* @return void	
 	**/	
 
-        public function updateNetwork()
+        private function updateNetwork()
      	{	
 		$options = array();
 		if(isset($this->app->getPostParam("name")))
@@ -545,7 +545,7 @@ class network{
 	* @return void	
 	**/	
 
-	public function updateSubnet()
+	private function updateSubnet()
      	{	
 		$options = array();
 		if(isset($this->app->getPostParam("name")))
@@ -597,7 +597,7 @@ class network{
 	*
 	* @return void	
 	**/	
-	public function deleteNetwork()
+	private function deleteNetwork()
      	{
 		try
 		{
@@ -632,7 +632,7 @@ class network{
 	*
 	* @return void	
 	**/
-	public function deleteSubnet()
+	private function deleteSubnet()
      	{
 		try
 		{		
@@ -673,7 +673,7 @@ class network{
 	* @return void
 	*/
 	
-	public function createPort()
+	private function createPort()
 	{
 		$options = array();
 		if (isset($this->app->getPostParam("networkId")))
@@ -740,7 +740,7 @@ class network{
 	* @return List of ports
 	*/
 
-	public function listPorts()
+	private function listPorts()
 	{
 		try
 		{		
@@ -770,7 +770,7 @@ class network{
 	* @return port
 	*/
 
-	public function getPort()
+	private function getPort()
 	{
 		try
 		{
@@ -845,7 +845,7 @@ class network{
 	*	
 	* @return void
 	*/
-	public function updatePort()
+	private function updatePort()
 	{
 		$options = array();
 		
@@ -914,7 +914,7 @@ class network{
 	
 	* @return void
 	*/
-	public function deletePort()
+	private function deletePort()
      	{
 		
 		try
@@ -949,7 +949,7 @@ class network{
 	* @return void
 	*/
 
-	public function createSecurityGroup()
+	private function createSecurityGroup()
 	{
 		$options = array();
 		if (isset($this->app->getPostParam("name")))
@@ -997,7 +997,7 @@ class network{
 	*
 	* @return void
 	*/
-	public function createSecurityGroupRule()
+	private function createSecurityGroupRule()
 	{
 		$options = array();
 		if (isset($this->app->getPostParam("securityGroupId")))
@@ -1061,7 +1061,7 @@ class network{
 	* @return List of Security Groupes
 	*/
 
-	public function listSecurityGroupe()
+	private function listSecurityGroupe()
 	{
 		try
 		{
@@ -1092,7 +1092,7 @@ class network{
 	* @return List of Security Groupe Rules
 	*/
 
-	public function listSecurityGroupeRule()
+	private function listSecurityGroupeRule()
 	{
 		try
 		{
@@ -1124,7 +1124,7 @@ class network{
 	* @return securityGroupe
 	*/
 
-	public function getSecurityGroupe()
+	private function getSecurityGroupe()
 	{
 		try
 		{
@@ -1186,7 +1186,7 @@ class network{
 	* @param securityGroupeId ID of security Groupe which we want to get
 	* @return void
 	*/
-	public function deleteSecurityGroupe()
+	private function deleteSecurityGroupe()
      	{	
 		try
 		{
-- 
cgit v1.2.3


From 2d260aa6f591030f869063ccdb1f6997d12c1294 Mon Sep 17 00:00:00 2001
From: Yoggzo <yogg@epsina.com>
Date: Tue, 19 Apr 2016 17:17:14 +0200
Subject: correct syntaxt on Network, add tests for automating

---
 server/Test/automatingTests.php | 24 ++++++++++++++++++++++++
 server/core/FloatingIp.php      | 33 ++++++++++++++++++++++++++++++---
 server/core/Network.php         | 10 ++++------
 3 files changed, 58 insertions(+), 9 deletions(-)
 create mode 100644 server/Test/automatingTests.php

(limited to 'server/core/Network.php')

diff --git a/server/Test/automatingTests.php b/server/Test/automatingTests.php
new file mode 100644
index 0000000..5cdee26
--- /dev/null
+++ b/server/Test/automatingTests.php
@@ -0,0 +1,24 @@
+<?php
+include('InitTest.php');
+include_once("../core/Image.php");
+include_once("../core/Compute.php");
+include_once("../core/Network.php");
+include_once("../core/FloatingIp.php");
+include_once("../core/Automating.php");
+
+$image = new Image($App);
+$compute = new Compute($App);
+$network = new Network($App);
+$floatingIp = new FloatingIp($App);
+$automating = new Automating($App);
+
+
+$compute->listServers();
+
+$servers = json_decode($App->show(), true)["Servers"];
+
+foreach($servers as $server){
+	echo $server->name." ".$server->id."<br>";
+}
+
+?>
\ No newline at end of file
diff --git a/server/core/FloatingIp.php b/server/core/FloatingIp.php
index 4271a84..c5a947e 100755
--- a/server/core/FloatingIp.php
+++ b/server/core/FloatingIp.php
@@ -105,7 +105,16 @@ class floatingIp implements Core{
 			$this->app->setOutput("Error", "Incorrect parameter opt");
 		}
 		try{
-			$floatingip = null; //obtenir ip
+			$floatingips = listFloatingIps();
+			$floatingIp = null;
+			foreach ($floatingips as $f) {
+				if($f['id'] == $id){
+					$floatingIp = $f;
+				}
+			}
+			if(!isset($floatingIp)){
+				$this->app->setOutput("Error", "Unknowing floatingip id");
+			}
 
 			$floatingip->update();
 
@@ -139,7 +148,16 @@ class floatingIp implements Core{
 			$this->app->setOutput("Error", "Incorrect parameter opt");
 		}
 		try{
-			$floatingip = null; //obtenir ip
+			$floatingips = listFloatingIps();
+			$floatingIp = null;
+			foreach ($floatingips as $f) {
+				if($f['id'] == $id){
+					$floatingIp = $f;
+				}
+			}
+			if(!isset($floatingIp)){
+				$this->app->setOutput("Error", "Unknowing floatingip id");
+			}
 
 			$floatingip->delete();
 			
@@ -173,7 +191,16 @@ class floatingIp implements Core{
 			$this->app->setOutput("Error", "Incorrect parameter opt");
 		}
 		try{
-			$floatingip = null; //obtenir ip
+			$floatingips = listFloatingIps();
+			$floatingIp = null;
+			foreach ($floatingips as $f) {
+				if($f['id'] == $id){
+					$floatingIp = $f;
+				}
+			}
+			if(!isset($floatingIp)){
+				$this->app->setOutput("Error", "Unknowing floatingip id");
+			}
 
 			$floatingip->retrieve();
 			
diff --git a/server/core/Network.php b/server/core/Network.php
index ad0cbaf..fef3512 100755
--- a/server/core/Network.php
+++ b/server/core/Network.php
@@ -333,8 +333,7 @@ class network{
 	* retrieve a specific network
 	* @param networkId ID of network which we want to get
 	* @return Network
-	*/
-	retrieve a specific network 
+	*/ 
 	private function getNetwork()
 	{
 		$network="";
@@ -592,7 +591,6 @@ class network{
 	* Delete a network given
 	*
 	* @param String networkId ID if network which we want to delete
-	
 	* 
 	*
 	* @return void	
@@ -627,7 +625,6 @@ class network{
 	* Delete a subnet given
 	*
 	* @param String subnetId ID if network which we want to delete
-	
 	* 
 	*
 	* @return void	
@@ -1187,7 +1184,7 @@ class network{
 	* @return void
 	*/
 	private function deleteSecurityGroupe()
-     	{	
+    {	
 		try
 		{
 		
@@ -1210,4 +1207,5 @@ class network{
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
         	}
-	}	
+	}
+}	
-- 
cgit v1.2.3


From 438b9b4dcdee7e0c18c3477bb9592ac7efbebfec Mon Sep 17 00:00:00 2001
From: Yoggzo <yogg@epsina.com>
Date: Tue, 19 Apr 2016 23:16:37 +0200
Subject: Correction de cette putain de classe non testee par othmane

---
 server/core/Network.php | 310 ++++++++++++++++++++++++++++--------------------
 1 file changed, 184 insertions(+), 126 deletions(-)

(limited to 'server/core/Network.php')

diff --git a/server/core/Network.php b/server/core/Network.php
index fef3512..9564f06 100755
--- a/server/core/Network.php
+++ b/server/core/Network.php
@@ -14,8 +14,6 @@ use OpenCloud\Common\Error\BaseError;
 use OpenCloud\Common\Error\NotImplementedError;
 use OpenCloud\Common\Error\UserInputError;
 
-include("CoreInterface.php");
-
 /**
 * Network Class of the back-end application
 *
@@ -73,24 +71,29 @@ class network{
 	{
 		$options = array();
 		// check the name if it is null
-		if (isset($this->app->getPostParam("name")))
+		$name = $this->app->getPostParam("name");
+		$adminStateUp = $this->app->getPostParam("adminStateUp");
+		$shared = $this->app->getPostParam("shared");
+		$tenantId = $this->app->getPostParam("tenantId");
+
+		if (isset($name))
 		{
-			$options['name'] = $this->app->getPostParam("name"); 
+			$options['name'] = $name; 
 		}
 		// check the adminStateUp if it is null
-		if (isset($this->app->getPostParam("adminStateUp")))
+		if (isset($adminStateUp))
 		{
-			$options['adminStateUp'] = $this->app->getPostParam("adminStateUp"); 
+			$options['adminStateUp'] = $adminStateUp; 
 		}
 		// check the shared if it is null
-		if (isset($this->app->getPostParam("shared")))
+		if (isset($shared))
 		{
-			$options['shared'] = $this->app->getPostParam("shared"); 
+			$options['shared'] = $shared; 
 		}
 		// check the tenantId if it is null
-		if (isset($this->app->getPostParam("tenantId")))
+		if (isset($tenantId))
 		{
-			$options['tenantId'] = $this->app->getPostParam("tenantId"); 
+			$options['tenantId'] =$tenantId; 
 		}
 		try
 		{
@@ -138,49 +141,61 @@ class network{
 
 	private function create_subnet()
 	{	$options = array();
-		if (isset($this->app->getPostParam("networkId")))
+		$networkId = $this->app->getPostParam("networkId");
+		$ipVersion = $this->app->getPostParam("ipVersion");
+		$cidr = $this->app->getPostParam("cidr");
+		$tenantId = $this->app->getPostParam("tenantId");
+		$name = $this->app->getPostParam("name");
+		$gatewayIp = $this->app->getPostParam("gatewayIp");
+		$dnsNameservers = $this->app->getPostParam("dnsNameservers");
+		$allocationPools = $this->app->getPostParam("allocationPools");
+		$hostRoutes = $this->app->getPostParam("hostRoutes");
+		$enableDhcp = $this->app->getPostParam("enableDhcp");
+		$tenantId = $this->app->getPostParam("tenantId");
+
+		if (isset($networkId))
 		{
 			$options['networkId'] = $networkId; 
 		}
-		if (isset($this->app->getPostParam("ipVersion")))
+		if (isset($ipVersion))
 		{
-			$options['ipVersion'] = $this->app->getPostParam("ipVersion"); 
+			$options['ipVersion'] = $ipVersion; 
 		}
-		if (isset($this->app->getPostParam("cidr")))
+		if (isset($cidr))
 		{
-			$options['cidr'] = $this->app->getPostParam("cidr"); 
+			$options['cidr'] = $cidr; 
 		}
-		if (isset($this->app->getPostParam("tenantId")))
+		if (isset($tenantId))
 		{
-			$options['tenantId'] = $this->app->getPostParam("tenantId"); 
+			$options['tenantId'] = $tenantId; 
 		}
-		if (isset($this->app->getPostParam("name")))
+		if (isset($name))
 		{
-			$options['name'] = $$this->app->getPostParam("name"); 
+			$options['name'] = $name; 
 		}
-		if (isset($this->app->getPostParam("gatewayIp")))
+		if (isset($gatewayIp))
 		{
-			$options['gatewayIp'] = $this->app->getPostParam("gatewayIp"); 
+			$options['gatewayIp'] = $gatewayIp; 
 		}
-		if (isset($this->app->getPostParam("dnsNameservers")))
+		if (isset($dnsNameservers))
 		{
-			$options['dnsNameservers'] = $this->app->getPostParam("dnsNameservers"); 
+			$options['dnsNameservers'] = $dnsNameservers; 
 		}
-		if (isset($this->app->getPostParam("allocationPools")))
+		if (isset($allocationPools))
 		{
-			$options['allocationPools'] = $this->app->getPostParam("allocationPools"); 
+			$options['allocationPools'] = $allocationPools; 
 		}
-		if (isset($this->app->getPostParam("hostRoutes")))
+		if (isset($hostRoutes))
 		{
-			$options['hostRoutes'] = $this->app->getPostParam("hostRoutes"); 
+			$options['hostRoutes'] = $hostRoutes; 
 		}
-		if (isset($this->app->getPostParam("enableDhcp")))
+		if (isset($enableDhcp))
 		{
-			$options['enableDhcp'] = $this->app->getPostParam("enableDhcp"); 
+			$options['enableDhcp'] = $enableDhcp; 
 		}
-		if (isset($this->app->getPostParam("tenantId")))
+		if (isset($tenantId))
 		{
-			$options['tenantId'] = $this->app->getPostParam("tenantId"); 
+			$options['tenantId'] = $tenantId; 
 		}
 		
 		try
@@ -339,10 +354,10 @@ class network{
 		$network="";
 		
 		try
-		{	$newtork = $this->libClass->getNetwork($this->app->getPostParam("networkId"));
-			$network->retrieve();
-
-			
+		{	
+			$networkId = $this->app->getPostParam("networkId");
+			$newtork = $this->libClass->getNetworkP($networkId);
+			$network->retrieve();			
 		}
 
 		
@@ -371,7 +386,7 @@ class network{
 	* @param String netId ID of network which we want to get
 	* @return Network
 	*/
-	private function getNetwork($netId)
+	private function getNetworkP($netId)
 	{
 		$network="";
 		
@@ -413,10 +428,10 @@ class network{
 		$sbnet="";
 		
 		try
-		{	$subnet = $this->libClass->getSubnet($this->app->getPostParam("subnetId"));
+		{	
+			$subnetId = $this->app->getPostParam("subnetId");
+			$subnet = $this->libClass->getSubnet($subnetId);
 			$subnet->retrieve();
-
-			
 		}
 
 		catch(BadResponseError $e)
@@ -443,7 +458,7 @@ class network{
 	* @param String subnetId ID of subnet which we want to get
 	* @return subnet
 	*/
-	private function getSubnet($subnetId)
+	private function getSubnetP($subnetId)
 	{
 		$subnet="";
 		
@@ -489,21 +504,26 @@ class network{
         private function updateNetwork()
      	{	
 		$options = array();
-		if(isset($this->app->getPostParam("name")))
+		$name = $this->app->getPostParam("name");
+		$shared = $this->app->getPostParam("shared");
+		$adminStateUp = $this->app->getPostParam("adminStateUp");
+
+		if(isset($name))
 		{
-			$options['name'] = $this->app->getPostParam("name");	
+			$options['name'] = $name;	
 		}
-		if(isset($this->app->getPostParam("shared")))
+		if(isset($shared))
 		{
-			$options['shared'] = $this->app->getPostParam("shared");	
+			$options['shared'] = $shared;	
 		}
-		if(isset($this->app->getPostParam("adminStateUp")))
+		if(isset($adminStateUp))
 		{
-			$options['adminStateUp'] = $this->app->getPostParam("adminStateUp");	
+			$options['adminStateUp'] = $adminStateUp;	
 		}
 		try
 		{		
-			$network = getNetwork($this->app->getPostParam("networkId"));
+			$networkId = $this->app->getPostParam("networkId");
+			$network = getNetworkP($networkId);
 		
 			$network->update($options);
 		}
@@ -547,26 +567,30 @@ class network{
 	private function updateSubnet()
      	{	
 		$options = array();
-		if(isset($this->app->getPostParam("name")))
+		$name = $this->app->getPostParam("name");
+		$networkId = $this->app->getPostParam("networkId");
+		$ipVersion = $this->app->getPostParam("ipVersion");
+		$cidr = $this->app->getPostParam("cidr");
+		if(isset($name))
 		{
-			$options['name'] = $this->app->getPostParam("name");	
+			$options['name'] = $name;	
 		}
-		if(isset($this->app->getPostParam("networkId")))
+		if(isset($networkId))
 		{
-			$options['networkId'] = $this->app->getPostParam("networkId");	
+			$options['networkId'] = $networkId;	
 		}
-		if(isset($this->app->getPostParam("ipVersion")))
+		if(isset($ipVersion))
 		{
-			$options['ipVersion'] = $this->app->getPostParam("ipVersion");	
+			$options['ipVersion'] = $ipVersion;	
 		}
-		if(isset($this->app->getPostParam("cidr")))
+		if(isset($cidr))
 		{
-			$options['cidr'] = $this->app->getPostParam("cidr");	
+			$options['cidr'] = $cidr;	
 		}
 		try
 		{
-			$subnet = getSubnet($this->app->getPostParam("networkId"));
-		
+			$networkId = $this->app->getPostParam("networkId");
+			$subnet = getSubnetP($networkId);
 			$subnet->update($options);
 		}
 		catch(BadResponseError $e)
@@ -599,8 +623,8 @@ class network{
      	{
 		try
 		{
-				
-			$network = getNetwork($this->app->getPostParam("networkId"));
+			$networkId = $this->app->getPostParam("networkId");
+			$network = getNetworkP($networkId);
 			$network->delete();
 		}
 		catch(BadResponseError $e)
@@ -633,7 +657,8 @@ class network{
      	{
 		try
 		{		
-			$subnet = getNetwork($this->app->getPostParam("subnetId"));
+			$subnetId = $this->app->getPostParam("subnetId");
+			$subnet = getNetworkP($subnetId);
 			$subnet->delete();
 		}
 		catch(BadResponseError $e)
@@ -673,41 +698,51 @@ class network{
 	private function createPort()
 	{
 		$options = array();
-		if (isset($this->app->getPostParam("networkId")))
+		$networkId = $this->app->getPostParam("networkId");
+		$name = $this->app->getPostParam("name");
+		$adminStateUp = $this->app->getPostParam("adminStateUp");
+		$macAddress = $this->app->getPostParam("macAddress");
+		$fixedIps = $this->app->getPostParam("fixedIps");
+		$deviceId = $this->app->getPostParam("deviceId");
+		$deviceOwner = $this->app->getPostParam("deviceOwner");
+		$securityGroups = $this->app->getPostParam("securityGroups");
+		$tenantId = $this->app->getPostParam("tenantId");
+
+		if (isset($networkId))
 		{
-			$options['networkId'] = $this->app->getPostParam("networkId"); 
+			$options['networkId'] = $networkId; 
 		}
-		if (isset($this->app->getPostParam("name")))
+		if (isset($name))
 		{
-			$options['name'] = $this->app->getPostParam("name"); 
+			$options['name'] = $name; 
 		}
-		if (isset($this->app->getPostParam("adminStateUp")))
+		if (isset($adminStateUp))
 		{
-			$options['adminStateUp'] = $this->app->getPostParam("adminStateUp"); 
+			$options['adminStateUp'] = $adminStateUp; 
 		}
-		if (isset($this->app->getPostParam("macAddress")))
+		if (isset($macAddress))
 		{
-			$options['macAddress'] = $this->app->getPostParam("macAddress"); 
+			$options['macAddress'] = $macAddress; 
 		}
-		if (isset($this->app->getPostParam("fixedIps")))
+		if (isset($fixedIps))
 		{
-			$options['fixedIps'] = $this->app->getPostParam("fixedIps"); 
+			$options['fixedIps'] = $fixedIps; 
 		}
-		if (isset($this->app->getPostParam("deviceId")))
+		if (isset($deviceId))
 		{
-			$options['deviceId'] = $this->app->getPostParam("deviceId"); 
+			$options['deviceId'] = $deviceId; 
 		}
-		if (isset($this->app->getPostParam("deviceOwner")))
+		if (isset($deviceOwner))
 		{
-			$options['deviceOwner'] = $this->app->getPostParam("deviceOwner"); 
+			$options['deviceOwner'] = $deviceOwner; 
 		}
-		if (isset($this->app->getPostParam("securityGroups")))
+		if (isset($securityGroups))
 		{
-			$options['securityGroups'] = $this->app->getPostParam("securityGroups"); 
+			$options['securityGroups'] = $securityGroups; 
 		}
-		if (isset($this->app->getPostParam("tenantId")))
+		if (isset($tenantId))
 		{
-			$options['tenantId'] = $this->app->getPostParam("tenantId"); 
+			$options['tenantId'] = $tenantId; 
 		}
 		try
 		{
@@ -771,7 +806,8 @@ class network{
 	{
 		try
 		{
-			$port = $this->libClass->getport($this->app->getPostParam("portId"));
+			$portId = $this->app->getPostParam("portId");
+			$port = $this->libClass->getport($portId);
 			$this->app->setOutput("Port", $port);
 		}
 		catch(BadResponseError $e)
@@ -800,7 +836,7 @@ class network{
 	* @return port
 	*/
 
-	private function getPort($portId)
+	private function getPortP($portId)
 	{
 		try
 		{
@@ -845,46 +881,55 @@ class network{
 	private function updatePort()
 	{
 		$options = array();
-		
-		if (isset($this->app->getPostParam("networkId")))
+		$networkId = $this->app->getPostParam("networkId");
+		$name = $this->app->getPostParam("name");
+		$adminStateUp = $this->app->getPostParam("adminStateUp");
+		$macAddress = $this->app->getPostParam("macAddress");
+		$fixedIps = $this->app->getPostParam("fixedIps");
+		$deviceId = $this->app->getPostParam("deviceId");
+		$deviceOwner = $this->app->getPostParam("deviceOwner");
+		$securityGroups = $this->app->getPostParam("securityGroups");
+		$tenantId = $this->app->getPostParam("tenantId");
+
+		if (isset($networkId))
 		{
-			$options['networkId'] = $this->app->getPostParam("networkId"); 
+			$options['networkId'] = $networkId; 
 		}
-		if (isset($this->app->getPostParam("name")))
+		if (isset($name))
 		{
-			$options['name'] =$this->app->getPostParam("name"); 
+			$options['name'] = $name; 
 		}
-		if (isset($this->app->getPostParam("adminStateUp")))
+		if (isset($adminStateUp))
 		{
-			$options['adminStateUp'] =$this->app->getPostParam("adminStateUp"); 
+			$options['adminStateUp'] = $adminStateUp; 
 		}
-		if (isset($this->app->getPostParam("macAddress")))
+		if (isset($macAddress))
 		{
-			$options['macAddress'] = $this->app->getPostParam("macAddress"); 
+			$options['macAddress'] = $macAddress; 
 		}
-		if (isset($this->app->getPostParam("fixedIps")))
+		if (isset($fixedIps))
 		{
-			$options['fixedIps'] = $this->app->getPostParam("fixedIps"); 
+			$options['fixedIps'] = $fixedIps; 
 		}
-		if (isset($this->app->getPostParam("deviceId")))
+		if (isset($deviceId))
 		{
-			$options['deviceId'] = $this->app->getPostParam("deviceId"); 
+			$options['deviceId'] = $deviceId; 
 		}
-		if (isset($this->app->getPostParam("deviceOwner")))
+		if (isset($deviceOwner))
 		{
-			$options['deviceOwner'] = $this->app->getPostParam("deviceOwner"); 
+			$options['deviceOwner'] = $deviceOwner; 
 		}
-		if (isset($this->app->getPostParam("networkId")))
+		if (isset($securityGroups))
 		{
-			$options['securityGroups'] = $this->app->getPostParam("securityGroups"); 
+			$options['securityGroups'] = $securityGroups; 
 		}
-		if (isset($this->app->getPostParam("tenantId")))
+		if (isset($tenantId))
 		{
-			$options['tenantId'] = $this->app->getPostParam("tenantId"); 
+			$options['tenantId'] = $tenantId; 
 		}
 		try
 		{
-			$port = getPort($this->app->getPostParam("networkId"));
+			$port = getPortP($networkId);
 			$port->update($options);
 		}
 		catch(BadResponseError $e)
@@ -908,7 +953,6 @@ class network{
 	* Delete a port given
 	*
 	* @param String portId 	id of port which we wante to delete
-	
 	* @return void
 	*/
 	private function deletePort()
@@ -916,7 +960,8 @@ class network{
 		
 		try
 		{
-			$port = getPort($this->app->getPostParam("portId"));
+			$portId = $this->app->getPostParam("portId");
+			$port = getPortP($portId);
 			$port->delete();
 		}
 		catch(BadResponseError $e)
@@ -949,13 +994,16 @@ class network{
 	private function createSecurityGroup()
 	{
 		$options = array();
-		if (isset($this->app->getPostParam("name")))
+		$name = $this->app->getPostParam("name");
+		$description = $this->app->getPostParam("description");
+
+		if (isset($name))
 		{
-			$options['name'] = $this->app->getPostParam("name"); 
+			$options['name'] = $name; 
 		}
-		if (isset($this->app->getPostParam("description")))
+		if (isset($description))
 		{
-			$options['description'] = $this->app->getPostParam("description"); 
+			$options['description'] = $description; 
 		}
 		try
 		{
@@ -997,37 +1045,46 @@ class network{
 	private function createSecurityGroupRule()
 	{
 		$options = array();
-		if (isset($this->app->getPostParam("securityGroupId")))
+		$securityGroupId = $this->app->getPostParam("securityGroupId");
+		$direction = $this->app->getPostParam("direction");
+		$ethertype = $this->app->getPostParam("ethertype");
+		$portRangeMin = $this->app->getPostParam("portRangeMin");
+		$portRangeMax = $this->app->getPostParam("portRangeMax");
+		$protocol = $this->app->getPostParam("protocol");
+		$remoteGroupId = $this->app->getPostParam("remoteGroupId");
+		$remoteIpPrefix = $this->app->getPostParam("remoteIpPrefix");
+
+		if (isset($securityGroupId))
 		{
-			$options['securityGroupId'] = $this->app->getPostParam("securityGroupId"); 
+			$options['securityGroupId'] = $securityGroupId; 
 		}
-		if (isset($this->app->getPostParam("direction")))
+		if (isset($direction))
 		{
-			$options['direction'] = $this->app->getPostParam("direction"); 
+			$options['direction'] = $direction; 
 		}
-		if (isset($this->app->getPostParam("ethertype")))
+		if (isset($ethertype))
 		{
-			$options['ethertype'] = $this->app->getPostParam("ethertype"); 
+			$options['ethertype'] = $ethertype; 
 		}
-		if (isset($this->app->getPostParam("portRangeMin")))
+		if (isset($portRangeMin))
 		{
-			$options['portRangeMin'] = $this->app->getPostParam("portRangeMin"); 
+			$options['portRangeMin'] = $portRangeMin; 
 		}
-		if (isset($this->app->getPostParam("portRangeMax")))
+		if (isset($portRangeMax))
 		{
-			$options['portRangeMax'] = $this->app->getPostParam("portRangeMax"); 
+			$options['portRangeMax'] = $portRangeMax; 
 		}
-		if (isset($this->app->getPostParam("protocol")))
+		if (isset($protocol))
 		{
-			$options['protocol'] = $this->app->getPostParam("protocol"); 
+			$options['protocol'] = $protocol; 
 		}
-		if (isset($this->app->getPostParam("remoteGroupId")))
+		if (isset($remoteGroupId))
 		{
-			$options['remoteGroupId'] = $this->app->getPostParam("remoteGroupId"); 
+			$options['remoteGroupId'] = $remoteGroupId; 
 		}
-		if (isset($this->app->getPostParam("remoteIpPrefix")))
+		if (isset($remoteIpPrefix))
 		{
-			$options['remoteIpPrefix'] = $this->app->getPostParam("remoteIpPrefix"); 
+			$options['remoteIpPrefix'] = $remoteIpPrefix; 
 		}
 		try
 		{
@@ -1125,7 +1182,8 @@ class network{
 	{
 		try
 		{
-			$securityGroupe = $this->libClass->getSecurityGroupe($this->app->getPostParam("securityGroupeId"));
+			$securityGroupId = $this->app->getPostParam("securityGroupeId");
+			$securityGroupe = $this->libClass->getSecurityGroupe($securityGroupId);
 			$this->app->setOutput("securityGroupe", $securityGroupe);
 		}
 		catch(BadResponseError $e)
@@ -1153,7 +1211,7 @@ class network{
 	* @param securityGroupeId ID of security Groupe which we want to get
 	* @return securityGroupe
 	*/
-	private function getSecurityGroupe($securityGroupeId)
+	private function getSecurityGroupeP($securityGroupeId)
 	{
 		try
 		{
@@ -1187,8 +1245,8 @@ class network{
     {	
 		try
 		{
-		
-			$securityGroupe = getSecurityGroupe($this->app->getPostParam("securityGroupeId"));
+			$securityGroupId = $this->app->getPostParam("securityGroupeId");
+			$securityGroupe = getSecurityGroupeP($securityGroupId);
 			$securityGroupe->delete();
 		}
 		catch(BadResponseError $e)
-- 
cgit v1.2.3


From 94629aeaf523f391f09ef18c1b2ca639e0b02d08 Mon Sep 17 00:00:00 2001
From: Yoggzo <yogg@epsina.com>
Date: Tue, 19 Apr 2016 23:57:03 +0200
Subject: tentative ip publique

---
 server/Test/automatingTests.php | 65 ++++++++++++++++++++++++++++++++++++++---
 server/core/FloatingIp.php      | 51 ++++++++++++++++++++++++++++++--
 server/core/Network.php         |  2 +-
 3 files changed, 111 insertions(+), 7 deletions(-)

(limited to 'server/core/Network.php')

diff --git a/server/Test/automatingTests.php b/server/Test/automatingTests.php
index 8715464..078f86b 100755
--- a/server/Test/automatingTests.php
+++ b/server/Test/automatingTests.php
@@ -2,27 +2,84 @@
 include('InitTest.php');
 include_once("../core/Image.php");
 include_once("../core/Compute.php");
-//include_once("../core/Network.php");
+include_once("../core/Network.php");
 //include_once("../core/Automating.php");
 include_once("../core/FloatingIp.php");
 
 $image = new Image($App);
 $compute = new Compute($App);
-//$network = new Network($App);
+$network = new Network($App);
 $floatingIp = new FloatingIp($App);
 //$automating = new Automating($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']."<br>";
+	echo $server['name']." ".$server['id']." ".$server['ipv4']."<br>";
+	if(strcmp($server['name'], "bob")){
+		$id = $server['id'];
+	}	
 }
+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 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;
+$opt['floatingip'] = $ip;
+//$opt['tenantId'] = "fbf5f920a7954b61b352bc09ce5ae803 ";
+//$opt['fixedIpAddress'] = "10.0.0.52";
+//$opt['floatingIpAddress'] = "148.60.11.116";
+//$opt['portId'] = "10.0.0.52";
+
+$App->setPostParam('opt', $opt);
+$floatingIp->action("createFloatingIp");
+$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>";
 
 // liste des floatingip
+echo "Liste des floatingip : </br>";
 $floatingIp->action("listFloatingIp");
 $listFloatingIp =  json_decode($App->show(), true)["FloatingIp"];
 foreach ($listFloatingIp as $floatIp){
-	echo "IP : ".$floatIp['floating_ip_address']." et ID: ".$floatIp['id']." ".$floatIp["status"]."<br>";
+	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 f26c3fb..528ab4f 100755
--- a/server/core/FloatingIp.php
+++ b/server/core/FloatingIp.php
@@ -68,7 +68,6 @@ class floatingIp {
 			$result = array();
 			$l = $this->libClass->listFloatingIps();
 			error_log(var_export($l, true), 0);
-			echo 'toto';
 			foreach ($l as $tmp) {
 				$result[] = $tmp;
 			}
@@ -101,13 +100,61 @@ class floatingIp {
 			$this->app->setOutput("Error", "Incorrect parameter opt");
 		}
 		try{
-			$floatingip = $this->libClass->create($opt);
+			$floatingip = $this->libClass->createFloatingIp($opt);
+			echo 'YOLO';
 			if(!isset($floatingip)){
 				$this->app->setOutput("Error", "Unknowing error during floating ip creation");
 			}
 			else{
 				$this->app->setOutput("FloatingIp", $floatingip);
 			}
+		}catch(BadResponseError $e){
+			echo $e."</br>";
+			$this->app->getErrorInstance()->BadResponseHandler($e);
+        }catch(UserInputError $e){
+        	echo $e."</br>";
+			$this->app->getErrorInstance()->UserInputHandler($e);
+        }catch(BaseError $e){
+        	echo $e."</br>";
+			$this->app->getErrorInstance()->BaseErrorHandler($e);
+        }catch(NotImplementedError $e){
+        	echo $e."</br>";
+			$this->app->getErrorInstance()->NotImplementedHandler($e);
+        }catch(Exception $e){
+        	echo $e->getMessage()."</br>";
+        	$this->app->getErrorInstance()->OtherException($e);
+        }
+	}
+
+
+	/**
+	* Show floatingip details
+	*
+	* @param String id the id of the floatingip
+	*
+	* @return floatingip details
+	*/
+	private function getFloatingIp(){
+		$id = $this->app->getPostParam("id");
+		if(!isset($id)){
+			$this->app->setOutput("Error", "Incorrect parameter opt");
+		}
+
+		try{
+			/*$l = $this->listFloatingIp();
+			$res = null;
+			foreach ($l as $f) {
+				if($f['id']==$id){
+					$res = $f;
+				}
+			}
+			if(!isset($f)){
+				$this->app->setOutput("Error", "Unknow id");
+			}
+			else{*/
+				$res = $this->libClass->getFloatingIp($id);
+				$this->app->setOutput("FloatingIp", $res);
+			//}
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
         }catch(UserInputError $e){
diff --git a/server/core/Network.php b/server/core/Network.php
index 9564f06..3e5e2ca 100755
--- a/server/core/Network.php
+++ b/server/core/Network.php
@@ -40,7 +40,7 @@ class network{
 	
 	public function __construct($app){
 		$this->app = $app;
-		$this->libClass = $app->getLibClass("network");
+		$this->libClass = $app->getLibClass("Network");
 		
 	}
 
-- 
cgit v1.2.3


From 20dc35d9ab6ce3b9aafeeca14be52b70a30aaf1e Mon Sep 17 00:00:00 2001
From: EoleDev <root@serverpc.home>
Date: Wed, 20 Apr 2016 09:45:24 +0200
Subject: Error correction automating

---
 server/Test/automatingTests.php | 15 ++++++++++++---
 server/core/Network.php         |  4 ++--
 2 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'server/core/Network.php')

diff --git a/server/Test/automatingTests.php b/server/Test/automatingTests.php
index 078f86b..6b0e9d6 100755
--- a/server/Test/automatingTests.php
+++ b/server/Test/automatingTests.php
@@ -34,7 +34,15 @@ foreach ($ports as $p) {
 	echo $p["fixedIps"]."</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>";
@@ -50,12 +58,13 @@ echo "</br>";
 
 // Création d'une ip flotante
 $opt = array();
-$opt['floatingNetworkId'] = $id;
-$opt['floatingip'] = $ip;
+//$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");
diff --git a/server/core/Network.php b/server/core/Network.php
index 3e5e2ca..e93c2c5 100755
--- a/server/core/Network.php
+++ b/server/core/Network.php
@@ -118,7 +118,7 @@ class network{
 
 		
 	}
-
+	
 	/**
 	* Create a new subnet
 	*
@@ -356,7 +356,7 @@ class network{
 		try
 		{	
 			$networkId = $this->app->getPostParam("networkId");
-			$newtork = $this->libClass->getNetworkP($networkId);
+			$newtork = $this->libClass->getNetwork($networkId);
 			$network->retrieve();			
 		}
 
-- 
cgit v1.2.3


From 5263cf00a253891396c442fe5be29762fb8be50d Mon Sep 17 00:00:00 2001
From: EoleDev <EoleDev@outlook.fr>
Date: Tue, 26 Apr 2016 20:42:31 +0200
Subject: Refactoring of comments beginning

---
 server/config.inc.php                       |   22 +-
 server/core/App.php                         |  164 +++-
 server/core/Automating.php                  |    9 +-
 server/core/Compute.php                     |  550 +++++------
 server/core/CoreInterface.php               |   10 +-
 server/core/ErrorManagement.php             |   66 +-
 server/core/Identity.php                    | 1413 ++++++++++-----------------
 server/core/Image.php                       |  222 ++---
 server/core/LibOverride/genTokenOptions.php |  104 +-
 server/core/Network.php                     |  318 +++---
 server/core/NetworkLayer3.php               |  156 +--
 server/index.php                            |  136 +--
 server/init.php                             |   89 +-
 13 files changed, 1525 insertions(+), 1734 deletions(-)

(limited to 'server/core/Network.php')

diff --git a/server/config.inc.php b/server/config.inc.php
index aa10504..4a4e494 100755
--- a/server/config.inc.php
+++ b/server/config.inc.php
@@ -1,11 +1,21 @@
 <?php
-	date_default_timezone_set('Europe/Paris');
+/**
+* File containing the code for the API door.
+*
+* @version 1.0 Initialisation of this file
+* @since 1.0 Core application's file
+* 
+* @author Eole 'eoledev at outlook . fr'
+* 
+*/
 
-	$config = Array();
-	
-	$config["modules_enabled"] = "";
-	$config["urlAuth"] = "http://148.60.11.31:5000/v3";
-	$config["tokenTime"] = 60 //minute = 60
+date_default_timezone_set('Europe/Paris');
+
+$config = Array();
+
+$config["modules_enabled"] = "";
+$config["urlAuth"] = "http://148.60.11.31:5000/v3";
+$config["tokenTime"] = 60; //minute = 60
 ?>
 
 	
diff --git a/server/core/App.php b/server/core/App.php
index 114d945..3a027d7 100755
--- a/server/core/App.php
+++ b/server/core/App.php
@@ -1,21 +1,53 @@
 <?php
+/**
+* File containing the identity Class.
+*
+* @version 1.0 Initialisation of this file
+* @since 1.0 Core application's file
+* 
+* @author Eole 'eoledev at outlook . fr'
+* 
+*/
+
+//Library token management override
 include_once("core/LibOverride/genTokenOptions.php");
 include_once("core/ErrorManagement.php");
 
+//Library loading
 use OpenCloud\Common\Error\BadResponseError;
 use OpenCloud\Common\Error\BaseError;
 use OpenCloud\Common\Error\NotImplementedError;
 use OpenCloud\Common\Error\UserInputError;
 
+/**
+* App Class of the back-end application
+*
+* This class allow the communication between the front-end application and
+* the library which allow to send requests to an Openstack instance.
+*
+*/
 class App{
 	
+	/** @var Openstack $openstack protected, contains the main library object */
 	protected $openstack;
+	/** @var Array $postParams protected, contains the post parameters */
 	protected $postParams;
+	/** @var genTokenOptions $tokenClass protected, contains the class object for the authentication override of the library */
 	protected $tokenClass;
+	/** @var String $tokenPost protected, contains the token given in parameter */
 	protected $tokenPost;
+	/** @var errorManagement $errorClass protected, contains the errorManagement object */
 	protected $errorClass;
+	/** @var Array $output protected, contains the result for the API call */
 	protected $output;
 
+	/**
+	* App constructor
+	*
+	* @param Array $args Args for the OpenStack Library
+	*
+	* @return App object
+	*/
 	public function __construct($args){
 
 		$this->tokenPost = NULL;
@@ -27,6 +59,13 @@ class App{
 
 	}
 	
+	/**
+	* Set the class var $tokenPost and load the token
+	* into the genTokenOptions Class
+	*
+	* @param String $token token to be set
+	*
+	*/
 	public function setToken($token){
 		
 		$this->tokenPost = $token;
@@ -34,42 +73,59 @@ class App{
 		
 	}
 	
+	/**
+	* Check the expiration of the token
+	*
+	* @return Boolean if the token is not expired
+	*/
 	public function checkToken(){
 		return $this->tokenClass->checkToken();
 	}
 	
+	/**
+	* Get the service Class given the name in parameter
+	*
+	* @param String $service Name of the service 
+	*
+	* @return Core object
+	*/
 	public function getLibClass($service){
 		
 		switch($service){
-			case "Identity":
-				if($this->tokenPost == NULL) $this->tokenClass->genIdentityToken();
-				$opt = $this->tokenClass->getOptions($service);
-				return $this->openstack->identityV3($opt);
-				break;
-			case "Image":
-				if($this->tokenPost == NULL) $this->tokenClass->genImageToken();
-				$opt = $this->tokenClass->getOptions($service);
-				return $this->openstack->imagesV2($opt);
-				break;
-			case "Network":
-				if($this->tokenPost == NULL) $this->tokenClass->genNetworkToken();
-				$opt = $this->tokenClass->getOptions($service);
-				return $this->openstack->networkingV2($opt);
-				break;
-			case "Compute":
-				if($this->tokenPost == NULL) $this->tokenClass->genComputeToken();
-				$opt = $this->tokenClass->getOptions($service);
-				return $this->openstack->computeV2($opt);
-				break;
-			case "NetworkLayer3":
-				if($this->tokenPost == NULL) $this->tokenClass->genNetworkToken();
-				$opt = $this->tokenClass->getOptions('Network');
-				return $this->openstack->networkingV2ExtLayer3($opt);
-				break;
+		case "Identity":
+			if($this->tokenPost == NULL) $this->tokenClass->genIdentityToken();
+			$opt = $this->tokenClass->getOptions($service);
+			return $this->openstack->identityV3($opt);
+			break;
+		case "Image":
+			if($this->tokenPost == NULL) $this->tokenClass->genImageToken();
+			$opt = $this->tokenClass->getOptions($service);
+			return $this->openstack->imagesV2($opt);
+			break;
+		case "Network":
+			if($this->tokenPost == NULL) $this->tokenClass->genNetworkToken();
+			$opt = $this->tokenClass->getOptions($service);
+			return $this->openstack->networkingV2($opt);
+			break;
+		case "Compute":
+			if($this->tokenPost == NULL) $this->tokenClass->genComputeToken();
+			$opt = $this->tokenClass->getOptions($service);
+			return $this->openstack->computeV2($opt);
+			break;
+		case "NetworkLayer3":
+			if($this->tokenPost == NULL) $this->tokenClass->genNetworkToken();
+			$opt = $this->tokenClass->getOptions('Network');
+			return $this->openstack->networkingV2ExtLayer3($opt);
+			break;
 		}
 		
 	}
 	
+	/**
+	* Generate the token for the different services in OpenStack
+	*
+	* @return NULL
+	*/
 	public function authenticate(){
 		
 		try{
@@ -81,16 +137,21 @@ class App{
 			$this->setOutput("token", $this->tokenClass->getBackup());
 		}catch(BadResponseError $e){
 			$this->errorClass->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->errorClass->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->errorClass->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->errorClass->NotImplementedHandler($e);
-    }
+		}
 		
 	}
 	
+	/**
+	* Revoke the openstack services' token
+	*
+	* @return NULL
+	*/
 	public function deauthenticate(){
 		
 		try{
@@ -103,16 +164,23 @@ class App{
 			$this->setOutput("deauthenticate", "Ok");
 		}catch(BadResponseError $e){
 			$this->errorClass->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->errorClass->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->errorClass->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->errorClass->NotImplementedHandler($e);
-    }
+		}
 		
 	}
 	
+	/**
+	* Retrieve a post parameter given its name
+	*
+	* @param String $name Expected post parameter's name
+	*
+	* @return Object Post value
+	*/
 	public function getPostParam($name){
 
 		if(isset($this->postParams[$name])){
@@ -123,28 +191,52 @@ class App{
 		
 	}
 
-
+	/**
+	* Set a post parameter for automating task
+	*
+	* @param String $param Name for the Post entry
+	* @param Object $value Value for the Post entry
+	*
+	* @return NULL
+	*/
 	public function setPostParam($param, $value){
 		
 		$this->postParams[$param] = $value;
-	
+		
 	}
 	
+	/**
+	* Set a new output message
+	*
+	* @param String $key Array key for the message
+	* @param Array $out Message's value
+	*
+	* @return NULL
+	*/
 	public function setOutput($key, $out){
 		
 		$this->output[$key] = $out;
 		
 	}
 	
+	/**
+	* Retrieve the errorManagement instance Object
+	*
+	* @return errorManagement object
+	*/
 	public function getErrorInstance(){
 		
 		return $this->errorClass;
 		
 	}
 	
+	/**
+	* Output the messages to be send to the client
+	*
+	* @return NULl
+	*/
 	public function show(){
 		echo json_encode($this->output);
-		//error_log(var_dump(json_encode($this->output), true), 0);
 	}
 	
 }
diff --git a/server/core/Automating.php b/server/core/Automating.php
index fb42702..2d8db00 100755
--- a/server/core/Automating.php
+++ b/server/core/Automating.php
@@ -5,9 +5,8 @@
 * @version 1.0 Initialisation of this file
 * @since 1.0 Core application's file
 * 
-* @author Evan Pisani 'yogg at epsina . com' et bhupi
+* @author Evan Pisani 'yogg at epsina . com', bhupi
 * 
-* @todo Complete the functions with errors detection and finish the descriptions
 */
 
 include("Image.php");
@@ -44,10 +43,10 @@ class automating{
 	*
 	* @param String $action name of another function of this class
 	*
-	* @return void
+	* @return NULL
 	*/
 	public function action($action){
-		 $this->{$action.""}();	
+		$this->{$action.""}();	
 	}
 	
 	/**
@@ -58,7 +57,7 @@ class automating{
 	* @param String $serverName name ofthe new server
 	* @param String $flavor kind of server
 	*	
-	* @return void
+	* @return NULL
 	*/
 	private function createPublicServer()
 	{
diff --git a/server/core/Compute.php b/server/core/Compute.php
index 4a7fe6c..e466b52 100755
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -4,170 +4,170 @@ use OpenCloud\Common\Error;
 
 class compute 
 {
-        /** @var App $app protected, contains the main app object */
-        protected $app;
+	/** @var App $app protected, contains the main app object */
+	protected $app;
 
-        /** @var OpenStack\Identity $libClass protected, contains the library Compute object */
-        protected $libClass;
+	/** @var OpenStack\Identity $libClass protected, contains the library Compute object */
+	protected $libClass;
 
 
-	    public function __construct($app)
-    	{
-       	         $this->app = $app;
-        	 $this->libClass = $app->getLibClass("Compute");
-    	}
+	public function __construct($app)
+	{
+		$this->app = $app;
+		$this->libClass = $app->getLibClass("Compute");
+	}
 	/**
 	* Execute an action
 	*
 	* @param String $action name of another function of this class
 	*
-	* @return void
+	* @return NULL
 	*/
 	public function action($action){
 		
-		 $this->{$action.""}();
+		$this->{$action.""}();
 		
 	}
-    	/**
-     	* List servers.
-     	* @return array
-     	*/
-        public function listServers()
-        {
+	/**
+			* List servers.
+			* @return array
+			*/
+	public function listServers()
+	{
 		try{
 			$serverList = $this->libClass->listServers(true);
 			$servers = Array();
 			foreach($serverList as $server){
-			$servers[$server->id] = Array();
-			$server->flavor->retrieve();
-			$server->image->retrieve();
-			$server->retrieve();
-			$servers[$server->id]["id"]  = $server->id;
-			$servers[$server->id]["name"] = $server->name;
-			$servers[$server->id]["image"] = $server->image; 
-			$servers[$server->id]["ram"] = $server->flavor->ram;
-			$servers[$server->id]["disk"] = $server->flavor->disk;
-			$servers[$server->id]["flavor"] = $server->flavor; 
-			$servers[$server->id]["status"] = $server->status;
-			$servers[$server->id]["created"] = $server->created;
-			$servers[$server->id]["updated"] = $server->updated;
-			$servers[$server->id]["ipv4"] = $server->ipv4;
-			$servers[$server->id]["ipv6"] = $server->ipv6;
-			$servers[$server->id]["progress"] = $server->progress;
-			$servers[$server->id]["hostId"] = $server->hostId;
-			$servers[$server->id]["tenantId"] = $server->tenantId;
-			$servers[$server->id]["userId"] = $server->userId;
-			$servers[$server->id]["taskState"] = $server->taskState;
-			$servers[$server->id]["addresses"] = $server->addresses;
-			$servers[$server->id]["links"] = $server->links;
-			$servers[$server->id]["metadata"] = $server->metadata;
+				$servers[$server->id] = Array();
+				$server->flavor->retrieve();
+				$server->image->retrieve();
+				$server->retrieve();
+				$servers[$server->id]["id"]  = $server->id;
+				$servers[$server->id]["name"] = $server->name;
+				$servers[$server->id]["image"] = $server->image; 
+				$servers[$server->id]["ram"] = $server->flavor->ram;
+				$servers[$server->id]["disk"] = $server->flavor->disk;
+				$servers[$server->id]["flavor"] = $server->flavor; 
+				$servers[$server->id]["status"] = $server->status;
+				$servers[$server->id]["created"] = $server->created;
+				$servers[$server->id]["updated"] = $server->updated;
+				$servers[$server->id]["ipv4"] = $server->ipv4;
+				$servers[$server->id]["ipv6"] = $server->ipv6;
+				$servers[$server->id]["progress"] = $server->progress;
+				$servers[$server->id]["hostId"] = $server->hostId;
+				$servers[$server->id]["tenantId"] = $server->tenantId;
+				$servers[$server->id]["userId"] = $server->userId;
+				$servers[$server->id]["taskState"] = $server->taskState;
+				$servers[$server->id]["addresses"] = $server->addresses;
+				$servers[$server->id]["links"] = $server->links;
+				$servers[$server->id]["metadata"] = $server->metadata;
 			}
 			$this->app->setOutput("Servers", $servers);
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        	}
+		}
 		catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-	        }
+		}
 		catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }
+		}
 		catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }
+		}
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
-	        }
-                return;
-        }
-        /**
-         * List flavors.
-         * @return array
-         */
-        public function listFlavors()
-        {
+		}
+		return;
+	}
+	/**
+				* List flavors.
+				* @return array
+				*/
+	public function listFlavors()
+	{
 		try{
 			$flavorList = $this->libClass->listFlavors();
 			$flavors = Array();
 			foreach($flavorList as $flavor){
-			$flavors[$flavor->id] = Array();
-			$flavor->retrieve();
-			$flavors[$flavor->id]["id"]  = $flavor->id;
-			$flavors[$flavor->id]["name"] = $flavor->name;
-			$flavors[$flavor->id]["ram"] = $flavor->ram;
-			$flavors[$flavor->id]["disk"] = $flavor->disk;
-			$flavors[$flavor->id]["vcpus"] = $flavor->vcpus;
-			$flavors[$flavor->id]["links"] = $flavor->links;
-		}
-		$this->app->setOutput("Flavors", $flavors);
+				$flavors[$flavor->id] = Array();
+				$flavor->retrieve();
+				$flavors[$flavor->id]["id"]  = $flavor->id;
+				$flavors[$flavor->id]["name"] = $flavor->name;
+				$flavors[$flavor->id]["ram"] = $flavor->ram;
+				$flavors[$flavor->id]["disk"] = $flavor->disk;
+				$flavors[$flavor->id]["vcpus"] = $flavor->vcpus;
+				$flavors[$flavor->id]["links"] = $flavor->links;
+			}
+			$this->app->setOutput("Flavors", $flavors);
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        	}
+		}
 		catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-	        }
+		}
 		catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }
+		}
 		catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }
+		}
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
-	        }
-                return;
-        }
-        /**
-         * List images.
-         * @return array
-         */
-        public function listImages()
-        {
-               	try{
+		}
+		return;
+	}
+	/**
+				* List images.
+				* @return array
+				*/
+	public function listImages()
+	{
+		try{
 			$imageList = $this->libClass->listImages();
 			$images = Array();
 			foreach($imageList as $image){
-			$images[$image->id] = Array();
-			$image->retrieve();
-			$images[$image->id]["id"]  = $image->id;
-			$images[$image->id]["name"] = $image->name;
-			$images[$image->id]["status"] = $image->status;
-			$images[$image->id]["created"] = $image->created;
-			$images[$image->id]["updated"] = $image->updated;
-			$images[$image->id]["minDisk"] = $image->minDisk;
-			$images[$image->id]["minRam"] = $image->minRam;
-			$images[$image->id]["progress"] = $image->progress;
-			$images[$image->id]["links"] = $image->links;
-			$images[$image->id]["metadata"] = $image->metadata;
-		}
-		$this->app->setOutput("Images", $images);
+				$images[$image->id] = Array();
+				$image->retrieve();
+				$images[$image->id]["id"]  = $image->id;
+				$images[$image->id]["name"] = $image->name;
+				$images[$image->id]["status"] = $image->status;
+				$images[$image->id]["created"] = $image->created;
+				$images[$image->id]["updated"] = $image->updated;
+				$images[$image->id]["minDisk"] = $image->minDisk;
+				$images[$image->id]["minRam"] = $image->minRam;
+				$images[$image->id]["progress"] = $image->progress;
+				$images[$image->id]["links"] = $image->links;
+				$images[$image->id]["metadata"] = $image->metadata;
+			}
+			$this->app->setOutput("Images", $images);
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        	}
+		}
 		catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-	        }
+		}
 		catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }
+		}
 		catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }
+		}
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
-	        }
-                return;
-        }
-       /**
-         * Get server details.
-         * @return array
-         */
-        public function getServer()
-        {
-	       	try{
+		}
+		return;
+	}
+	/**
+				* Get server details.
+				* @return array
+				*/
+	public function getServer()
+	{
+		try{
 			$serverId = $this->app->getPostParam("serverId");
 			if(!isset($serverId)){
 				$this->app->setOutput("Error", "Server ID is missing!");
@@ -180,27 +180,27 @@ class compute
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        	}
+		}
 		catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-	        }
+		}
 		catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }
+		}
 		catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }
+		}
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
-	        }
-                return;
-        }
-        /**
-         * Get flavor details.
-         * @return array
-         */
-        public function getFlavor()
-        {
+		}
+		return;
+	}
+	/**
+				* Get flavor details.
+				* @return array
+				*/
+	public function getFlavor()
+	{
 		try{
 			$flavorId = $this->app->getPostParam("flavorId");
 			if(!isset($serverId)){
@@ -214,27 +214,27 @@ class compute
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        	}
+		}
 		catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-	        }
+		}
 		catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }
+		}
 		catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }
+		}
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
-	        }
-                return;
-        }
-        /**
-         * Get image details.
-         * @return array
-         */
-        public function getImage()
-        {
+		}
+		return;
+	}
+	/**
+				* Get image details.
+				* @return array
+				*/
+	public function getImage()
+	{
 		try{
 			$imageId = $this->app->getPostParam("imageId");
 			if(!isset($serverId)){
@@ -248,27 +248,27 @@ class compute
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        	}
+		}
 		catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-	        }
+		}
 		catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }
+		}
 		catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }
+		}
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
-	        }
-                return;
-        }
-        /**
-         * Create server.
-         * @return array
-         */ 
-        public function createServer()
-        {
+		}
+		return;
+	}
+	/**
+				* Create server.
+				* @return array
+				*/ 
+	public function createServer()
+	{
 		try{
 			$name = $this->app->getPostParam("name");
 			$imageId = $this->app->getPostParam("imageId");
@@ -282,28 +282,28 @@ class compute
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        	}
+		}
 		catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-	        }
+		}
 		catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }
+		}
 		catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }
+		}
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
-	        }
+		}
 		return;
-        }
- 
+	}
+
 	/**
 	* update a server
-	* @return void
+	* @return NULL
 	*/
-        public function updateServer()
-        {
+	public function updateServer()
+	{
 		try{
 			$serverId = $this->app->getPostParam("serverId");
 			$newName = $this->app->getPostParam("newName");
@@ -329,27 +329,27 @@ class compute
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        	}
+		}
 		catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-	        }
+		}
 		catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }
+		}
 		catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }
+		}
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
-	        }
-                return;
-        }
+		}
+		return;
+	}
 	/**
 	* Delete a server
-	* @return void
+	* @return NULL
 	*/
-        public function deleteServer()
-        {
+	public function deleteServer()
+	{
 		try{
 			$serverId = $this->app->getPostParam("serverId");
 			if(!isset($serverId)){
@@ -363,27 +363,27 @@ class compute
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        	}
+		}
 		catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-	        }
+		}
 		catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }
+		}
 		catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }
+		}
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
-	        }
-                return;
-        }
+		}
+		return;
+	}
 	/**
 	* Change the password of a server
-	* @return void
+	* @return NULL
 	*/
-        public function changePassword()
-        {
+	public function changePassword()
+	{
 		try{
 			$serverId = $this->app->getPostParam("serverId");
 			$password = $this->app->getPostParam("newPassword");
@@ -398,27 +398,27 @@ class compute
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        	}
+		}
 		catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-	        }
+		}
 		catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }
+		}
 		catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }
+		}
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
-	        }
+		}
 		return;
-        }
-        /**
+	}
+	/**
 	* Reboot a server
-	* @return void
+	* @return NULL
 	*/
-        public function reboot()
-        {
+	public function reboot()
+	{
 		try{
 			$serverId = $this->app->getPostParam("serverId");
 			if(!isset($serverId)){
@@ -432,74 +432,74 @@ class compute
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        	}
+		}
 		catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-	        }
+		}
 		catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }
+		}
 		catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }
+		}
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
-	        }
-                return;
-        }
-       	/**
+		}
+		return;
+	}
+	/**
 	* Rebuild a server
-	* @return void
+	* @return NULL
 	*/
-        public function rebuild()
-        {
-               	$serverId = $this->app->getPostParam("serverId");
-               	$imageId = $this->app->getPostParam("imageId");
-               	$newName = $this->app->getPostParam("newName");
-               	$adminPass = $this->app->getPostParam("adminPass");
+	public function rebuild()
+	{
+		$serverId = $this->app->getPostParam("serverId");
+		$imageId = $this->app->getPostParam("imageId");
+		$newName = $this->app->getPostParam("newName");
+		$adminPass = $this->app->getPostParam("adminPass");
 		if(!isset($serverId)|| !isset($imageId) || isset($newName) || isset($adminPass)) {
 			$this->app->setOutput("Error", "You'll have to provide server ID and the new image, name and admin password!");
 			return;
-		try{
-			$serverId = $this->app->getPostParam("serverId");
-			$imageId = $this->app->getPostParam("imageId");
-			$newName = $this->app->getPostParam("newName");
-			$adminPass = $this->app->getPostParam("adminPass");
-			if(!isset($serverId)|| !isset($imageId) || isset($newName) || isset($adminPass)){
-				$this->app->setOutput("Error", "You'll have to provide server ID and the new image, name and admin password!");
-				return;
+			try{
+				$serverId = $this->app->getPostParam("serverId");
+				$imageId = $this->app->getPostParam("imageId");
+				$newName = $this->app->getPostParam("newName");
+				$adminPass = $this->app->getPostParam("adminPass");
+				if(!isset($serverId)|| !isset($imageId) || isset($newName) || isset($adminPass)){
+					$this->app->setOutput("Error", "You'll have to provide server ID and the new image, name and admin password!");
+					return;
+				}
+				$opt = array('id' => $serverId);
+				$server = $this->libClass->getServer($opt);
+				$attr = array('imageId' => $imageId, 'name' => $newName, 'adminPass' => $adminPass); 
+				$server->rebuild($attr);
+				$this->app->setOutput("Success", $serverId." has been rebuilt successfully with the new image.");
 			}
-			$opt = array('id' => $serverId);
-			$server = $this->libClass->getServer($opt);
-			$attr = array('imageId' => $imageId, 'name' => $newName, 'adminPass' => $adminPass); 
-			$server->rebuild($attr);
-			$this->app->setOutput("Success", $serverId." has been rebuilt successfully with the new image.");
+			catch(BadResponseError $e){
+				$this->app->getErrorInstance()->BadResponseHandler($e);
+			}
+			catch(UserInputError $e){
+				$this->app->getErrorInstance()->UserInputHandler($e);
+			}
+			catch(BaseError $e){
+				$this->app->getErrorInstance()->BaseErrorHandler($e);
+			}
+			catch(NotImplementedError $e){
+				$this->app->getErrorInstance()->NotImplementedHandler($e);
+			}
+			catch(Exception $e){
+				$this->app->getErrorInstance()->OtherException($e);
+			}
+			return;
 		}
-		catch(BadResponseError $e){
-			$this->app->getErrorInstance()->BadResponseHandler($e);
-        	}
-		catch(UserInputError $e){
-			$this->app->getErrorInstance()->UserInputHandler($e);
-	        }
-		catch(BaseError $e){
-			$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }
-		catch(NotImplementedError $e){
-			$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }
-		catch(Exception $e){
-			$this->app->getErrorInstance()->OtherException($e);
-	        }
-                return;
-        }
-				}
-       	/**
+	}
+	/**
 	* Resize a server
 	* A call to this method has to be followed by either confirmResize or revertResize
-	* @return void
+	* @return NULL
 	*/
-        public function resize()
-        {
+	public function resize()
+	{
 		try{
 			$serverId = $this->app->getPostParam("serverId");
 			$newFlavorId = $this->app->getPostParam("newFlavorId");
@@ -513,27 +513,27 @@ class compute
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        	}
+		}
 		catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-	        }
+		}
 		catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }
+		}
 		catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }
+		}
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
-	        }
-                return;
-        }
-        /**
+		}
+		return;
+	}
+	/**
 	* Confirm resize operation on a server
-	* @return void
+	* @return NULL
 	*/
-        public function confirmResize()
-        {
+	public function confirmResize()
+	{
 		try{
 			$serverId = $this->app->getPostParam("serverId");
 			if(!isset($serverId)){
@@ -547,27 +547,27 @@ class compute
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        	}
+		}
 		catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-	        }
+		}
 		catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }
+		}
 		catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }
+		}
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
-	        }
-                return;
-        }
-        /**
+		}
+		return;
+	}
+	/**
 	* Revert resize operation on a server
-	* @return void
+	* @return NULL
 	*/
-        public function revertResize()
-        {
+	public function revertResize()
+	{
 		try{
 			$serverId = $this->app->getPostParam("serverId");
 			if(!isset($serverId)){
@@ -581,28 +581,28 @@ class compute
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        	}
+		}
 		catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-	        }
+		}
 		catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }
+		}
 		catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }
+		}
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
-	        }
-                return;
-        }
+		}
+		return;
+	}
 	/**
 	* List private and public addresses of a server
-	* @return void
+	* @return NULL
 	*/
-        
-        public function listAddresses(array $options = [])
-        {
+	
+	public function listAddresses(array $options = [])
+	{
 		try{
 			$serverId = $this->app->getPostParam("serverId");
 			if(!isset($serverId)){
@@ -616,20 +616,20 @@ class compute
 		}
 		catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        	}
+		}
 		catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-	        }
+		}
 		catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }
+		}
 		catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }
+		}
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
-	        }
-                return;
-        }
+		}
+		return;
+	}
 }
- 
+
diff --git a/server/core/CoreInterface.php b/server/core/CoreInterface.php
index ed0d959..6c2313b 100755
--- a/server/core/CoreInterface.php
+++ b/server/core/CoreInterface.php
@@ -1,5 +1,13 @@
 <?php
-
+/**
+* File containing Core Interface
+*
+* @version 1.0 Initialisation of this file
+* @since 1.0 Core application's file
+* 
+* @author Eole 'eoledev at outlook . fr'
+* 
+*/
 interface Core{
 	
 	public function action($action);
diff --git a/server/core/ErrorManagement.php b/server/core/ErrorManagement.php
index be7080b..0e315a7 100755
--- a/server/core/ErrorManagement.php
+++ b/server/core/ErrorManagement.php
@@ -22,9 +22,9 @@ Class errorManagement{
 	/**
 	* ErrorManagemement constructor
 	*
-	* @param App $app the main app object
+	* @param App $args the main app object
 	*
-	* @return ErrorManagement
+	* @return ErrorManagement Object
 	*/
 	public function __construct($args){
 
@@ -35,9 +35,9 @@ Class errorManagement{
 	/**
 	* Put an error message corresponding to a base error in the output
 	*
-	* @param $error the error triggered
+	* @param Exception $error the exception triggered
 	*
-	* @return String BaseError message
+	* @return NULL
 	*/
 	public function BaseErrorHandler($error){
 		$this->app->setOutput("Error", "BaseError");
@@ -46,49 +46,49 @@ Class errorManagement{
 	/**
 	* Put an error message corresponding to a bad response in function of the status code in the output
 	*
-	* @param $error the error triggered
+	* @param Exception $error the exception triggered
 	*
-	* @return String Error message
+	* @return NULL
 	*/
 	public function BadResponseHandler($error){
 		$statusCode = $error->getResponse()->getStatusCode();
 		switch ($statusCode) {
-			case 400:
-				$this->app->setOutput("Error", "Invalid input.");
-				break;
+		case 400:
+			$this->app->setOutput("Error", "Invalid input.");
+			break;
 
-			case 401:
-				$this->app->setOutput("Error", "Authentification failed.");
-				break;
+		case 401:
+			$this->app->setOutput("Error", "Authentification failed.");
+			break;
 
-			case 403:
-				$this->app->setOutput("Error", "Operation forbidden.");
-				break;
+		case 403:
+			$this->app->setOutput("Error", "Operation forbidden.");
+			break;
 
-			case 404:
-				$this->app->setOutput("Error", "Ressource not found.");
-				break;
+		case 404:
+			$this->app->setOutput("Error", "Ressource not found.");
+			break;
 
-			case 500:
-				$this->app->setOutput("Error", "Internal server error, please contact an administrator.");
-				break;
+		case 500:
+			$this->app->setOutput("Error", "Internal server error, please contact an administrator.");
+			break;
 
-			case 503:
-				$this->app->setOutput("Error", "Service unvailable for the moment.");
-				break;
+		case 503:
+			$this->app->setOutput("Error", "Service unvailable for the moment.");
+			break;
 			
-			default:
-				$this->app->setOutput("Error", "Unknow error, please contact an administrator.");
-				break;
+		default:
+			$this->app->setOutput("Error", "Unknow error, please contact an administrator.");
+			break;
 		}	
 	}
 	
 	/**
 	* Put an error message corresponding to a not implemented yet error in the output
 	*
-	* @param $error the error triggered
+	* @param Exception $error the exception triggered
 	*
-	* @return String internal error message
+	* @return NULL
 	*/
 	public function NotImplementedHandler($error){
 		$this->app->setOutput("Error", "Internal error (not implemented yet), please contact an administrator");
@@ -97,9 +97,9 @@ Class errorManagement{
 	/**
 	* Put an error message corresponding to a user input error in the output
 	*
-	* @param $error the error triggered
+	* @param Exception $error the exception triggered
 	*
-	* @return String User input error message
+	* @return NULL
 	*/
 	public function UserInputHandler($error){
 		$this->app->setOutput("Error", "UserInputError");
@@ -108,9 +108,9 @@ Class errorManagement{
 	/**
 	* Put an error message corresponding to an other error in the output
 	*
-	* @param $error the error triggered
+	* @param Exception $error the exception triggered
 	*
-	* @return String error message
+	* @return NULL
 	*/
 	public function OtherException($error){
 		$this->app->setOutput("Error", $error->getMessage());
diff --git a/server/core/Identity.php b/server/core/Identity.php
index 464522a..f6179b0 100755
--- a/server/core/Identity.php
+++ b/server/core/Identity.php
@@ -7,15 +7,13 @@
 * 
 * @author Eole 'eoledev at outlook . fr'
 * 
-* @todo Complete the functions and finish the descriptions
 */
 use OpenCloud\Common\Error;
- 
+
 /**
 * Identity Class of the back-end application
 *
-* This class allow the communication between the front-end application and
-* the library which allow to send requests to an Openstack instance.
+* This class implements the management for the identity request
 *
 */
 class identity implements Core{
@@ -31,8 +29,6 @@ class identity implements Core{
 	*
 	* @param App $app the main app object
 	*
-	* @throws [Type] [<description>]
-	*
 	* @return identity
 	*/
 	public function __construct($app){
@@ -47,11 +43,11 @@ class identity implements Core{
 	*
 	* @param String $action name of another function of this class
 	*
-	* @return void
+	* @return NULL
 	*/
 	public function action($action){
 		
-		 $this->{$action.""}();
+		$this->{$action.""}();
 		
 	}
 	/**
@@ -65,7 +61,7 @@ class identity implements Core{
 	* @param String $type Required Type of credential : ec2, cert...
 	* @param String $userId Required Id of the user which own the credential
 	*
-	* @return void
+	* @return NULL
 	*/
 	private function addCredential(){
 		
@@ -88,22 +84,22 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 		
 	}
 	
 	/**
 	* List the credentials for a given user.
 	*
-	* @return void
+	* @return NULL
 	*/
 	private function listCredentials(){
 		try{
@@ -114,15 +110,15 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 		
 	}
 	
@@ -131,7 +127,7 @@ class identity implements Core{
 	*
 	* @param String $credentialId Required credential id for which it retrieve the details
 	*
-	* @return void
+	* @return NULL
 	*/
 	private function showCredential(){
 		$credentId = $this->app->getPostParam("credentialId");
@@ -149,15 +145,15 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 		
 	}
 	
@@ -168,7 +164,7 @@ class identity implements Core{
 	* @param JsonString $blob Required credentials information with this structure for ec2: "{\"access\":\"181920\",\"secret\":\"secretKey\"}"
 	* @param String $type Required Type of credential : ec2, cert...
 	*
-	* @return void
+	* @return NULL
 	*/
 	private function updateCredential(){
 		
@@ -194,15 +190,15 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
@@ -210,7 +206,7 @@ class identity implements Core{
 	*
 	* @param String $credentialId Required credential id to delete
 	*
-	* @return void
+	* @return NULL
 	*/
 	private function deleteCredential(){
 		
@@ -229,16 +225,16 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
-        
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
+		
 	}-
 	
 	/**
@@ -248,7 +244,7 @@ class identity implements Core{
 	* @param String $enabled Optional Domain enabled or not : value true or false
 	* @param String $name Required Domain Name
 	*
-	* @return void
+	* @return NULL
 	*/
 	private function addDomain(){
 		
@@ -262,13 +258,13 @@ class identity implements Core{
 		}
 		
 		if(isset($enabled) && isset($description))
-			$opt = array('description' => $description, 'enabled' => $enabled, 'name' => $name);
+		$opt = array('description' => $description, 'enabled' => $enabled, 'name' => $name);
 		elseif(isset($enabled))
-			$opt = array('enabled' => $enabled, 'name' => $name);
+		$opt = array('enabled' => $enabled, 'name' => $name);
 		elseif(isset($description))
-			$opt = array('description' => $description, 'name' => $name);
+		$opt = array('description' => $description, 'name' => $name);
 		else
-			$opt = array('name' => $name);
+		$opt = array('name' => $name);
 		
 		try{
 			
@@ -278,22 +274,22 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 		
 	}
 	
 	/**
 	* Retrieve the different domain's list.
 	*
-	* @return void
+	* @return NULL
 	*/
 	private function listDomains(){
 		
@@ -305,15 +301,15 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 		
 	}
 	
@@ -322,7 +318,7 @@ class identity implements Core{
 	*
 	* @param String $domainId Required Domain id for which it retrieve the details
 	*
-	* @return void
+	* @return NULL
 	*/
 	private function showDomain(){
 		
@@ -341,15 +337,15 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
@@ -360,7 +356,7 @@ class identity implements Core{
 	* @param String $enabled Optional Domain enabled or not : value true or false
 	* @param String $name Required Domain Name
 	*
-	* @return void
+	* @return NULL
 	*/
 	private function updateDomain(){
 		
@@ -374,17 +370,17 @@ class identity implements Core{
 			return;
 		}
 		
-	
+		
 		try{
 			
 			$domain = $this->libClass->getDomain($domId);
 
 			if(isset($name))
-				$domain->name = $name;
+			$domain->name = $name;
 			if(isset($enabled))
-				$domain->enabled = $enabled;
+			$domain->enabled = $enabled;
 			if(isset($description))
-				$domain->description = $description;
+			$domain->description = $description;
 
 			$domain->update();
 			
@@ -392,15 +388,15 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
@@ -408,7 +404,7 @@ class identity implements Core{
 	*
 	* @param String $domainId Required Domain id to delete
 	*
-	* @return void
+	* @return NULL
 	*/
 	private function deleteDomain(){
 		
@@ -427,23 +423,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Retrieve the different roles of a given user in a domain.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function listRolesDomainUser(){
 		
@@ -464,23 +458,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Grant a role to a given user in a domain.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function grantRoleDomainUser(){
 		$domId = $this->app->getPostParam("domainId");
@@ -496,31 +488,29 @@ class identity implements Core{
 			$domain = $this->libClass->getDomain($domId);
 			
 			$domain->grantUserRole([
-				'userId' => $userId,
-				'roleId' => $roleId,
+			'userId' => $userId,
+			'roleId' => $roleId,
 			]);
 			
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Verify that a user has a given role in a domain.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function checkRoleDomainUser(){
 		$domId = $this->app->getPostParam("domainId");
@@ -545,23 +535,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Delete a role for a given user in a domain.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function revokeRoleDomainUser(){
 		$domId = $this->app->getPostParam("domainId");
@@ -577,31 +565,29 @@ class identity implements Core{
 			$domain = $this->libClass->getDomain($domId);
 
 			$domain->revokeUserRole([
-				'userId' => $userId,
-				'roleId' => $roleId,
+			'userId' => $userId,
+			'roleId' => $roleId,
 			]);
 			
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Retrieve the roles of a given group in a domain.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function listRolesDomainGroup(){
 		$domId = $this->app->getPostParam("domainId");
@@ -622,23 +608,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Add a role to a given group in a domain.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function grantRoleDomainGroup(){
 		$domId = $this->app->getPostParam("domainId");
@@ -654,31 +638,29 @@ class identity implements Core{
 			$domain = $this->libClass->getDomain($domId);
 
 			$domain->grantGroupRole([
-				'groupId' => $groupId,
-				'roleId'  => $roleId,
+			'groupId' => $groupId,
+			'roleId'  => $roleId,
 			]);
 			
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Verify that a role is associated with a given group in a domain.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function checkRoleDomainGroup(){
 		$domId = $this->app->getPostParam("domainId");
@@ -703,29 +685,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Delete a role for a given group in a domain.
 	*
-	* A *description*, that can span multiple lines, to go _in-depth_ into the details of this element
-	* and to provide some background information or textual references.
-	*
-	* @param string $myArgument With a *description* of this argument, these may also
-	*    span multiple lines.
-	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function revokeRoleDomainGroup(){
 		$domId = $this->app->getPostParam("domainId");
@@ -741,8 +715,8 @@ class identity implements Core{
 			$domain = $this->libClass->getDomain($roleId);
 
 			$domain->revokeGroupRole([
-				'groupId' => $groupId,
-				'roleId'  => $roleId,
+			'groupId' => $groupId,
+			'roleId'  => $roleId,
 			]);
 
 			
@@ -750,23 +724,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Add an endpoint to the Openstack instance
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function addEndpoint(){
 		$servId = $this->app->getPostParam("serviceId");
@@ -781,34 +753,32 @@ class identity implements Core{
 		try{
 			
 			$endpoint = $this->libClass->createEndpoint([
-				'interface' => \OpenStack\Identity\v3\Enum::INTERFACE_INTERNAL,
-				'name'      => $name,
-				'region'    => $region,
-				'url'       => $url,
-				'serviceId' => $servId
+			'interface' => \OpenStack\Identity\v3\Enum::INTERFACE_INTERNAL,
+			'name'      => $name,
+			'region'    => $region,
+			'url'       => $url,
+			'serviceId' => $servId
 			]);
 			
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Retrieve the endpoint for the given id
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function getEndpoint(){
 		
@@ -826,24 +796,24 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Retrieve the list of the different endpoints
 	*
-	* @return void
+	* @return NULL
 	*/
 	private function listEndpoints(){
-				
+		
 		try{
 			
 			$res = $this->libClass->listEndpoints();
@@ -852,64 +822,30 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Update a given endpoint
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function updateEndpoint(){
 		//Not Implemented Yet
-		
-		/*$domId = $this->app->getPostParam("domainId");
-		$groupId = $this->app->getPostParam("groupId");
-		
-		if(!isset($domId) || !isset($groupId)){
-			
-		}
-		
-		//TODO  PARAMETERS
-		try{
-			
-			$endpoint = $this->libClass->getEndpoint('{endpointId}');
-
-			$endpoint->interface = \OpenStack\Identity\v3\Enum::INTERFACE_PUBLIC;
-			
-			$endpoint->update();
-			
-			//TODO parse answer
-			
-		}catch(BadResponseError $e){
-			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
-			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
-			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
-			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }*/
 	}
 	
 	/**
 	* Delete a given endpoint
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function deleteEndpoint(){
 		$endId = $this->app->getPostParam("endpointId");
@@ -927,129 +863,48 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Add a group.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function addGroup(){
 		//Not Implemented Yet
-		
-		/*$domId = $this->app->getPostParam("domainId");
-		$groupId = $this->app->getPostParam("groupId");
-		
-		if(!isset($domId) || !isset($groupId)){
-			
-		}
-		try{
-			
-			$this->libClass->listCredentials()
-			
-			//TODO parse answer
-			
-		}catch(BadResponseError $e){
-			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
-			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
-			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
-			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }*/
 	}
 	
 	/**
 	* Retrieve the group's list.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function listGroups(){
 		//Not Implemented Yet
-		/*
-		$domId = $this->app->getPostParam("domainId");
-		$groupId = $this->app->getPostParam("groupId");
-		
-		if(!isset($domId) || !isset($groupId)){
-			
-		}
-		try{
-			
-			$this->libClass->listCredentials()
-			
-			//TODO parse answer
-			
-		}catch(BadResponseError $e){
-			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
-			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
-			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
-			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }*/
 	}
 	
 	/**
 	* Retrieve the details of a given group.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function showGroup(){
 		//Not Implemented Yet
-		
-		/*
-		$domId = $this->app->getPostParam("domainId");
-		$groupId = $this->app->getPostParam("groupId");
-		
-		if(!isset($domId) || !isset($groupId)){
-			
-		}
-		try{
-			
-			$this->libClass->listCredentials()
-			
-			//TODO parse answer
-			
-		}catch(BadResponseError $e){
-			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
-			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
-			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
-			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }*/
 	}
 	
 	/**
 	* Update a given group.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function updateGroup(){
 		//Todo Argument Optional
@@ -1066,9 +921,9 @@ class identity implements Core{
 			$group = $this->libClass->getGroup($groupId);
 
 			if(isset($description))
-				$group->description = 'foo';
+			$group->description = 'foo';
 			if(isset($name))
-				$group->name = 'bar';
+			$group->name = 'bar';
 			
 			$group->update();
 			
@@ -1076,23 +931,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Delete the given group.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function deleteGroup(){
 		
@@ -1112,23 +965,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Retrieve the users of a given group.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function listGroupUsers(){
 		
@@ -1148,23 +999,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Add a user to a group.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function addGroupUser(){
 		
@@ -1185,23 +1034,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Remove a user from a given group.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function removeGroupUser(){
 		
@@ -1222,23 +1069,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Check if a group contains a given user.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function checkGroupUser(){
 		
@@ -1259,199 +1104,67 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* @todo
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function addPolicies(){
 		//Not Implemented Yet
-		/*
-		$domId = $this->app->getPostParam("domainId");
-		$groupId = $this->app->getPostParam("groupId");
-		
-		if(!isset($domId) || !isset($groupId)){
-			
-		}
-		try{
-			
-			$this->libClass->listCredentials()
-			
-			//TODO parse answer
-			
-		}catch(BadResponseError $e){
-			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
-			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
-			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
-			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }*/
 	}
 	
 	/**
 	* @todo
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function listPolicies(){
 		//Not Implemented Yet
-		/*
-		$domId = $this->app->getPostParam("domainId");
-		$groupId = $this->app->getPostParam("groupId");
-		
-		if(!isset($domId) || !isset($groupId)){
-			
-		}
-		try{
-			
-			$this->libClass->listCredentials()
-			
-			//TODO parse answer
-			
-		}catch(BadResponseError $e){
-			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
-			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
-			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
-			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }*/
 	}
 	
 	/**
 	* @todo
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function showPolicie(){
 		//Not Implemented Yet
-		/*
-		$domId = $this->app->getPostParam("domainId");
-		$groupId = $this->app->getPostParam("groupId");
-		
-		if(!isset($domId) || !isset($groupId)){
-			
-		}
-		try{
-			
-			$this->libClass->listCredentials()
-			
-			//TODO parse answer
-			
-		}catch(BadResponseError $e){
-			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
-			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
-			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
-			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }*/
 		
 	}
 	
 	/**
 	* @todo
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function updatePolicies(){
 		//Not Implemented Yet
-		/*
-		$domId = $this->app->getPostParam("domainId");
-		$groupId = $this->app->getPostParam("groupId");
-		
-		if(!isset($domId) || !isset($groupId)){
-			
-		}
-		try{
-			
-			$this->libClass->listCredentials()
-			
-			//TODO parse answer
-			
-		}catch(BadResponseError $e){
-			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
-			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
-			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
-			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }*/
 	}
 	
 	/**
 	* @todo
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function deletePolicies(){
 		//Not Implemented Yet
-		/*
-		$domId = $this->app->getPostParam("domainId");
-		$groupId = $this->app->getPostParam("groupId");
-		
-		if(!isset($domId) || !isset($groupId)){
-			
-		}
-		try{
-			
-			$this->libClass->listCredentials()
-			
-			//TODO parse answer
-			
-		}catch(BadResponseError $e){
-			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
-			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
-			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
-			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }*/
 	}
 	
 	/**
 	* Add a project.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function addProject(){
 		//Todo Parameters Optional
@@ -1465,30 +1178,30 @@ class identity implements Core{
 		try{
 			
 			$project = $this->libClass->createProject([
-				'description' => $description,
-				'enabled'     => true,
-				'name'        => $name
+			'description' => $description,
+			'enabled'     => true,
+			'name'        => $name
 			]);
 			
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Retrieve the different projects.
 	*
-	* @return void
+	* @return NULL
 	*/
 	private function listProjects(){
 		
@@ -1500,23 +1213,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Retrieve the details of a given project.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function showProject(){
 		
@@ -1535,23 +1246,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Update a given project.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function updateProject(){
 		//Todo Parameters Optionnal
@@ -1577,23 +1286,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Delete a given project.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function deleteProject(){
 		$projId = $this->app->getPostParam("projId");
@@ -1612,23 +1319,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* List the roles of a given user in a project.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function listRolesProjectUser(){
 		
@@ -1649,25 +1354,23 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Grant a role to an user in a project.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function grantRoleProjectUser(){
 		
@@ -1684,31 +1387,29 @@ class identity implements Core{
 			$project = $this->libClass->getProject($projId);
 
 			$project->grantUserRole([
-				'userId' => $userId,
-				'roleId' => $roleId,
+			'userId' => $userId,
+			'roleId' => $roleId,
 			]);
 			
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Check if a given user has a role in a project.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function checkRoleProjectUser(){
 		$projId = $this->app->getPostParam("projetId");
@@ -1724,8 +1425,8 @@ class identity implements Core{
 			$project = $this->libClass->getProject($projId);
 
 			$result = $project->checkUserRole([
-				'userId' => $userId,
-				'roleId' => $roleId,
+			'userId' => $userId,
+			'roleId' => $roleId,
 			]);
 			
 			/*if (true === $result) {
@@ -1735,23 +1436,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Delete a role for a given user in a project.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function revokeRoleProjectUser(){
 		
@@ -1768,31 +1467,29 @@ class identity implements Core{
 			$project = $this->libClass->getProject($projId);
 
 			$project->revokeUserRole([
-				'userId' => $userId,
-				'roleId' => $roleId,
+			'userId' => $userId,
+			'roleId' => $roleId,
 			]);
 			
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* List the roles of a group in a project.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function listRolesProjectGroup(){
 		
@@ -1803,7 +1500,7 @@ class identity implements Core{
 		if(!isset($projId) || !isset($groupId)){
 			
 		}
-	
+		
 		try{
 			
 			$project = $this->libClass->getProject($projId);
@@ -1814,23 +1511,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Add a role to a group in a project.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function grantRoleProjectGroup(){
 		
@@ -1841,37 +1536,35 @@ class identity implements Core{
 		if(!isset($projId) || !isset($userId) || !isset($roleId)){
 			
 		}
-	
+		
 		try{
 			
 			$project = $this->libClass->getProject($projId);
 
 			$project->grantUserRole([
-				'userId' => $userId,
-				'roleId' => $roleId,
+			'userId' => $userId,
+			'roleId' => $roleId,
 			]);
 			
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Check if a group has a given role in a project.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function checkRoleProjectGroup(){
 		
@@ -1888,8 +1581,8 @@ class identity implements Core{
 			$project = $this->libClass->getProject($projId);
 
 			$result = $project->checkGroupRole([
-				'groupId' => $groupId,
-				'roleId'  => $roleId,
+			'groupId' => $groupId,
+			'roleId'  => $roleId,
 			]);
 			
 			/*if (true === $result) {
@@ -1898,23 +1591,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Delete a role for a group in a project.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function revokeRoleProjectGroup(){
 		
@@ -1931,31 +1622,29 @@ class identity implements Core{
 			$project = $this->libClass->getProject($projId);
 
 			$project->revokeGroupRole([
-				'groupId' => $groupId,
-				'roleId'  => $roleId,
+			'groupId' => $groupId,
+			'roleId'  => $roleId,
 			]);
 			
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Add a role.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function addRole(){
 		
@@ -1968,28 +1657,28 @@ class identity implements Core{
 		try{
 			
 			$role = $this->libClass->createRole([
-				'name' => $name,
+			'name' => $name,
 			]);
 			
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* List the different roles
 	*
-	* @return void
+	* @return NULL
 	*/
 	private function listRoles(){
 
@@ -2001,21 +1690,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
-	* @todo
+	* List the different assignments for a given role
 	*
-	* @return void
+	* @return NULL
 	*/
 	private function listRoleAssignements(){
 		
@@ -2027,23 +1716,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Add a service.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function addService(){
 		$name = $this->app->getPostParam("name");
@@ -2056,29 +1743,29 @@ class identity implements Core{
 		try{
 			
 			$service = $this->libClass->createService([
-				'name' => $name,
-				'type' => $type,
+			'name' => $name,
+			'type' => $type,
 			]);
 			
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Retrieve the different services.
 	*
-	* @return void
+	* @return NULL
 	*/
 	private function listServices(){
 		
@@ -2090,23 +1777,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Retrieve the details for a given service.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function showService(){
 		$servId = $this->app->getPostParam("serviceId");
@@ -2123,23 +1808,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Delete a given service.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function deleteService(){
 		
@@ -2159,23 +1842,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Generate a new token for a given user id.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function genTokenUserID(){
 		
@@ -2189,33 +1870,31 @@ class identity implements Core{
 		try{
 			
 			$token = $this->libClass->generateToken([
-				'user' => [
-					'id'       => $userId,
-					'password' => $userPass
-				]
+			'user' => [
+			'id'       => $userId,
+			'password' => $userPass
+			]
 			]);
 			
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Generate a new token for a given user name.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function genTokenUserName(){
 		$username = $this->app->getPostParam("username");
@@ -2230,36 +1909,34 @@ class identity implements Core{
 		try{
 			
 			$token = $this->libClass->generateToken([
-				'user' => [
-					'name'     => $username,
-					'password' => $userPass,
-					'domain'   => [
-						'id' => $domId
-					]
-				]
+			'user' => [
+			'name'     => $username,
+			'password' => $userPass,
+			'domain'   => [
+			'id' => $domId
+			]
+			]
 			]);
 			
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Generate a new token from another token ID.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function genTokenID(){
 		
@@ -2273,31 +1950,29 @@ class identity implements Core{
 		try{
 			
 			$token = $this->libClass->generateToken([
-				'tokenId' => $tokenId,
-				'scope'   => ['project' => ['id' => $projectId]]
+			'tokenId' => $tokenId,
+			'scope'   => ['project' => ['id' => $projectId]]
 			]);
 			
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Generate a new token scoped by a project ID.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function genTokenScopedProjectID(){
 		
@@ -2312,36 +1987,34 @@ class identity implements Core{
 		try{
 			
 			$token = $this->libClass->generateToken([
-				'user' => [
-					'id'       => $userId,
-					'password' => $userPass
-				],
-				'scope' => [
-					'project' => ['id' => $projId]
-				]
+			'user' => [
+			'id'       => $userId,
+			'password' => $userPass
+			],
+			'scope' => [
+			'project' => ['id' => $projId]
+			]
 			]);
 			
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Generate a new token scoped by a project name.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function genTokenScopedProjectName(){
 		
@@ -2357,41 +2030,39 @@ class identity implements Core{
 		try{
 			
 			$token = $this->libClass->generateToken([
-				'user' => [
-					'id'       => $userId,
-					'password' => $userPass
-				],
-				'scope' => [
-					'project' => [
-						'name' => $projName,
-						'domain' => [
-							'id' => $domId
-						]
-					]
-				]
+			'user' => [
+			'id'       => $userId,
+			'password' => $userPass
+			],
+			'scope' => [
+			'project' => [
+			'name' => $projName,
+			'domain' => [
+			'id' => $domId
+			]
+			]
+			]
 			]);
 			
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Check if a token is validate.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function validateToken(){
 		
@@ -2413,23 +2084,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Delete a given token.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function revokeToken(){
 		
@@ -2447,23 +2116,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Add a new user.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function addUser(){
 		//Todo Optionnal Parameter
@@ -2475,40 +2142,40 @@ class identity implements Core{
 		$domId = $this->app->getPostParam("domId");
 		
 		if(!isset($domId) || !isset($groupId)){
-		
+			
 		}
 		
 		try{
 			
 			$user = $this->libClass->createUser([
-				'defaultProjectId' => $projId,
-				'description'      => $desc,
-				'domainId'         => $domId,
-				'email'            => $email,
-				'enabled'          => true,
-				'name'             => $name,
-				'password'         => $pass
+			'defaultProjectId' => $projId,
+			'description'      => $desc,
+			'domainId'         => $domId,
+			'email'            => $email,
+			'enabled'          => true,
+			'name'             => $name,
+			'password'         => $pass
 			]);
 			
 			//TODO parse answer
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Retrieve the different users.
 	*
-	* @return void
+	* @return NULL
 	*/
 	private function listUsers(){
 		
@@ -2520,23 +2187,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Retrieve the details of a given user.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function showUser(){
 		
@@ -2555,23 +2220,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Update a given user.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function updateUser(){
 		
@@ -2596,23 +2259,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Delete a given user.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function deleteUser(){
 		
@@ -2631,23 +2292,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Retrieve the groups which contains a given user.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function listUserGroups(){
 		
@@ -2667,23 +2326,21 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 	
 	/**
 	* Retrieve the projects which contains a given user.
 	*
-	* @throws [Type] [<description>]
-	*
-	* @return void
+	* @return NULL
 	*/
 	private function listUserProjects(){
 		
@@ -2703,14 +2360,14 @@ class identity implements Core{
 			
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 }
diff --git a/server/core/Image.php b/server/core/Image.php
index 334fce4..d930962 100755
--- a/server/core/Image.php
+++ b/server/core/Image.php
@@ -51,10 +51,10 @@ class image implements Core{
 	*
 	* @param String $action name of another function of this class
 	*
-	* @return void
+	* @return NULL
 	*/
 	public function action($action){
-		 $this->{$action.""}();	
+		$this->{$action.""}();	
 	}
 
 	/**
@@ -78,13 +78,13 @@ class image implements Core{
 			if(isset($opt['name'])){ 
 				$imagesList = $this->listImage();
 				if(isset($imagesList)){
-    				foreach($imagesList as $image){
-    					if(strcmp($image->name, $opt['name']) == 0){ // if the image name already exists -> error
-    						$this->app->setOutput("Error", "Image name already exists");
-    					}
-    				}
-    			}
-    			$options['name'] = $opt['name'];
+					foreach($imagesList as $image){
+						if(strcmp($image->name, $opt['name']) == 0){ // if the image name already exists -> error
+							$this->app->setOutput("Error", "Image name already exists");
+						}
+					}
+				}
+				$options['name'] = $opt['name'];
 			}
 			else{
 				$this->app->setOutput("Error", "Missing parameter 'name' for the new image");
@@ -125,15 +125,15 @@ class image implements Core{
 			$image = $this->libClass->createImage($options);
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 		$this->app->setOutput("Images", $image);
 
 	}
@@ -152,15 +152,15 @@ class image implements Core{
 			}
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 
 		$this->app->setOutput("Images", $result);
 
@@ -191,16 +191,16 @@ class image implements Core{
 				}
 			}catch(BadResponseError $e){
 				$this->app->getErrorInstance()->BadResponseHandler($e);
-	        }catch(UserInputError $e){
+			}catch(UserInputError $e){
 				$this->app->getErrorInstance()->UserInputHandler($e);
-	        }catch(BaseError $e){
+			}catch(BaseError $e){
 				$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }catch(NotImplementedError $e){
+			}catch(NotImplementedError $e){
 				$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }catch(Exception $e){
-        		$this->app->getErrorInstance()->OtherException($e);
-        	}
-	    }
+			}catch(Exception $e){
+				$this->app->getErrorInstance()->OtherException($e);
+			}
+		}
 	}
 
 	/**
@@ -254,15 +254,15 @@ class image implements Core{
 				$image->update($options);
 			}catch(BadResponseError $e){
 				$this->app->getErrorInstance()->BadResponseHandler($e);
-	        }catch(UserInputError $e){
+			}catch(UserInputError $e){
 				$this->app->getErrorInstance()->UserInputHandler($e);
-	        }catch(BaseError $e){
+			}catch(BaseError $e){
 				$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }catch(NotImplementedError $e){
+			}catch(NotImplementedError $e){
 				$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }catch(Exception $e){
-	        	$this->app->getErrorInstance()->OtherException($e);
-	        }
+			}catch(Exception $e){
+				$this->app->getErrorInstance()->OtherException($e);
+			}
 			$this->app->setOutput("Images", $image);
 		}
 	}
@@ -272,7 +272,7 @@ class image implements Core{
 	*
 	* @param String $id Identifier of the image
 	*	
-	* @return void
+	* @return NULL
 	*/
 	private function deleteImage(){
 		$id = $this->app->getPostParam("id");
@@ -289,16 +289,16 @@ class image implements Core{
 				$image->delete();
 			}catch(BadResponseError $e){
 				$this->app->getErrorInstance()->BadResponseHandler($e);
-	        }catch(UserInputError $e){
+			}catch(UserInputError $e){
 				$this->app->getErrorInstance()->UserInputHandler($e);
-	        }catch(BaseError $e){
+			}catch(BaseError $e){
 				$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }catch(NotImplementedError $e){
+			}catch(NotImplementedError $e){
 				$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }catch(Exception $e){
-	        	$this->app->getErrorInstance()->OtherException($e);
-	        }	
-	    }
+			}catch(Exception $e){
+				$this->app->getErrorInstance()->OtherException($e);
+			}	
+		}
 	}
 
 	/**
@@ -306,7 +306,7 @@ class image implements Core{
 	*
 	* @param String $id Identifier of the image
 	*	
-	* @return void
+	* @return NULL
 	*/
 	private function reactivateImage(){
 		$id = $this->app->getPostParam("id");
@@ -326,16 +326,16 @@ class image implements Core{
 				$image->reactivate();
 			}catch(BadResponseError $e){
 				$this->app->getErrorInstance()->BadResponseHandler($e);
-	        }catch(UserInputError $e){
+			}catch(UserInputError $e){
 				$this->app->getErrorInstance()->UserInputHandler($e);
-	        }catch(BaseError $e){
+			}catch(BaseError $e){
 				$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }catch(NotImplementedError $e){
+			}catch(NotImplementedError $e){
 				$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }catch(Exception $e){
-	        	$this->app->getErrorInstance()->OtherException($e);
-	        }
-	    }
+			}catch(Exception $e){
+				$this->app->getErrorInstance()->OtherException($e);
+			}
+		}
 	}
 
 	/**
@@ -343,7 +343,7 @@ class image implements Core{
 	*
 	* @param String $id Identifier of the image
 	*
-	* @return void	
+	* @return NULL	
 	*/
 	private function desactivateImage(){
 		$id = $this->app->getPostParam("id");
@@ -362,16 +362,16 @@ class image implements Core{
 				$image->deactivate();
 			}catch(BadResponseError $e){
 				$this->app->getErrorInstance()->BadResponseHandler($e);
-	        }catch(UserInputError $e){
+			}catch(UserInputError $e){
 				$this->app->getErrorInstance()->UserInputHandler($e);
-	        }catch(BaseError $e){
+			}catch(BaseError $e){
 				$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }catch(NotImplementedError $e){
+			}catch(NotImplementedError $e){
 				$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }catch(Exception $e){
-	        	$this->app->getErrorInstance()->OtherException($e);
-	        }
-	    }
+			}catch(Exception $e){
+				$this->app->getErrorInstance()->OtherException($e);
+			}
+		}
 	}
 
 	/**
@@ -380,14 +380,14 @@ class image implements Core{
 	* @param String $id Identifier of the image
 	* @param String $file_name Path of the image
 	*	
-	* @return void
+	* @return NULL
 	*/
 	private function uploadImage(){
 		$id = $this->app->getPostParam("id");
 		$file_name = $this->app->getPostParam("file_name");
-        $file = $this->app->getPostParam("file");
+		$file = $this->app->getPostParam("file");
 		error_log(print_r($file, true), 0);
-	
+		
 		if(!isset($id)){
 			$this->app->setOutput("Error", "Incorrect id parameter");
 		}
@@ -405,16 +405,16 @@ class image implements Core{
 				$image->uploadData($stream);
 			}catch(BadResponseError $e){
 				$this->app->getErrorInstance()->BadResponseHandler($e);
-	        }catch(UserInputError $e){
+			}catch(UserInputError $e){
 				$this->app->getErrorInstance()->UserInputHandler($e);
-	        }catch(BaseError $e){
+			}catch(BaseError $e){
 				$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }catch(NotImplementedError $e){
+			}catch(NotImplementedError $e){
 				$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }catch(Exception $e){
-        		$this->app->getErrorInstance()->OtherException($e);
-        	}
-        }
+			}catch(Exception $e){
+				$this->app->getErrorInstance()->OtherException($e);
+			}
+		}
 	}
 
 	/**
@@ -440,17 +440,17 @@ class image implements Core{
 				$stream = $image->downloadData();
 			}catch(BadResponseError $e){
 				$this->app->getErrorInstance()->BadResponseHandler($e);
-	        }catch(UserInputError $e){
+			}catch(UserInputError $e){
 				$this->app->getErrorInstance()->UserInputHandler($e);
-	        }catch(BaseError $e){
+			}catch(BaseError $e){
 				$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }catch(NotImplementedError $e){
+			}catch(NotImplementedError $e){
 				$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }catch(Exception $e){
-        		$this->app->getErrorInstance()->OtherException($e);
-        	}
-	        $this->app->setOutput("Images", $stream);
-	    }
+			}catch(Exception $e){
+				$this->app->getErrorInstance()->OtherException($e);
+			}
+			$this->app->setOutput("Images", $stream);
+		}
 	}
 
 	/**
@@ -483,16 +483,16 @@ class image implements Core{
 				$this->app->setOutput("Images", $member_id);
 			}catch(BadResponseError $e){
 				$this->app->getErrorInstance()->BadResponseHandler($e);
-	        }catch(UserInputError $e){
+			}catch(UserInputError $e){
 				$this->app->getErrorInstance()->UserInputHandler($e);
-	        }catch(BaseError $e){
+			}catch(BaseError $e){
 				$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }catch(NotImplementedError $e){
+			}catch(NotImplementedError $e){
 				$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }catch(Exception $e){
-	        	$this->app->getErrorInstance()->OtherException($e);
-	        }
-	    }
+			}catch(Exception $e){
+				$this->app->getErrorInstance()->OtherException($e);
+			}
+		}
 	}
 
 	
@@ -526,15 +526,15 @@ class image implements Core{
 				}
 			}catch(BadResponseError $e){
 				$this->app->getErrorInstance()->BadResponseHandler($e);
-	        }catch(UserInputError $e){
+			}catch(UserInputError $e){
 				$this->app->getErrorInstance()->UserInputHandler($e);
-	        }catch(BaseError $e){
+			}catch(BaseError $e){
 				$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }catch(NotImplementedError $e){
+			}catch(NotImplementedError $e){
 				$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }catch(Exception $e){
-	        	$this->app->getErrorInstance()->OtherException($e);
-	        }
+			}catch(Exception $e){
+				$this->app->getErrorInstance()->OtherException($e);
+			}
 			$this->app->setOutput("Images", $members);
 		}
 	}
@@ -572,15 +572,15 @@ class image implements Core{
 				}
 			}catch(BadResponseError $e){
 				$this->app->getErrorInstance()->BadResponseHandler($e);
-	        }catch(UserInputError $e){
+			}catch(UserInputError $e){
 				$this->app->getErrorInstance()->UserInputHandler($e);
-	        }catch(BaseError $e){
+			}catch(BaseError $e){
 				$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }catch(NotImplementedError $e){
+			}catch(NotImplementedError $e){
 				$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }catch(Exception $e){
-	        	$this->app->getErrorInstance()->OtherException($e);
-	        }
+			}catch(Exception $e){
+				$this->app->getErrorInstance()->OtherException($e);
+			}
 			$this->app->setOutput("Images", $member);
 		}
 	}
@@ -591,7 +591,7 @@ class image implements Core{
 	* @param String $image_id Identifier of the image
 	* @param String $member_id Identifier of the member
 	*	
-	* @return void
+	* @return NULL
 	*/
 	private function removeMemberImage(){
 		$image_id = $this->app->getPostParam("image_id");
@@ -618,16 +618,16 @@ class image implements Core{
 				$member->delete();
 			}catch(BadResponseError $e){
 				$this->app->getErrorInstance()->BadResponseHandler($e);
-	        }catch(UserInputError $e){
+			}catch(UserInputError $e){
 				$this->app->getErrorInstance()->UserInputHandler($e);
-	        }catch(BaseError $e){
+			}catch(BaseError $e){
 				$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }catch(NotImplementedError $e){
+			}catch(NotImplementedError $e){
 				$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }catch(Exception $e){
-	        	$this->app->getErrorInstance()->OtherException($e);
-	        }
-	    }
+			}catch(Exception $e){
+				$this->app->getErrorInstance()->OtherException($e);
+			}
+		}
 	}
 
 	/**
@@ -637,7 +637,7 @@ class image implements Core{
 	* @param String $member_id Identifier of the member
 	* @param String $status New status for the member
 	*
-	* @return void	
+	* @return NULL	
 	**/
 	private function updateMemberImage(){
 		$image_id = $this->app->getPostParam("image_id");
@@ -665,16 +665,16 @@ class image implements Core{
 				$member->updateStatus($status);
 			}catch(BadResponseError $e){
 				$this->app->getErrorInstance()->BadResponseHandler($e);
-	        }catch(UserInputError $e){
+			}catch(UserInputError $e){
 				$this->app->getErrorInstance()->UserInputHandler($e);
-	        }catch(BaseError $e){
+			}catch(BaseError $e){
 				$this->app->getErrorInstance()->BaseErrorHandler($e);
-	        }catch(NotImplementedError $e){
+			}catch(NotImplementedError $e){
 				$this->app->getErrorInstance()->NotImplementedHandler($e);
-	        }catch(Exception $e){
-	        	$this->app->getErrorInstance()->OtherException($e);
-	        }
-      	}
+			}catch(Exception $e){
+				$this->app->getErrorInstance()->OtherException($e);
+			}
+		}
 	}
 
 }
diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php
index 394db31..68a7dbd 100755
--- a/server/core/LibOverride/genTokenOptions.php
+++ b/server/core/LibOverride/genTokenOptions.php
@@ -22,33 +22,33 @@ class genTokenOptions
 		$this->stack = HandlerStack::create();
 
 		$httpClient = new Client([
-            'base_uri' => Utils::normalizeUrl($options['authUrl']),
-            'handler'  => $this->stack,
-        ]);
+		'base_uri' => Utils::normalizeUrl($options['authUrl']),
+		'handler'  => $this->stack,
+		]);
 		
 		$this->httpClient = $httpClient;
 		
-        $options['identityService'] = Service::factory($httpClient);
+		$options['identityService'] = Service::factory($httpClient);
 		
 		$options['authHandler'] = function () use ($options) {
 			return $options['identityService']->generateToken($options);
-        };
+		};
 
 		$this->optionsGlobal['Common'] = $options;
 	}
- 
-		/**
-     * @codeCoverageIgnore
-     */
-    private function addDebugMiddleware(array $options, HandlerStack &$stack)
-    {
-        if (!empty($options['debugLog'])
-            && !empty($options['logger'])
-            && !empty($options['messageFormatter'])
-        ) {
-            $stack->push(GuzzleMiddleware::log($options['logger'], $options['messageFormatter']));
-        }
-    }
+
+	/**
+		* @codeCoverageIgnore
+		*/
+	private function addDebugMiddleware(array $options, HandlerStack &$stack)
+	{
+		if (!empty($options['debugLog'])
+				&& !empty($options['logger'])
+				&& !empty($options['messageFormatter'])
+				) {
+			$stack->push(GuzzleMiddleware::log($options['logger'], $options['messageFormatter']));
+		}
+	}
 
 	public function checkToken(){
 		//error_log(print_r($this->backup['time'], true), 0);
@@ -73,9 +73,9 @@ class genTokenOptions
 		$this->addDebugMiddleware($options, $stack);
 		
 		$options['httpClient'] = new Client([
-            'base_uri' => Utils::normalizeUrl($baseUrl),
-            'handler'  => $stack,
-        ]);
+		'base_uri' => Utils::normalizeUrl($baseUrl),
+		'handler'  => $stack,
+		]);
 		$this->saveBackup('Identity', array('token' => $token, 'baseUrl' => $baseUrl ));
 		
 		$this->optionsGlobal['Identity'] = $options;
@@ -98,15 +98,15 @@ class genTokenOptions
 		$baseUrl = $this->backup['Identity']['baseUrl'];
 		
 		$stack = HandlerStack::create();
-	
+		
 		$stack->push(Middleware::authHandler($options['authHandler'], $token));
 		
 		$this->addDebugMiddleware($options, $stack);
 		
 		$options['httpClient'] = new Client([
-            'base_uri' => Utils::normalizeUrl($baseUrl),
-            'handler'  => $stack,
-        ]);
+		'base_uri' => Utils::normalizeUrl($baseUrl),
+		'handler'  => $stack,
+		]);
 		$this->saveBackup('Identity', array('token' => $token, 'baseUrl' => $baseUrl ));		
 		$this->optionsGlobal['Identity'] = $options;
 		
@@ -122,14 +122,14 @@ class genTokenOptions
 
 		$stack = HandlerStack::create();
 		
-        $stack->push(Middleware::authHandler($options['authHandler'], $token));
+		$stack->push(Middleware::authHandler($options['authHandler'], $token));
 		
 		$this->addDebugMiddleware($options, $stack);
 		
 		$options['httpClient'] = new Client([
-            'base_uri' => Utils::normalizeUrl($baseUrl),
-            'handler'  => $stack,
-        ]);
+		'base_uri' => Utils::normalizeUrl($baseUrl),
+		'handler'  => $stack,
+		]);
 		$this->saveBackup('Image', array('token' => $token, 'baseUrl' => $baseUrl ));
 		
 		$this->optionsGlobal['Image'] = $options;
@@ -150,7 +150,7 @@ class genTokenOptions
 		$this->backup['Image'] = $opt;
 		$token = $this->unserializeToken($this->backup['Image']['token']);
 		$baseUrl = $this->backup['Image']['baseUrl'];
-    
+		
 		$stack = HandlerStack::create();
 		
 		$stack->push(Middleware::authHandler($options['authHandler'], $token));
@@ -158,9 +158,9 @@ class genTokenOptions
 		$this->addDebugMiddleware($options, $stack);
 		
 		$options['httpClient'] = new Client([
-            'base_uri' => Utils::normalizeUrl($baseUrl),
-            'handler'  => $stack,
-        ]);
+		'base_uri' => Utils::normalizeUrl($baseUrl),
+		'handler'  => $stack,
+		]);
 		$this->saveBackup('Image', array('token' => $token, 'baseUrl' => $baseUrl ));	
 		$this->optionsGlobal['Image'] = $options;
 	}
@@ -175,14 +175,14 @@ class genTokenOptions
 
 		$stack = HandlerStack::create();
 		
-    $stack->push(Middleware::authHandler($options['authHandler'], $token));
+		$stack->push(Middleware::authHandler($options['authHandler'], $token));
 		
 		$this->addDebugMiddleware($options, $stack);
 		
 		$options['httpClient'] = new Client([
-            'base_uri' => Utils::normalizeUrl($baseUrl),
-            'handler'  => $stack,
-        ]);
+		'base_uri' => Utils::normalizeUrl($baseUrl),
+		'handler'  => $stack,
+		]);
 		$this->saveBackup('Network', array('token' => $token, 'baseUrl' => $baseUrl ));
 		
 		$this->optionsGlobal['Network'] = $options;
@@ -203,17 +203,17 @@ class genTokenOptions
 		$this->backup['Network'] = $opt;
 		$token = $this->unserializeToken($this->backup['Network']['token']);
 		$baseUrl = $this->backup['Network']['baseUrl'];
-    
+		
 		$stack = HandlerStack::create();
-	
+		
 		$stack->push(Middleware::authHandler($options['authHandler'], $token));
 		
 		$this->addDebugMiddleware($options, $stack);
 		
 		$options['httpClient'] = new Client([
-            'base_uri' => Utils::normalizeUrl($baseUrl),
-            'handler'  => $stack,
-        ]);
+		'base_uri' => Utils::normalizeUrl($baseUrl),
+		'handler'  => $stack,
+		]);
 		$this->saveBackup('Network', array('token' => $token, 'baseUrl' => $baseUrl ));
 		$this->optionsGlobal['Network'] = $options;
 	}
@@ -228,14 +228,14 @@ class genTokenOptions
 
 		$stack = HandlerStack::create();
 		
-        $stack->push(Middleware::authHandler($options['authHandler'], $token));
+		$stack->push(Middleware::authHandler($options['authHandler'], $token));
 		
 		$this->addDebugMiddleware($options, $stack);
 		
 		$options['httpClient'] = new Client([
-            'base_uri' => Utils::normalizeUrl($baseUrl),
-            'handler'  => $stack,
-        ]);
+		'base_uri' => Utils::normalizeUrl($baseUrl),
+		'handler'  => $stack,
+		]);
 		$this->saveBackup('Compute', array('token' => $token, 'baseUrl' => $baseUrl ));
 		
 		$this->optionsGlobal['Compute'] = $options;
@@ -257,17 +257,17 @@ class genTokenOptions
 		$this->backup['Compute'] = $opt;
 		$token = $this->unserializeToken($this->backup['Compute']['token']);
 		$baseUrl = $this->backup['Compute']['baseUrl'];
-    
+		
 		$stack = HandlerStack::create();
-	
+		
 		$stack->push(Middleware::authHandler($options['authHandler'], $token));
 		
 		$this->addDebugMiddleware($options, $stack);
 		
 		$options['httpClient'] = new Client([
-            'base_uri' => Utils::normalizeUrl($baseUrl),
-            'handler'  => $stack,
-        ]);
+		'base_uri' => Utils::normalizeUrl($baseUrl),
+		'handler'  => $stack,
+		]);
 		$this->saveBackup('Compute', array('token' => $token, 'baseUrl' => $baseUrl ));
 		$this->optionsGlobal['Compute'] = $options;
 	}
@@ -426,7 +426,7 @@ class genTokenOptions
 		$token->user->description = unserialize($this->backup["user"]["description"]);
 		$token->issued = unserialize($tokenSerialized["issued"]);
 		$token->id = unserialize($tokenSerialized["id"]);
-	
+		
 		return $token;
 	}
 }
diff --git a/server/core/Network.php b/server/core/Network.php
index e93c2c5..54b5d60 100755
--- a/server/core/Network.php
+++ b/server/core/Network.php
@@ -22,9 +22,9 @@ use OpenCloud\Common\Error\UserInputError;
 */
 
 class network{ 
-/** @var App $app protected, contains the main app object */	
+	/** @var App $app protected, contains the main app object */	
 	protected $app;
-/** @var OpenStack\Network $libClass protected, contains the library Network object */	
+	/** @var OpenStack\Network $libClass protected, contains the library Network object */	
 	protected $libClass;
 	
 	
@@ -49,11 +49,11 @@ class network{
 	*
 	* @param String $action name of another function of this class
 	*
-	* @return void
+	* @return NULL
 	*/
 	public function action($action){
 		
-		 $this->{$action.""}();
+		$this->{$action.""}();
 		
 	}
 
@@ -65,7 +65,7 @@ class network{
 	* @param String shared Specifies whether the network resource can be accessed by any tenant
 	* @param String tenantId Owner of network. Only admin users can specify a tenant ID other than their own
 	* 
-	* @return void
+	* @return NULL
 	*/
 	private function create_network()
 	{
@@ -102,19 +102,19 @@ class network{
 		catch(BadResponseError $e)
 		{
 			$this->app->getErrorInstance->BadResponseHandler($e);
-       		 }
+		}
 		catch(UserInputError $e)
 		{
 			$this->app->getErrorInstance->UserInputHandler($e);
-        	}
+		}
 		catch(BaseError $e)
 		{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
-       		}
+		}
 		catch(NotImplementedError $e)
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        	}		
+		}		
 
 		
 	}
@@ -136,7 +136,7 @@ class network{
 	* 	
 	*  	
 	* 
-	* @return void
+	* @return NULL
 	*/
 
 	private function create_subnet()
@@ -200,24 +200,24 @@ class network{
 		
 		try
 		{
-		$subnet = $this->libClass->createSubnet($options);
+			$subnet = $this->libClass->createSubnet($options);
 		}
 		catch(BadResponseError $e)
 		{
 			$this->app->getErrorInstance->BadResponseHandler($e);
-       		 }
+		}
 		catch(UserInputError $e)
 		{
 			$this->app->getErrorInstance->UserInputHandler($e);
-        	}
+		}
 		catch(BaseError $e)
 		{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
-       		}
+		}
 		catch(NotImplementedError $e)
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        	}	
+		}	
 
 		
 	}
@@ -233,36 +233,36 @@ class network{
 		try
 		{
 			$ln = $this->libClass->listNetworks();
-		
+			
 			$list_ids = array();
 
-		
+			
 			foreach($ln as $n)
 			{
-			
+				
 				$list_ids[] =  $n->id;
-		
+				
 
 			}
 		}
 		catch(BadResponseError $e)
 		{
 			$this->app->getErrorInstance->BadResponseHandler($e);
-       		 }
+		}
 		catch(UserInputError $e)
 		{
 			$this->app->getErrorInstance->UserInputHandler($e);
-        	}
+		}
 		catch(BaseError $e)
 		{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
-       		}
+		}
 		catch(NotImplementedError $e)
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        	}	
+		}	
 
-	$this->app->setOutput("ListNetworkIds", $list_ids);
+		$this->app->setOutput("ListNetworkIds", $list_ids);
 	}
 
 	/**
@@ -276,37 +276,37 @@ class network{
 		try
 		{
 			$ln = $this->libClass->listNetworks();
-		
+			
 			$list_names = array();
 
-		
+			
 			foreach($ln as $n)
 			{
-			
+				
 				$list_names[] =  $n->name;
-		
+				
 
 			}
-		
+			
 		}
 		catch(BadResponseError $e)
 		{
 			$this->app->getErrorInstance->BadResponseHandler($e);
-       		 }
+		}
 		catch(UserInputError $e)
 		{
 			$this->app->getErrorInstance->UserInputHandler($e);
-        	}
+		}
 		catch(BaseError $e)
 		{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
-       		}
+		}
 		catch(NotImplementedError $e)
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        	}	
+		}	
 
-	$this->app->setOutput("ListNetworkNames", $list_names);
+		$this->app->setOutput("ListNetworkNames", $list_names);
 	}
 	/**
 	* List the CIDR of the SUBNETS
@@ -317,32 +317,32 @@ class network{
 	{
 		try
 		{
-				$ls = $this->libClass->listSubnets();
-				$list_cidr = array();
-				foreach ($ls as $subnet)
-				 {
-		     		
-					$list_cidr[] = $subnet->cidr;
-				 }
+			$ls = $this->libClass->listSubnets();
+			$list_cidr = array();
+			foreach ($ls as $subnet)
+			{
+				
+				$list_cidr[] = $subnet->cidr;
+			}
 
-				$this->app->setOutput("ListCidr", $list_cidr);
+			$this->app->setOutput("ListCidr", $list_cidr);
 		}
 		catch(BadResponseError $e)
 		{
 			$this->app->getErrorInstance->BadResponseHandler($e);
-       		 }
+		}
 		catch(UserInputError $e)
 		{
 			$this->app->getErrorInstance->UserInputHandler($e);
-        	}
+		}
 		catch(BaseError $e)
 		{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
-       		}
+		}
 		catch(NotImplementedError $e)
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        	}	
+		}	
 	}
 	/**
 	* retrieve a specific network
@@ -364,21 +364,21 @@ class network{
 		catch(BadResponseError $e)
 		{
 			$this->app->getErrorInstance->BadResponseHandler($e);
-       		 }
+		}
 		catch(UserInputError $e)
 		{
 			$this->app->getErrorInstance->UserInputHandler($e);
-        	}
+		}
 		catch(BaseError $e)
 		{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
-       		}
+		}
 		catch(NotImplementedError $e)
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        	}	
+		}	
 
-	$this->app->setOutput("Network", $network);
+		$this->app->setOutput("Network", $network);
 	}
 	
 	/**
@@ -401,21 +401,21 @@ class network{
 		catch(BadResponseError $e)
 		{
 			$this->app->getErrorInstance->BadResponseHandler($e);
-       		 }
+		}
 		catch(UserInputError $e)
 		{
 			$this->app->getErrorInstance->UserInputHandler($e);
-        	}
+		}
 		catch(BaseError $e)
 		{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
-       		}
+		}
 		catch(NotImplementedError $e)
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        	}	
+		}	
 
-	return $network;
+		return $network;
 	}
 
 	/**
@@ -437,21 +437,21 @@ class network{
 		catch(BadResponseError $e)
 		{
 			$this->app->getErrorInstance->BadResponseHandler($e);
-       		 }
+		}
 		catch(UserInputError $e)
 		{
 			$this->app->getErrorInstance->UserInputHandler($e);
-        	}
+		}
 		catch(BaseError $e)
 		{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
-       		}
+		}
 		catch(NotImplementedError $e)
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        	}	
+		}	
 		$this->app->setOutput("Subnet", subnet);
-	
+		
 	}
 	/**
 	* internal function
@@ -472,21 +472,21 @@ class network{
 		catch(BadResponseError $e)
 		{
 			$this->app->getErrorInstance->BadResponseHandler($e);
-       		 }
+		}
 		catch(UserInputError $e)
 		{
 			$this->app->getErrorInstance->UserInputHandler($e);
-        	}
+		}
 		catch(BaseError $e)
 		{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
-       		}
+		}
 		catch(NotImplementedError $e)
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        	}	
+		}	
 		return $subnet;
-	
+		
 	}		
 	
 	/**
@@ -498,11 +498,11 @@ class network{
 	* @param String tenantId Owner of network. Only admin users can specify a tenant ID other than their own
 	* 
 	*
-	* @return void	
+	* @return NULL	
 	**/	
 
-        private function updateNetwork()
-     	{	
+	private function updateNetwork()
+	{	
 		$options = array();
 		$name = $this->app->getPostParam("name");
 		$shared = $this->app->getPostParam("shared");
@@ -524,25 +524,25 @@ class network{
 		{		
 			$networkId = $this->app->getPostParam("networkId");
 			$network = getNetworkP($networkId);
-		
+			
 			$network->update($options);
 		}
 		catch(BadResponseError $e)
 		{
 			$this->app->getErrorInstance->BadResponseHandler($e);
-       		 }
+		}
 		catch(UserInputError $e)
 		{
 			$this->app->getErrorInstance->UserInputHandler($e);
-        	}
+		}
 		catch(BaseError $e)
 		{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
-       		}
+		}
 		catch(NotImplementedError $e)
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        	}	
+		}	
 	}
 	
 	/**
@@ -561,11 +561,11 @@ class network{
 	* @param String allocationPools Subranges of the CIDR available for dynamic allocation to ports
 	* 
 	*
-	* @return void	
+	* @return NULL	
 	**/	
 
 	private function updateSubnet()
-     	{	
+	{	
 		$options = array();
 		$name = $this->app->getPostParam("name");
 		$networkId = $this->app->getPostParam("networkId");
@@ -596,19 +596,19 @@ class network{
 		catch(BadResponseError $e)
 		{
 			$this->app->getErrorInstance->BadResponseHandler($e);
-       		 }
+		}
 		catch(UserInputError $e)
 		{
 			$this->app->getErrorInstance->UserInputHandler($e);
-        	}
+		}
 		catch(BaseError $e)
 		{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
-       		}
+		}
 		catch(NotImplementedError $e)
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        	}	
+		}	
 	}
 	
 	/**
@@ -617,10 +617,10 @@ class network{
 	* @param String networkId ID if network which we want to delete
 	* 
 	*
-	* @return void	
+	* @return NULL	
 	**/	
 	private function deleteNetwork()
-     	{
+	{
 		try
 		{
 			$networkId = $this->app->getPostParam("networkId");
@@ -630,19 +630,19 @@ class network{
 		catch(BadResponseError $e)
 		{
 			$this->app->getErrorInstance->BadResponseHandler($e);
-       		 }
+		}
 		catch(UserInputError $e)
 		{
 			$this->app->getErrorInstance->UserInputHandler($e);
-        	}
+		}
 		catch(BaseError $e)
 		{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
-       		}
+		}
 		catch(NotImplementedError $e)
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        	}	
+		}	
 	}
 	
 	/**
@@ -651,10 +651,10 @@ class network{
 	* @param String subnetId ID if network which we want to delete
 	* 
 	*
-	* @return void	
+	* @return NULL	
 	**/
 	private function deleteSubnet()
-     	{
+	{
 		try
 		{		
 			$subnetId = $this->app->getPostParam("subnetId");
@@ -664,19 +664,19 @@ class network{
 		catch(BadResponseError $e)
 		{
 			$this->app->getErrorInstance->BadResponseHandler($e);
-       		 }
+		}
 		catch(UserInputError $e)
 		{
 			$this->app->getErrorInstance->UserInputHandler($e);
-        	}
+		}
 		catch(BaseError $e)
 		{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
-       		}
+		}
 		catch(NotImplementedError $e)
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        	}	
+		}	
 	}
 
 	/**
@@ -692,7 +692,7 @@ class network{
 	* @param String securityGroups 	Specifies the IDs of any security groups associated with this port
 	* @param String tenantId 	Owner of the port. Only admin users can specify a tenant ID other than their own.
 	*	
-	* @return void
+	* @return NULL
 	*/
 	
 	private function createPort()
@@ -751,19 +751,19 @@ class network{
 		catch(BadResponseError $e)
 		{
 			$this->app->getErrorInstance->BadResponseHandler($e);
-       		 }
+		}
 		catch(UserInputError $e)
 		{
 			$this->app->getErrorInstance->UserInputHandler($e);
-        	}
+		}
 		catch(BaseError $e)
 		{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
-       		}
+		}
 		catch(NotImplementedError $e)
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        	}	
+		}	
 	}
 	
 	/**
@@ -781,19 +781,19 @@ class network{
 		catch(BadResponseError $e)
 		{
 			$this->app->getErrorInstance->BadResponseHandler($e);
-       		}
+		}
 		catch(UserInputError $e)
 		{
 			$this->app->getErrorInstance->UserInputHandler($e);
-        	}
+		}
 		catch(BaseError $e)
 		{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
-       		}
+		}
 		catch(NotImplementedError $e)
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        	}
+		}
 	}
 
 	/**
@@ -813,20 +813,20 @@ class network{
 		catch(BadResponseError $e)
 		{
 			$this->app->getErrorInstance->BadResponseHandler($e);
-       		}
+		}
 		catch(UserInputError $e)
 		{
 			$this->app->getErrorInstance->UserInputHandler($e);
-        	}
+		}
 		catch(BaseError $e)
 		{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
-       		}
+		}
 		catch(NotImplementedError $e)
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        	}
-	
+		}
+		
 	}
 
 	/**
@@ -846,20 +846,20 @@ class network{
 		catch(BadResponseError $e)
 		{
 			$this->app->getErrorInstance->BadResponseHandler($e);
-       		}
+		}
 		catch(UserInputError $e)
 		{
 			$this->app->getErrorInstance->UserInputHandler($e);
-        	}
+		}
 		catch(BaseError $e)
 		{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
-       		}
+		}
 		catch(NotImplementedError $e)
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        	}
-	
+		}
+		
 	}		
 
 
@@ -876,7 +876,7 @@ class network{
 	* @param String securityGroups 	Specifies the IDs of any security groups associated with this port
 	* @param String tenantId 	Owner of the port. Only admin users can specify a tenant ID other than their own.
 	*	
-	* @return void
+	* @return NULL
 	*/
 	private function updatePort()
 	{
@@ -935,28 +935,28 @@ class network{
 		catch(BadResponseError $e)
 		{
 			$this->app->getErrorInstance->BadResponseHandler($e);
-       		}
+		}
 		catch(UserInputError $e)
 		{
 			$this->app->getErrorInstance->UserInputHandler($e);
-        	}
+		}
 		catch(BaseError $e)
 		{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
-       		}
+		}
 		catch(NotImplementedError $e)
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        	}	
+		}	
 	}
 	/**
 	* Delete a port given
 	*
 	* @param String portId 	id of port which we wante to delete
-	* @return void
+	* @return NULL
 	*/
 	private function deletePort()
-     	{
+	{
 		
 		try
 		{
@@ -967,19 +967,19 @@ class network{
 		catch(BadResponseError $e)
 		{
 			$this->app->getErrorInstance->BadResponseHandler($e);
-       		}
+		}
 		catch(UserInputError $e)
 		{
 			$this->app->getErrorInstance->UserInputHandler($e);
-        	}
+		}
 		catch(BaseError $e)
 		{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
-       		}
+		}
 		catch(NotImplementedError $e)
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        	}
+		}
 	}
 	
 	/**
@@ -988,7 +988,7 @@ class network{
 	* @param String name 	A human-readable name for the security group. This name might not be unique
 	* @param String description 	Description of the security group
 	*	
-	* @return void
+	* @return NULL
 	*/
 
 	private function createSecurityGroup()
@@ -1012,20 +1012,20 @@ class network{
 		catch(BadResponseError $e)
 		{
 			$this->app->getErrorInstance->BadResponseHandler($e);
-       		}
+		}
 		catch(UserInputError $e)
 		{
 			$this->app->getErrorInstance->UserInputHandler($e);
-        	}
+		}
 		catch(BaseError $e)
 		{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
-       		}
+		}
 		catch(NotImplementedError $e)
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        	}
-	
+		}
+		
 	}
 	
 	/**
@@ -1040,7 +1040,7 @@ class network{
 	*@param String remoteGroupId 	The remote group ID to be associated with this security group rule. You can specify either remoteGroupId or 						remoteGroupPrefix
 	*@param String remoteIpPrefix 	The remote IP prefix to be associated with this security group rule. You can specify either remoteGroupId or 						remoteGroupPrefix
 	*
-	* @return void
+	* @return NULL
 	*/
 	private function createSecurityGroupRule()
 	{
@@ -1093,19 +1093,19 @@ class network{
 		catch(BadResponseError $e)
 		{
 			$this->app->getErrorInstance->BadResponseHandler($e);
-       		}
+		}
 		catch(UserInputError $e)
 		{
 			$this->app->getErrorInstance->UserInputHandler($e);
-        	}
+		}
 		catch(BaseError $e)
 		{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
-       		}
+		}
 		catch(NotImplementedError $e)
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        	}
+		}
 	}
 
 	
@@ -1124,19 +1124,19 @@ class network{
 		catch(BadResponseError $e)
 		{
 			$this->app->getErrorInstance->BadResponseHandler($e);
-       		}
+		}
 		catch(UserInputError $e)
 		{
 			$this->app->getErrorInstance->UserInputHandler($e);
-        	}
+		}
 		catch(BaseError $e)
 		{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
-       		}
+		}
 		catch(NotImplementedError $e)
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        	}
+		}
 	}
 	
 	
@@ -1150,26 +1150,26 @@ class network{
 	{
 		try
 		{
-		 
-		$this->app->setOutput("listSecurityGroupeRule", $this->libClass->listSecurityGroupRules());
+			
+			$this->app->setOutput("listSecurityGroupeRule", $this->libClass->listSecurityGroupRules());
 
 		}
 		catch(BadResponseError $e)
 		{
 			$this->app->getErrorInstance->BadResponseHandler($e);
-       		}
+		}
 		catch(UserInputError $e)
 		{
 			$this->app->getErrorInstance->UserInputHandler($e);
-        	}
+		}
 		catch(BaseError $e)
 		{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
-       		}
+		}
 		catch(NotImplementedError $e)
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        	}
+		}
 	}
 	
 	/**
@@ -1189,20 +1189,20 @@ class network{
 		catch(BadResponseError $e)
 		{
 			$this->app->getErrorInstance->BadResponseHandler($e);
-       		}
+		}
 		catch(UserInputError $e)
 		{
 			$this->app->getErrorInstance->UserInputHandler($e);
-        	}
+		}
 		catch(BaseError $e)
 		{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
-       		}
+		}
 		catch(NotImplementedError $e)
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        	}
-	
+		}
+		
 	}
 	
 	/**
@@ -1221,28 +1221,28 @@ class network{
 		catch(BadResponseError $e)
 		{
 			$this->app->getErrorInstance->BadResponseHandler($e);
-       		}
+		}
 		catch(UserInputError $e)
 		{
 			$this->app->getErrorInstance->UserInputHandler($e);
-        	}
+		}
 		catch(BaseError $e)
 		{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
-       		}
+		}
 		catch(NotImplementedError $e)
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        	}
-	
+		}
+		
 	}
 	/**
 	* Delete a specific Security Groupe given
 	* @param securityGroupeId ID of security Groupe which we want to get
-	* @return void
+	* @return NULL
 	*/
 	private function deleteSecurityGroupe()
-    {	
+	{	
 		try
 		{
 			$securityGroupId = $this->app->getPostParam("securityGroupeId");
@@ -1252,18 +1252,18 @@ class network{
 		catch(BadResponseError $e)
 		{
 			$this->app->getErrorInstance->BadResponseHandler($e);
-       		}
+		}
 		catch(UserInputError $e)
 		{
 			$this->app->getErrorInstance->UserInputHandler($e);
-        	}
+		}
 		catch(BaseError $e)
 		{
 			$this->app->getErrorInstance->BaseErrorHandler($e);
-       		}
+		}
 		catch(NotImplementedError $e)
 		{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
-        	}
+		}
 	}
 }	
diff --git a/server/core/NetworkLayer3.php b/server/core/NetworkLayer3.php
index 30e8a78..c0b773a 100755
--- a/server/core/NetworkLayer3.php
+++ b/server/core/NetworkLayer3.php
@@ -51,10 +51,10 @@ class networkLayer3 {
 	*
 	* @param String $action name of another function of this class
 	*
-	* @return void
+	* @return NULL
 	*/
 	public function action($action){
-		 $this->{$action.""}();	
+		$this->{$action.""}();	
 	}
 
 
@@ -75,15 +75,15 @@ class networkLayer3 {
 			$this->app->setOutput("NetworkLayer3", $result);
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 
 	/**
@@ -109,15 +109,15 @@ class networkLayer3 {
 			}
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 
 
@@ -147,7 +147,7 @@ class networkLayer3 {
 			foreach ($res as $f) {
 				if(strcmp($f->id, $id)){
 					$result = $f;
-				
+					
 				}
 			}
 
@@ -159,15 +159,15 @@ class networkLayer3 {
 			}
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 
 	/**
@@ -175,7 +175,7 @@ class networkLayer3 {
 	*
 	* @param id the id of the floatingip to update
 	* 
-	* @return void
+	* @return NULL
 	*/
 	private function updateFloatingIp(){
 		$id = $this->app->getPostParam("id");
@@ -197,7 +197,7 @@ class networkLayer3 {
 			foreach ($res as $f) {
 				if(strcmp($f->id, $id)){
 					$result = $f;
-				
+					
 				}
 			}
 
@@ -208,15 +208,15 @@ class networkLayer3 {
 			}
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 
 	/**
@@ -224,7 +224,7 @@ class networkLayer3 {
 	*
 	* @param string floatingip_id the floating-ip id to delete
 	*
-	* @return void
+	* @return NULL
 	*/
 	private function deleteFloatingIp(){
 		$id = $this->app->getPostParam("id");
@@ -245,7 +245,7 @@ class networkLayer3 {
 			foreach ($res as $f) {
 				if(strcmp($f->id, $id)){
 					$result = $f;
-				
+					
 				}
 			}
 
@@ -256,15 +256,15 @@ class networkLayer3 {
 			}
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 
 
@@ -273,7 +273,7 @@ class networkLayer3 {
 	*
 	* @param string floatingip_id the floating-ip id to retrieve
 	*
-	* @return void
+	* @return NULL
 	*/
 	private function retrieveFloatingIp(){
 		$id = $this->app->getPostParam("id");
@@ -294,7 +294,7 @@ class networkLayer3 {
 			foreach ($res as $f) {
 				if(strcmp($f->id, $id)){
 					$result = $f;
-				
+					
 				}
 			}
 
@@ -305,15 +305,15 @@ class networkLayer3 {
 			}
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 
 
@@ -344,15 +344,15 @@ class networkLayer3 {
 			}
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 
 
@@ -372,15 +372,15 @@ class networkLayer3 {
 			$this->app->setOutput("NetworkLayer3", $result);
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 
 
@@ -420,15 +420,15 @@ class networkLayer3 {
 			}
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 
 
@@ -437,7 +437,7 @@ class networkLayer3 {
 	*
 	* @param string router the router to delete
 	*
-	* @return void
+	* @return NULL
 	*/
 	private function deleteRouter(){
 		$id = $this->app->getPostParam("id");
@@ -468,15 +468,15 @@ class networkLayer3 {
 			}
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 
 
@@ -485,7 +485,7 @@ class networkLayer3 {
 	*
 	* @param id the id of the floatingip to update
 	* 
-	* @return void
+	* @return NULL
 	*/
 	private function updateRouter(){
 		$id = $this->app->getPostParam("id");
@@ -507,7 +507,7 @@ class networkLayer3 {
 			foreach ($res as $f) {
 				if(strcmp($f->id, $id)){
 					$result = $f;
-				
+					
 				}
 			}
 
@@ -518,14 +518,14 @@ class networkLayer3 {
 			}
 		}catch(BadResponseError $e){
 			$this->app->getErrorInstance()->BadResponseHandler($e);
-        }catch(UserInputError $e){
+		}catch(UserInputError $e){
 			$this->app->getErrorInstance()->UserInputHandler($e);
-        }catch(BaseError $e){
+		}catch(BaseError $e){
 			$this->app->getErrorInstance()->BaseErrorHandler($e);
-        }catch(NotImplementedError $e){
+		}catch(NotImplementedError $e){
 			$this->app->getErrorInstance()->NotImplementedHandler($e);
-        }catch(Exception $e){
-        	$this->app->getErrorInstance()->OtherException($e);
-        }
+		}catch(Exception $e){
+			$this->app->getErrorInstance()->OtherException($e);
+		}
 	}
 }
diff --git a/server/index.php b/server/index.php
index 53a24c4..01203de 100755
--- a/server/index.php
+++ b/server/index.php
@@ -1,70 +1,88 @@
 <?php
-	require "vendor/autoload.php";
-	include_once("config.inc.php");
-	include_once("init.php");
+/**
+* File containing the code for the API door.
+*
+* @version 1.0 Initialisation of this file
+* @since 1.0 Core application's file
+* 
+* @author Eole 'eoledev at outlook . fr'
+* 
+*/
+
+//loading dependencies
+require "vendor/autoload.php";
+//Include general config file
+include_once("config.inc.php");
+//Include API initialisation
+include_once("init.php");
+
+if(isset($_POST["task"]) && isset($_POST["action"])){
+	$task = $_POST["task"];
+	$action = $_POST["action"];
+}else if(isset($_POST["task"]) && $_POST["task"] == "Authenticate" || $_POST["task"] == "Deauthenticate"){
+	$task = $_POST["task"];
+}else{
+	$App->setOutput("Error", "Invalid Request!");
+	$App->show();
+	exit();
+}
+
+//Authentification and deauthentification request
+if($task == "Authenticate"){
 	
-	if(isset($_POST["task"]) && isset($_POST["action"])){
-		$task = $_POST["task"];
-		$action = $_POST["action"];
-	}else if(isset($_POST["task"]) && $_POST["task"] == "Authenticate" || $_POST["task"] == "Deauthenticate"){
-		$task = $_POST["task"];
-	}else{
-		//Gestion Erreur
-	}
+	$App->authenticate();
+	$App->show();
 	
-	if($task == "Authenticate"){
-		
-		$App->authenticate();
+}else if($task == "Deauthenticate"){
+	
+	$App->deauthenticate();
+	$App->show();
+	
+}else if($App->checkToken()){
+	//Task switcher and task's file loader
+	switch($task)
+	{
+	case "identity":
+		include_once("core/Identity.php");
+		$identityObject = new identity($App);
+		$identityObject->action($action);
 		$App->show();
+		break;
 		
-	}else if($task == "Deauthenticate"){
-		
-		$App->deauthenticate();
+	case "network":
+		include_once("core/Network.php");
+		$networkObject = new network($App);
+		$networkObject->action($action);
 		$App->show();
+		break;	
 		
-	}else if($App->checkToken()){
-		switch($task)
-		{
-			case "identity":
-				include_once("core/Identity.php");
-				$identityObject = new identity($App);
-				$identityObject->action($action);
-				$App->show();
-				break;
-			
-			case "network":
-				include_once("core/Network.php");
-				$networkObject = new network($App);
-				$networkObject->action($action);
-				$App->show();
-				break;	
-			
-			case "image":
-				include_once("core/Image.php");
-				$imageObject = new image($App);
-				$imageObject->action($action);
-				$App->show();
-				break;
-	
-			case "compute":
-				include_once("core/Compute.php");
-				$computeObject = new compute($App);
-				$computeObject->action($action);
-				$App->show();
-				break;
-				
-			case "networkLayer3":
-				include_once("core/NetworkLayer3.php");
-				$computeObject = new networkLayer3($App);
-				$computeObject->action($action);
-				$App->show();
-				break;
-		}
+	case "image":
+		include_once("core/Image.php");
+		$imageObject = new image($App);
+		$imageObject->action($action);
+		$App->show();
+		break;
+
+	case "compute":
+		include_once("core/Compute.php");
+		$computeObject = new compute($App);
+		$computeObject->action($action);
+		$App->show();
+		break;
 		
-	}else{
-		$App->setOutput("Error", "Token Invalide");
+	case "networkLayer3":
+		include_once("core/NetworkLayer3.php");
+		$computeObject = new networkLayer3($App);
+		$computeObject->action($action);
 		$App->show();
+		break;
 	}
 	
-	
-	
+}else{
+	//Request without authentication
+	$App->setOutput("Error", "Token Invalide");
+	$App->show();
+}
+
+
+
diff --git a/server/init.php b/server/init.php
index a00927d..767224a 100755
--- a/server/init.php
+++ b/server/init.php
@@ -1,48 +1,55 @@
 <?php
-	include_once("core/App.php");
+/**
+* File containing the initialisation of the API.
+*
+* @version 1.0 Initialisation of this file
+* @since 1.0 Core application's file
+* 
+* @author Eole 'eoledev at outlook . fr'
+* 
+*/
 
-	$user = "";
-	$password = "";
-	$project = "";
+include_once("core/App.php");
+
+$user = "";
+$password = "";
+$project = "";
+
+
+//token processing
+if(isset($_POST["token"])){
 	
+	$token = $_POST["token"];
 	
-	//traitement requete, recuperation data
-	if(isset($_POST["token"])){
-		
-		$token = $_POST["token"];
-		
-	}else if(isset($_POST["user"]) && isset($_POST["password"]) && isset($_POST["project"]) ){	
-		
-		$user = $_POST["user"];
-		$password = $_POST["password"];
-		$project = $_POST["project"];
-		
-	} /*else { // Test Backend 
-		$user = "admin";
-		$password = "ae5or6cn";
-		$project = "admin";
-		
-	}*/
-
-	$Args = Array(
-			"user" => Array(
-				"name" => $user,
-				"password" => $password,
-				"domain" => Array(
-					"name" => "Default")
-				),
-			"scope" => Array(
-				"project" => Array(
-					"name" => $project,
-					"domain" => Array(
-						"name" => "Default")
-					)
-				),
-			"authUrl" => $config["urlAuth"]
-		);
+}else if(isset($_POST["user"]) && isset($_POST["password"]) && isset($_POST["project"]) ){	
 	
-	$App = new App($Args);
+	$user = $_POST["user"];
+	$password = $_POST["password"];
+	$project = $_POST["project"];
+	
+}
+
+//Library args
+$Args = Array(
+	"user" => Array(
+		"name" => $user,
+		"password" => $password,
+		"domain" => Array(
+			"name" => "Default")
+	),
+	"scope" => Array(
+		"project" => Array(
+			"name" => $project,
+			"domain" => Array(
+				"name" => "Default")
+			)
+		),
+	"authUrl" => $config["urlAuth"]
+);
+
+//Init core Api
+$App = new App($Args);
 
-	if(isset($token))
-		$App->setToken($token);
+if(isset($token))
+	$App->setToken($token);
 ?>
-- 
cgit v1.2.3


From 1d42345e07b2ef557de3c5049864e6885632b9e9 Mon Sep 17 00:00:00 2001
From: EoleDev <EoleDev@outlook.fr>
Date: Wed, 27 Apr 2016 14:22:59 +0200
Subject: End of comments

---
 server/config.inc.php                       |   4 +-
 server/core/App.php                         |  16 +--
 server/core/Automating.php                  |  24 ++--
 server/core/Compute.php                     | 141 +++++++++++++++---------
 server/core/CoreInterface.php               |  15 ++-
 server/core/ErrorManagement.php             |  20 ++--
 server/core/Identity.php                    | 160 ++++++++++++++-------------
 server/core/Image.php                       |  40 +++----
 server/core/LibOverride/genTokenOptions.php | 164 ++++++++++++++++++++++++++--
 server/core/Network.php                     | 108 +++++++++---------
 server/core/NetworkLayer3.php               |  42 +++----
 server/index.php                            |   2 +
 server/init.php                             |  19 ++--
 13 files changed, 491 insertions(+), 264 deletions(-)

(limited to 'server/core/Network.php')

diff --git a/server/config.inc.php b/server/config.inc.php
index 4a4e494..71f0bb4 100755
--- a/server/config.inc.php
+++ b/server/config.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* File containing the code for the API door.
+* File containing global config options for the API.
 *
 * @version 1.0 Initialisation of this file
 * @since 1.0 Core application's file
@@ -15,7 +15,7 @@ $config = Array();
 
 $config["modules_enabled"] = "";
 $config["urlAuth"] = "http://148.60.11.31:5000/v3";
-$config["tokenTime"] = 60; //minute = 60
+$config["tokenTime"] = 60; //minutes
 ?>
 
 	
diff --git a/server/core/App.php b/server/core/App.php
index 3a027d7..fb49b95 100755
--- a/server/core/App.php
+++ b/server/core/App.php
@@ -9,7 +9,9 @@
 * 
 */
 
-//Library token management override
+/*
+* Library token management override
+*/
 include_once("core/LibOverride/genTokenOptions.php");
 include_once("core/ErrorManagement.php");
 
@@ -28,7 +30,7 @@ use OpenCloud\Common\Error\UserInputError;
 */
 class App{
 	
-	/** @var Openstack $openstack protected, contains the main library object */
+	/** @var OpenStack\OpenStack $openstack protected, contains the main library object */
 	protected $openstack;
 	/** @var Array $postParams protected, contains the post parameters */
 	protected $postParams;
@@ -124,7 +126,7 @@ class App{
 	/**
 	* Generate the token for the different services in OpenStack
 	*
-	* @return NULL
+	* @return void
 	*/
 	public function authenticate(){
 		
@@ -150,7 +152,7 @@ class App{
 	/**
 	* Revoke the openstack services' token
 	*
-	* @return NULL
+	* @return void
 	*/
 	public function deauthenticate(){
 		
@@ -197,7 +199,7 @@ class App{
 	* @param String $param Name for the Post entry
 	* @param Object $value Value for the Post entry
 	*
-	* @return NULL
+	* @return void
 	*/
 	public function setPostParam($param, $value){
 		
@@ -211,7 +213,7 @@ class App{
 	* @param String $key Array key for the message
 	* @param Array $out Message's value
 	*
-	* @return NULL
+	* @return void
 	*/
 	public function setOutput($key, $out){
 		
@@ -233,7 +235,7 @@ class App{
 	/**
 	* Output the messages to be send to the client
 	*
-	* @return NULl
+	* @return void
 	*/
 	public function show(){
 		echo json_encode($this->output);
diff --git a/server/core/Automating.php b/server/core/Automating.php
index 2d8db00..697b666 100755
--- a/server/core/Automating.php
+++ b/server/core/Automating.php
@@ -14,21 +14,31 @@ include("Network.php");
 include("Compute.php");
 include("NetworkLayer3.php");
 
-class automating{
+/**
+* automating Class of the back-end application
+*
+* Contains the different function to automate some action
+*
+*/
+class automating implements Core{
 
-	/** @var App $app protected, contains the main app object */
+	/** @var App $compute protected, contains a Core compute object */
 	protected $compute;
+	/** @var App $image protected, contains a Core image object */
 	protected $image;
+	/** @var App $network protected, contains a Core network object */
 	protected $network;
+	/** @var App $networkLayer3 protected, contains a Core networkLayer3 object */
 	protected $networkLayer3;
+	/** @var App $app protected, contains the main app object */
 	protected $app;
 	
 	/**
-	* Our library's app constructor for all server app objects
+	* automating class constructor
 	*
-	* @param App $app the main app object, e.g. compute, image, network, etc.
+	* @param App $app the main app object
 	*
-	* @return
+	* @return automating Object
 	*/
 	public function __construct($app){
 		$this->app = $app;
@@ -43,7 +53,7 @@ class automating{
 	*
 	* @param String $action name of another function of this class
 	*
-	* @return NULL
+	* @return void
 	*/
 	public function action($action){
 		$this->{$action.""}();	
@@ -57,7 +67,7 @@ class automating{
 	* @param String $serverName name ofthe new server
 	* @param String $flavor kind of server
 	*	
-	* @return NULL
+	* @return void
 	*/
 	private function createPublicServer()
 	{
diff --git a/server/core/Compute.php b/server/core/Compute.php
index e466b52..7e27d00 100755
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -1,37 +1,62 @@
 <?php
-//namespace istic-openstack\Server\core;
+/**
+* File containing the compute Class.
+*
+* @version 1.0 Initialisation of this file
+* @since 1.0 Core application's file
+* 
+* @author  bhupi
+* 
+*/
+
 use OpenCloud\Common\Error;
 
-class compute 
+/**
+* Compute Class of the back-end application
+*
+* Management of Servers
+*
+*/
+class compute implements Core
 {
 	/** @var App $app protected, contains the main app object */
 	protected $app;
 
-	/** @var OpenStack\Identity $libClass protected, contains the library Compute object */
+	/** @var OpenStack\Compute $libClass protected, contains the library Compute object */
 	protected $libClass;
 
 
+	/**
+	* Compute constructor
+	*
+	* @param App $args the main app object
+	*
+	* @return compute Object
+	*/
 	public function __construct($app)
 	{
 		$this->app = $app;
 		$this->libClass = $app->getLibClass("Compute");
 	}
+	
 	/**
 	* Execute an action
 	*
 	* @param String $action name of another function of this class
 	*
-	* @return NULL
+	* @return void
 	*/
 	public function action($action){
 		
 		$this->{$action.""}();
 		
 	}
+	
 	/**
-			* List servers.
-			* @return array
-			*/
+	* List servers.
+	*
+	* @return void
+	*/
 	public function listServers()
 	{
 		try{
@@ -79,12 +104,13 @@ class compute
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
 		}
-		return;
 	}
+	
 	/**
-				* List flavors.
-				* @return array
-				*/
+	* List flavors.
+	*
+	* @return void
+	*/
 	public function listFlavors()
 	{
 		try{
@@ -117,12 +143,13 @@ class compute
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
 		}
-		return;
 	}
+	
 	/**
-				* List images.
-				* @return array
-				*/
+	* List images.
+	*
+	* @return void
+	*/
 	public function listImages()
 	{
 		try{
@@ -159,12 +186,13 @@ class compute
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
 		}
-		return;
 	}
+	
 	/**
-				* Get server details.
-				* @return array
-				*/
+	* Get server details.
+	*
+	* @return void
+	*/
 	public function getServer()
 	{
 		try{
@@ -193,12 +221,13 @@ class compute
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
 		}
-		return;
 	}
+	
 	/**
-				* Get flavor details.
-				* @return array
-				*/
+	* Get flavor details.
+	*
+	* @return void
+	*/
 	public function getFlavor()
 	{
 		try{
@@ -227,12 +256,12 @@ class compute
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
 		}
-		return;
 	}
+	
 	/**
-				* Get image details.
-				* @return array
-				*/
+	* Get image details.
+	* @return array
+	*/
 	public function getImage()
 	{
 		try{
@@ -261,12 +290,13 @@ class compute
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
 		}
-		return;
 	}
+	
 	/**
-				* Create server.
-				* @return array
-				*/ 
+	* Create server.
+	*
+	* @return void
+	*/ 
 	public function createServer()
 	{
 		try{
@@ -295,12 +325,12 @@ class compute
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
 		}
-		return;
 	}
 
 	/**
 	* update a server
-	* @return NULL
+	*
+	* @return void
 	*/
 	public function updateServer()
 	{
@@ -342,11 +372,12 @@ class compute
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
 		}
-		return;
 	}
+	
 	/**
 	* Delete a server
-	* @return NULL
+	*
+	* @return void
 	*/
 	public function deleteServer()
 	{
@@ -376,11 +407,12 @@ class compute
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
 		}
-		return;
 	}
+	
 	/**
 	* Change the password of a server
-	* @return NULL
+	*
+	* @return void
 	*/
 	public function changePassword()
 	{
@@ -411,11 +443,12 @@ class compute
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
 		}
-		return;
 	}
+	
 	/**
 	* Reboot a server
-	* @return NULL
+	*
+	* @return void
 	*/
 	public function reboot()
 	{
@@ -445,11 +478,12 @@ class compute
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
 		}
-		return;
 	}
+	
 	/**
 	* Rebuild a server
-	* @return NULL
+	*
+	* @return void
 	*/
 	public function rebuild()
 	{
@@ -490,13 +524,15 @@ class compute
 			catch(Exception $e){
 				$this->app->getErrorInstance()->OtherException($e);
 			}
-			return;
 		}
 	}
+	
 	/**
 	* Resize a server
+	*
 	* A call to this method has to be followed by either confirmResize or revertResize
-	* @return NULL
+	*
+	* @return void
 	*/
 	public function resize()
 	{
@@ -526,11 +562,12 @@ class compute
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
 		}
-		return;
 	}
+	
 	/**
 	* Confirm resize operation on a server
-	* @return NULL
+	*
+	* @return void
 	*/
 	public function confirmResize()
 	{
@@ -560,11 +597,12 @@ class compute
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
 		}
-		return;
 	}
+	
 	/**
 	* Revert resize operation on a server
-	* @return NULL
+	*
+	* @return void
 	*/
 	public function revertResize()
 	{
@@ -594,14 +632,14 @@ class compute
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
 		}
-		return;
 	}
+	
 	/**
 	* List private and public addresses of a server
-	* @return NULL
+	*
+	* @return void
 	*/
-	
-	public function listAddresses(array $options = [])
+	public function listAddresses()
 	{
 		try{
 			$serverId = $this->app->getPostParam("serverId");
@@ -629,7 +667,6 @@ class compute
 		catch(Exception $e){
 			$this->app->getErrorInstance()->OtherException($e);
 		}
-		return;
 	}
 }
 
diff --git a/server/core/CoreInterface.php b/server/core/CoreInterface.php
index 6c2313b..8bcfad4 100755
--- a/server/core/CoreInterface.php
+++ b/server/core/CoreInterface.php
@@ -1,15 +1,26 @@
 <?php
 /**
-* File containing Core Interface
+* File containing Core Interface.
+* 
+*/
+
+/**
+* Interface for the main classes of the API
 *
 * @version 1.0 Initialisation of this file
 * @since 1.0 Core application's file
 * 
 * @author Eole 'eoledev at outlook . fr'
-* 
 */
 interface Core{
 	
+	/**
+	* Execute an action in the class
+	*
+	* @param String $action Function to be called
+	*
+	* @return void
+	*/
 	public function action($action);
 	
 }
\ No newline at end of file
diff --git a/server/core/ErrorManagement.php b/server/core/ErrorManagement.php
index 0e315a7..130c488 100755
--- a/server/core/ErrorManagement.php
+++ b/server/core/ErrorManagement.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* File containing the Errormanagement Class.
+* File containing the errorManagement Class.
 *
 * @version 1.0 Initialisation of this file
 * @since 1.0 Core application's file
@@ -14,8 +14,14 @@ use OpenCloud\Common\Error\BaseError;
 use OpenCloud\Common\Error\NotImplementedError;
 use OpenCloud\Common\Error\UserInputError;
 
-
+/**
+* errorManagement Class of the back-end application
+*
+* Management of error
+*
+*/
 Class errorManagement{
+	
 	/** @var App $app protected, contains the main app object */
 	protected $app;
 	
@@ -37,7 +43,7 @@ Class errorManagement{
 	*
 	* @param Exception $error the exception triggered
 	*
-	* @return NULL
+	* @return void
 	*/
 	public function BaseErrorHandler($error){
 		$this->app->setOutput("Error", "BaseError");
@@ -48,7 +54,7 @@ Class errorManagement{
 	*
 	* @param Exception $error the exception triggered
 	*
-	* @return NULL
+	* @return void
 	*/
 	public function BadResponseHandler($error){
 		$statusCode = $error->getResponse()->getStatusCode();
@@ -88,7 +94,7 @@ Class errorManagement{
 	*
 	* @param Exception $error the exception triggered
 	*
-	* @return NULL
+	* @return void
 	*/
 	public function NotImplementedHandler($error){
 		$this->app->setOutput("Error", "Internal error (not implemented yet), please contact an administrator");
@@ -99,7 +105,7 @@ Class errorManagement{
 	*
 	* @param Exception $error the exception triggered
 	*
-	* @return NULL
+	* @return void
 	*/
 	public function UserInputHandler($error){
 		$this->app->setOutput("Error", "UserInputError");
@@ -110,7 +116,7 @@ Class errorManagement{
 	*
 	* @param Exception $error the exception triggered
 	*
-	* @return NULL
+	* @return void
 	*/
 	public function OtherException($error){
 		$this->app->setOutput("Error", $error->getMessage());
diff --git a/server/core/Identity.php b/server/core/Identity.php
index f6179b0..a30dad2 100755
--- a/server/core/Identity.php
+++ b/server/core/Identity.php
@@ -2,11 +2,10 @@
 /**
 * File containing the identity Class.
 *
-* @version 1.0 Initialisation of this file
-* @since 1.0 Core application's file
-* 
-* @author Eole 'eoledev at outlook . fr'
-* 
+*/
+
+/**
+* Import the Error of the Library
 */
 use OpenCloud\Common\Error;
 
@@ -15,6 +14,11 @@ use OpenCloud\Common\Error;
 *
 * This class implements the management for the identity request
 *
+* @version 1.0 Initialisation of this file
+* @since 1.0 Core application's file
+* 
+* @author Eole 'eoledev at outlook . fr'
+* 
 */
 class identity implements Core{
 
@@ -29,7 +33,7 @@ class identity implements Core{
 	*
 	* @param App $app the main app object
 	*
-	* @return identity
+	* @return identity Object
 	*/
 	public function __construct($app){
 
@@ -43,7 +47,7 @@ class identity implements Core{
 	*
 	* @param String $action name of another function of this class
 	*
-	* @return NULL
+	* @return void
 	*/
 	public function action($action){
 		
@@ -61,7 +65,7 @@ class identity implements Core{
 	* @param String $type Required Type of credential : ec2, cert...
 	* @param String $userId Required Id of the user which own the credential
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function addCredential(){
 		
@@ -99,7 +103,7 @@ class identity implements Core{
 	/**
 	* List the credentials for a given user.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function listCredentials(){
 		try{
@@ -127,7 +131,7 @@ class identity implements Core{
 	*
 	* @param String $credentialId Required credential id for which it retrieve the details
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function showCredential(){
 		$credentId = $this->app->getPostParam("credentialId");
@@ -164,7 +168,7 @@ class identity implements Core{
 	* @param JsonString $blob Required credentials information with this structure for ec2: "{\"access\":\"181920\",\"secret\":\"secretKey\"}"
 	* @param String $type Required Type of credential : ec2, cert...
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function updateCredential(){
 		
@@ -206,7 +210,7 @@ class identity implements Core{
 	*
 	* @param String $credentialId Required credential id to delete
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function deleteCredential(){
 		
@@ -244,7 +248,7 @@ class identity implements Core{
 	* @param String $enabled Optional Domain enabled or not : value true or false
 	* @param String $name Required Domain Name
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function addDomain(){
 		
@@ -289,7 +293,7 @@ class identity implements Core{
 	/**
 	* Retrieve the different domain's list.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function listDomains(){
 		
@@ -318,7 +322,7 @@ class identity implements Core{
 	*
 	* @param String $domainId Required Domain id for which it retrieve the details
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function showDomain(){
 		
@@ -356,7 +360,7 @@ class identity implements Core{
 	* @param String $enabled Optional Domain enabled or not : value true or false
 	* @param String $name Required Domain Name
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function updateDomain(){
 		
@@ -404,7 +408,7 @@ class identity implements Core{
 	*
 	* @param String $domainId Required Domain id to delete
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function deleteDomain(){
 		
@@ -437,7 +441,7 @@ class identity implements Core{
 	/**
 	* Retrieve the different roles of a given user in a domain.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function listRolesDomainUser(){
 		
@@ -472,7 +476,7 @@ class identity implements Core{
 	/**
 	* Grant a role to a given user in a domain.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function grantRoleDomainUser(){
 		$domId = $this->app->getPostParam("domainId");
@@ -510,7 +514,7 @@ class identity implements Core{
 	/**
 	* Verify that a user has a given role in a domain.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function checkRoleDomainUser(){
 		$domId = $this->app->getPostParam("domainId");
@@ -549,7 +553,7 @@ class identity implements Core{
 	/**
 	* Delete a role for a given user in a domain.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function revokeRoleDomainUser(){
 		$domId = $this->app->getPostParam("domainId");
@@ -587,7 +591,7 @@ class identity implements Core{
 	/**
 	* Retrieve the roles of a given group in a domain.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function listRolesDomainGroup(){
 		$domId = $this->app->getPostParam("domainId");
@@ -622,7 +626,7 @@ class identity implements Core{
 	/**
 	* Add a role to a given group in a domain.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function grantRoleDomainGroup(){
 		$domId = $this->app->getPostParam("domainId");
@@ -660,7 +664,7 @@ class identity implements Core{
 	/**
 	* Verify that a role is associated with a given group in a domain.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function checkRoleDomainGroup(){
 		$domId = $this->app->getPostParam("domainId");
@@ -699,7 +703,7 @@ class identity implements Core{
 	/**
 	* Delete a role for a given group in a domain.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function revokeRoleDomainGroup(){
 		$domId = $this->app->getPostParam("domainId");
@@ -738,7 +742,7 @@ class identity implements Core{
 	/**
 	* Add an endpoint to the Openstack instance
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function addEndpoint(){
 		$servId = $this->app->getPostParam("serviceId");
@@ -778,7 +782,7 @@ class identity implements Core{
 	/**
 	* Retrieve the endpoint for the given id
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function getEndpoint(){
 		
@@ -810,7 +814,7 @@ class identity implements Core{
 	/**
 	* Retrieve the list of the different endpoints
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function listEndpoints(){
 		
@@ -836,7 +840,7 @@ class identity implements Core{
 	/**
 	* Update a given endpoint
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function updateEndpoint(){
 		//Not Implemented Yet
@@ -845,7 +849,7 @@ class identity implements Core{
 	/**
 	* Delete a given endpoint
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function deleteEndpoint(){
 		$endId = $this->app->getPostParam("endpointId");
@@ -877,7 +881,7 @@ class identity implements Core{
 	/**
 	* Add a group.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function addGroup(){
 		//Not Implemented Yet
@@ -886,7 +890,7 @@ class identity implements Core{
 	/**
 	* Retrieve the group's list.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function listGroups(){
 		//Not Implemented Yet
@@ -895,7 +899,7 @@ class identity implements Core{
 	/**
 	* Retrieve the details of a given group.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function showGroup(){
 		//Not Implemented Yet
@@ -904,7 +908,7 @@ class identity implements Core{
 	/**
 	* Update a given group.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function updateGroup(){
 		//Todo Argument Optional
@@ -945,7 +949,7 @@ class identity implements Core{
 	/**
 	* Delete the given group.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function deleteGroup(){
 		
@@ -979,7 +983,7 @@ class identity implements Core{
 	/**
 	* Retrieve the users of a given group.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function listGroupUsers(){
 		
@@ -1013,7 +1017,7 @@ class identity implements Core{
 	/**
 	* Add a user to a group.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function addGroupUser(){
 		
@@ -1048,7 +1052,7 @@ class identity implements Core{
 	/**
 	* Remove a user from a given group.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function removeGroupUser(){
 		
@@ -1083,7 +1087,7 @@ class identity implements Core{
 	/**
 	* Check if a group contains a given user.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function checkGroupUser(){
 		
@@ -1118,7 +1122,7 @@ class identity implements Core{
 	/**
 	* @todo
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function addPolicies(){
 		//Not Implemented Yet
@@ -1127,7 +1131,7 @@ class identity implements Core{
 	/**
 	* @todo
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function listPolicies(){
 		//Not Implemented Yet
@@ -1136,7 +1140,7 @@ class identity implements Core{
 	/**
 	* @todo
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function showPolicie(){
 		//Not Implemented Yet
@@ -1146,7 +1150,7 @@ class identity implements Core{
 	/**
 	* @todo
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function updatePolicies(){
 		//Not Implemented Yet
@@ -1155,7 +1159,7 @@ class identity implements Core{
 	/**
 	* @todo
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function deletePolicies(){
 		//Not Implemented Yet
@@ -1164,7 +1168,7 @@ class identity implements Core{
 	/**
 	* Add a project.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function addProject(){
 		//Todo Parameters Optional
@@ -1201,7 +1205,7 @@ class identity implements Core{
 	/**
 	* Retrieve the different projects.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function listProjects(){
 		
@@ -1227,7 +1231,7 @@ class identity implements Core{
 	/**
 	* Retrieve the details of a given project.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function showProject(){
 		
@@ -1260,7 +1264,7 @@ class identity implements Core{
 	/**
 	* Update a given project.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function updateProject(){
 		//Todo Parameters Optionnal
@@ -1300,7 +1304,7 @@ class identity implements Core{
 	/**
 	* Delete a given project.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function deleteProject(){
 		$projId = $this->app->getPostParam("projId");
@@ -1333,7 +1337,7 @@ class identity implements Core{
 	/**
 	* List the roles of a given user in a project.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function listRolesProjectUser(){
 		
@@ -1370,7 +1374,7 @@ class identity implements Core{
 	/**
 	* Grant a role to an user in a project.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function grantRoleProjectUser(){
 		
@@ -1409,7 +1413,7 @@ class identity implements Core{
 	/**
 	* Check if a given user has a role in a project.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function checkRoleProjectUser(){
 		$projId = $this->app->getPostParam("projetId");
@@ -1450,7 +1454,7 @@ class identity implements Core{
 	/**
 	* Delete a role for a given user in a project.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function revokeRoleProjectUser(){
 		
@@ -1489,7 +1493,7 @@ class identity implements Core{
 	/**
 	* List the roles of a group in a project.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function listRolesProjectGroup(){
 		
@@ -1525,7 +1529,7 @@ class identity implements Core{
 	/**
 	* Add a role to a group in a project.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function grantRoleProjectGroup(){
 		
@@ -1564,7 +1568,7 @@ class identity implements Core{
 	/**
 	* Check if a group has a given role in a project.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function checkRoleProjectGroup(){
 		
@@ -1605,7 +1609,7 @@ class identity implements Core{
 	/**
 	* Delete a role for a group in a project.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function revokeRoleProjectGroup(){
 		
@@ -1644,7 +1648,7 @@ class identity implements Core{
 	/**
 	* Add a role.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function addRole(){
 		
@@ -1678,7 +1682,7 @@ class identity implements Core{
 	/**
 	* List the different roles
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function listRoles(){
 
@@ -1704,7 +1708,7 @@ class identity implements Core{
 	/**
 	* List the different assignments for a given role
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function listRoleAssignements(){
 		
@@ -1730,7 +1734,7 @@ class identity implements Core{
 	/**
 	* Add a service.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function addService(){
 		$name = $this->app->getPostParam("name");
@@ -1765,7 +1769,7 @@ class identity implements Core{
 	/**
 	* Retrieve the different services.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function listServices(){
 		
@@ -1791,7 +1795,7 @@ class identity implements Core{
 	/**
 	* Retrieve the details for a given service.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function showService(){
 		$servId = $this->app->getPostParam("serviceId");
@@ -1822,7 +1826,7 @@ class identity implements Core{
 	/**
 	* Delete a given service.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function deleteService(){
 		
@@ -1856,7 +1860,7 @@ class identity implements Core{
 	/**
 	* Generate a new token for a given user id.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function genTokenUserID(){
 		
@@ -1894,7 +1898,7 @@ class identity implements Core{
 	/**
 	* Generate a new token for a given user name.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function genTokenUserName(){
 		$username = $this->app->getPostParam("username");
@@ -1936,7 +1940,7 @@ class identity implements Core{
 	/**
 	* Generate a new token from another token ID.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function genTokenID(){
 		
@@ -1972,7 +1976,7 @@ class identity implements Core{
 	/**
 	* Generate a new token scoped by a project ID.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function genTokenScopedProjectID(){
 		
@@ -2014,7 +2018,7 @@ class identity implements Core{
 	/**
 	* Generate a new token scoped by a project name.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function genTokenScopedProjectName(){
 		
@@ -2062,7 +2066,7 @@ class identity implements Core{
 	/**
 	* Check if a token is validate.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function validateToken(){
 		
@@ -2098,7 +2102,7 @@ class identity implements Core{
 	/**
 	* Delete a given token.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function revokeToken(){
 		
@@ -2130,7 +2134,7 @@ class identity implements Core{
 	/**
 	* Add a new user.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function addUser(){
 		//Todo Optionnal Parameter
@@ -2175,7 +2179,7 @@ class identity implements Core{
 	/**
 	* Retrieve the different users.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function listUsers(){
 		
@@ -2201,7 +2205,7 @@ class identity implements Core{
 	/**
 	* Retrieve the details of a given user.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function showUser(){
 		
@@ -2234,7 +2238,7 @@ class identity implements Core{
 	/**
 	* Update a given user.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function updateUser(){
 		
@@ -2273,7 +2277,7 @@ class identity implements Core{
 	/**
 	* Delete a given user.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function deleteUser(){
 		
@@ -2306,7 +2310,7 @@ class identity implements Core{
 	/**
 	* Retrieve the groups which contains a given user.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function listUserGroups(){
 		
@@ -2340,7 +2344,7 @@ class identity implements Core{
 	/**
 	* Retrieve the projects which contains a given user.
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function listUserProjects(){
 		
diff --git a/server/core/Image.php b/server/core/Image.php
index d930962..b256d4c 100755
--- a/server/core/Image.php
+++ b/server/core/Image.php
@@ -7,8 +7,8 @@
 * 
 * @author Evan Pisani 'yogg at epsina . com'
 * 
-* @todo Complete the functions with errors detection and finish the descriptions
 */
+
 use OpenCloud\Common\Error\BadResponseError;
 use OpenCloud\Common\Error\BaseError;
 use OpenCloud\Common\Error\NotImplementedError;
@@ -27,7 +27,7 @@ class image implements Core{
 	/** @var App $app protected, contains the main app object */
 	protected $app;
 	
-	/** @var OpenStack\Identity $libClass protected, contains the library Identity object */
+	/** @var OpenStack\Image $libClass protected, contains the library Image object */
 	protected $libClass;
 	
 	/**
@@ -35,7 +35,7 @@ class image implements Core{
 	*
 	* @param App $app the main app object
 	*
-	* @return Image
+	* @return image Object
 	*/
 	public function __construct($app){
 		if(!isset($app)){
@@ -51,7 +51,7 @@ class image implements Core{
 	*
 	* @param String $action name of another function of this class
 	*
-	* @return NULL
+	* @return void
 	*/
 	public function action($action){
 		$this->{$action.""}();	
@@ -62,7 +62,7 @@ class image implements Core{
 	*
 	* @param array $opt Options for the image creation (name is required, others are optionals)
 	*
-	* @return Image
+	* @return void
 	*/
 	private function createImage(){
 		$opt = $this->app->getPostParam("opt");
@@ -141,7 +141,7 @@ class image implements Core{
 	/**
 	* List the images of the server
 	*
-	* @return List of Image
+	* @return void
 	*/
 	private function listImage(){
 		try{
@@ -171,7 +171,7 @@ class image implements Core{
 	*
 	* @param String $id Identifier of the image
 	*	
-	* @return Image
+	* @return void
 	*/
 	private function detailsImage(){
 		$id = $this->app->getPostParam("id");
@@ -209,7 +209,7 @@ class image implements Core{
 	* @param String $id id of the image
 	* @param array  $opt Options for the image creation
 	*	
-	* @return Image
+	* @return void
 	*/
 
 	private function updateImage(){
@@ -272,7 +272,7 @@ class image implements Core{
 	*
 	* @param String $id Identifier of the image
 	*	
-	* @return NULL
+	* @return void
 	*/
 	private function deleteImage(){
 		$id = $this->app->getPostParam("id");
@@ -302,11 +302,11 @@ class image implements Core{
 	}
 
 	/**
-	* Resactive an image
+	* Reactive an image
 	*
 	* @param String $id Identifier of the image
 	*	
-	* @return NULL
+	* @return void
 	*/
 	private function reactivateImage(){
 		$id = $this->app->getPostParam("id");
@@ -339,11 +339,11 @@ class image implements Core{
 	}
 
 	/**
-	* Desactive an image
+	* Desactivaate an image
 	*
 	* @param String $id Identifier of the image
 	*
-	* @return NULL	
+	* @return void	
 	*/
 	private function desactivateImage(){
 		$id = $this->app->getPostParam("id");
@@ -380,7 +380,7 @@ class image implements Core{
 	* @param String $id Identifier of the image
 	* @param String $file_name Path of the image
 	*	
-	* @return NULL
+	* @return void
 	*/
 	private function uploadImage(){
 		$id = $this->app->getPostParam("id");
@@ -422,7 +422,7 @@ class image implements Core{
 	*
 	* @param String $id Identifier of the image
 	*
-	* @return Stream
+	* @return void
 	*/
 	private function downloadImage(){
 		$id = $this->app->getPostParam("id");
@@ -459,7 +459,7 @@ class image implements Core{
 	* @param String $image_id Identifier of the image
 	* @param String $member_id Identifier of the member
 	*	
-	* @return Member
+	* @return void
 	*/
 	private function addMemberImage(){
 		$image_id = $this->app->getPostParam("image_id");
@@ -501,7 +501,7 @@ class image implements Core{
 	*
 	* @param String $image_id identifier of the image
 	*
-	* @return List of Member 	
+	* @return void
 	*/
 	private function listMemberImage(){
 		$image_id = $this->app->getPostParam("image_id");
@@ -545,7 +545,7 @@ class image implements Core{
 	* @param String $image_id Identifier of the image
 	* @param String $member_id Identifier of the member
 	*
-	* @return Member
+	* @return void
 	*/
 	private function detailMemberImage(){
 		$image_id = $this->app->getPostParam("image_id");
@@ -591,7 +591,7 @@ class image implements Core{
 	* @param String $image_id Identifier of the image
 	* @param String $member_id Identifier of the member
 	*	
-	* @return NULL
+	* @return void
 	*/
 	private function removeMemberImage(){
 		$image_id = $this->app->getPostParam("image_id");
@@ -637,7 +637,7 @@ class image implements Core{
 	* @param String $member_id Identifier of the member
 	* @param String $status New status for the member
 	*
-	* @return NULL	
+	* @return void
 	**/
 	private function updateMemberImage(){
 		$image_id = $this->app->getPostParam("image_id");
diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php
index 68a7dbd..f0b3b88 100755
--- a/server/core/LibOverride/genTokenOptions.php
+++ b/server/core/LibOverride/genTokenOptions.php
@@ -1,4 +1,14 @@
 <?php
+/**
+* File containing the override of the authentication for the Library.
+*
+* @version 1.0 Initialisation of this file
+* @since 1.0 Core application's file
+* 
+* @author Eole 'eoledev at outlook . fr'
+* 
+* @todo Check with the API, the condition and test the revoke token implementation
+*/
 
 use GuzzleHttp\Client;
 use OpenCloud\Common\Transport\HandlerStack;
@@ -9,21 +19,38 @@ use OpenCloud\Common\Auth\Token;
 use OpenCloud\Common\Transport\Utils;
 use OpenStack\Identity\v3\Models;
 
+/**
+* genTokenOptions Class
+*
+* This class allow the generation of tokens for openstack, and to inject 
+* those tokens into the library. Which allow to do a proper login only once
+* and not for each request
+*
+*/
 class genTokenOptions
 {
+	/** @var Array $optionsGlobal private, contains the options common for the different tokens */
 	private $optionsGlobal;
-	
-	private $stack;
+	/** @var Array $backup private, contains all the informations about the different tokens. It contains the information send to the clients */
 	private $backup = [];
+	/** @var GuzzleHttp\Client $httpClient private, contains a default Client to construct some OpenStack library object */
 	private $httpClient;
 
+	/**
+	* genTokenOptions constructor
+	*
+	* @param Array $options Options to create the objects in the library
+	*												AuthUrl is the main options required
+	*
+	* @return genTokenOptions Object
+	*/
 	public function __construct($options){
 		
-		$this->stack = HandlerStack::create();
+		$stack = HandlerStack::create();
 
 		$httpClient = new Client([
 		'base_uri' => Utils::normalizeUrl($options['authUrl']),
-		'handler'  => $this->stack,
+		'handler'  => $stack,
 		]);
 		
 		$this->httpClient = $httpClient;
@@ -38,8 +65,13 @@ class genTokenOptions
 	}
 
 	/**
-		* @codeCoverageIgnore
-		*/
+	* Add a debug for the library
+	*
+	* @param array $options Debug options, cf library
+	* @param HandlerStack $stack pointer to a HandlerStack object
+	*
+	* @return void
+	*/
 	private function addDebugMiddleware(array $options, HandlerStack &$stack)
 	{
 		if (!empty($options['debugLog'])
@@ -50,12 +82,20 @@ class genTokenOptions
 		}
 	}
 
+	/**
+	* Check the expiration time of a token
+	*
+	* @return boolean if the token is not expired
+	*/
 	public function checkToken(){
-		//error_log(print_r($this->backup['time'], true), 0);
 		return $this->backup['time'] > time();
-		//return true;
 	}
 	
+	/**
+	* Generate a new token for the Identity service
+	*
+	* @return void
+	*/
 	public function genIdentityToken(){
 		$options = $this->optionsGlobal['Common'];
 		$options['catalogName'] = 'false';
@@ -81,12 +121,24 @@ class genTokenOptions
 		$this->optionsGlobal['Identity'] = $options;
 	}
 	
+	/**
+	* Revoke the token for the Identity Service
+	*
+	* @return void
+	*/
 	public function revokeIdentityToken(){
 		$token = $this->unserializeToken($this->backup['Identity']['token']);
 		$this->optionsGlobal['Common']['identityService']->revokeToken($token->id);
 		
 	}
 	
+	/**
+	* Load a token for the Identity Service
+	*
+	* @param String $opt serialized token
+	*
+	* @return void
+	*/
 	public function loadIdentityBackup($opt){
 		$options = $this->optionsGlobal['Common'];
 		$options['catalogName'] = 'false';
@@ -112,6 +164,11 @@ class genTokenOptions
 		
 	}
 	
+	/**
+	* Generate a new token for the Image service
+	*
+	* @return void
+	*/
 	public function genImageToken(){
 		$options = $this->optionsGlobal['Common'];
 		$options['catalogName'] = 'glance';
@@ -135,12 +192,24 @@ class genTokenOptions
 		$this->optionsGlobal['Image'] = $options;
 	}
 	
+	/**
+	* Revoke the token for the Image Service
+	*
+	* @return void
+	*/
 	public function revokeImageToken(){
 		$token = $this->unserializeToken($this->backup['Image']['token']);
 		$this->optionsGlobal['Common']['identityService']->revokeToken($token->id);
 		
 	}
 	
+	/**
+	* Load a token for the Image Service
+	*
+	* @param String $opt serialized token
+	*
+	* @return void
+	*/
 	public function loadImageBackup($opt){
 		$options = $this->optionsGlobal['Common'];
 		$options['catalogName'] = 'glance';
@@ -165,6 +234,11 @@ class genTokenOptions
 		$this->optionsGlobal['Image'] = $options;
 	}
 	
+	/**
+	* Generate a new token for the Metwork service
+	*
+	* @return void
+	*/
 	public function genNetworkToken(){
 		$options = $this->optionsGlobal['Common'];
 		$options['catalogName'] = 'neutron';
@@ -188,12 +262,24 @@ class genTokenOptions
 		$this->optionsGlobal['Network'] = $options;
 	}
 	
+	/**
+	* Revoke the token for the Network Service
+	*
+	* @return void
+	*/
 	public function revokeNetworkToken(){
 		$token = $this->unserializeToken($this->backup['Network']['token']);
 		$this->optionsGlobal['Common']['identityService']->revokeToken($token->id);
 		
 	}
 	
+	/**
+	* Load a token for the Network Service
+	*
+	* @param String $opt serialized token
+	*
+	* @return void
+	*/
 	public function loadNetworkBackup($opt){
 		$options = $this->optionsGlobal['Common'];
 		$options['catalogName'] = 'neutron';
@@ -218,6 +304,11 @@ class genTokenOptions
 		$this->optionsGlobal['Network'] = $options;
 	}
 	
+	/**
+	* Generate a new token for the Compute service
+	*
+	* @return void
+	*/
 	public function genComputeToken(){
 		$options = $this->optionsGlobal['Common'];
 		$options['catalogName'] = 'nova';
@@ -241,12 +332,24 @@ class genTokenOptions
 		$this->optionsGlobal['Compute'] = $options;
 	}
 	
+	/**
+	* Revoke the token for the Compute Service
+	*
+	* @return void
+	*/
 	public function revokeComputeToken(){
 		$token = $this->unserializeToken($this->backup['Compute']['token']);
 		$this->optionsGlobal['Common']['identityService']->revokeToken($token->id);
 		
 	}
 	
+	/**
+	* Load a token for the Compute Service
+	*
+	* @param String $opt serialized token
+	*
+	* @return void
+	*/
 	public function loadComputeBackup($opt){
 		
 		$options = $this->optionsGlobal['Common'];
@@ -272,10 +375,16 @@ class genTokenOptions
 		$this->optionsGlobal['Compute'] = $options;
 	}
 
+	/**
+	* Save the token given a service name
+	*
+	* @param String $name name of the service to save
+	* @param Array $data token and baseUrl for the service
+	*
+	* @return void
+	*/
 	private function saveBackup($name, $data){
 		$token = $this->serializeToken($data["token"]);
-		//$path = "core/LibOverride/projectTokenData/".$token['saved']["project"]["name"];
-		//error_log("Path a ecrire ".print_r($path, true), 0);
 		file_put_contents("core/LibOverride/projectTokenData/".$token['saved']["project"]["name"], serialize($token['saved']));
 		$this->backup['time'] = $token['time'];
 		$this->backup["roles"] = $token["roles"];
@@ -284,10 +393,22 @@ class genTokenOptions
 		$this->backup[$name] = array('token' => $token["token"], 'baseUrl' => $data["baseUrl"] );
 	}
 	
+	/**
+	* Retrieve the tokens saved
+	*
+	* @return String tokens serialized
+	*/
 	public function getBackup(){
 		return serialize($this->backup);
 	}
 	
+	/**
+	* Load tokens into the library
+	*
+	* @param String $back tokens serialized
+	*
+	* @return void
+	*/
 	public function loadBackup($back){
 		
 		$backup = unserialize($back);
@@ -302,10 +423,24 @@ class genTokenOptions
 		
 	}
 	
+	/**
+	* Retrieve the common options for a service
+	*
+	* @param String $service name of the service
+	*
+	* @return array Options to create the library class corresponding to this service
+	*/
 	public function getOptions($service){
 		return $this->optionsGlobal[$service];
 	}
 	
+	/**
+	* Serialize a given token
+	*
+	* @param Array $token token to be serialized
+	*
+	* @return String token serialized
+	*/
 	private function serializeToken($token){
 		global $config;
 		$tokenSerialized = [];
@@ -358,6 +493,15 @@ class genTokenOptions
 		return $tokenSerialized;
 	}
 	
+	/**
+	* Unserialize a token
+	*
+	* Unserialize a token and recreate the architecture of the library token
+	*
+	* @param String $tokenSerialized the token to be unserialized
+	*
+	* @return OpenCloud\Common\Auth\Token the token unserialized
+	*/
 	private function unserializeToken($tokenSerialized){
 		$Saved = file_get_contents("core/LibOverride/projectTokenData/".$this->backup["project"]);
 		$Saved = unserialize($Saved);
diff --git a/server/core/Network.php b/server/core/Network.php
index 54b5d60..ee66eaa 100755
--- a/server/core/Network.php
+++ b/server/core/Network.php
@@ -7,7 +7,6 @@
 * 
 * @author KABIR Othmane
 * 
-* @todo Complete the functions with errors detection and finish the descriptions
 */
 use OpenCloud\Common\Error\BadResponseError;
 use OpenCloud\Common\Error\BaseError;
@@ -17,11 +16,10 @@ use OpenCloud\Common\Error\UserInputError;
 /**
 * Network Class of the back-end application
 *
-* ADD CLASS DESCRIPTION
+* Management of Networks
 *
 */
-
-class network{ 
+class network implements Core{ 
 	/** @var App $app protected, contains the main app object */	
 	protected $app;
 	/** @var OpenStack\Network $libClass protected, contains the library Network object */	
@@ -29,15 +27,12 @@ class network{
 	
 	
 	/**
-	* Image constructor
+	* Network constructor
 	*
 	* @param App $app the main app object
 	*
-	* @return Network
+	* @return network Object
 	*/
-	
-
-	
 	public function __construct($app){
 		$this->app = $app;
 		$this->libClass = $app->getLibClass("Network");
@@ -49,7 +44,7 @@ class network{
 	*
 	* @param String $action name of another function of this class
 	*
-	* @return NULL
+	* @return void
 	*/
 	public function action($action){
 		
@@ -65,7 +60,7 @@ class network{
 	* @param String shared Specifies whether the network resource can be accessed by any tenant
 	* @param String tenantId Owner of network. Only admin users can specify a tenant ID other than their own
 	* 
-	* @return NULL
+	* @return void
 	*/
 	private function create_network()
 	{
@@ -134,9 +129,7 @@ class network{
 	* @param BOOLEAN enableDhcp Specifies whether DHCP is enabled for this subnet
 	* @param String allocationPools Subranges of the CIDR available for dynamic allocation to ports
 	* 	
-	*  	
-	* 
-	* @return NULL
+	* @return void
 	*/
 
 	private function create_subnet()
@@ -225,7 +218,7 @@ class network{
 	/**
 	* List the ID of the NETWORKS
 	*
-	* @return List of Networks ID
+	* @return void
 	*/
 
 	private function list_network_ids()
@@ -276,18 +269,12 @@ class network{
 		try
 		{
 			$ln = $this->libClass->listNetworks();
-			
 			$list_names = array();
-
 			
 			foreach($ln as $n)
 			{
-				
 				$list_names[] =  $n->name;
-				
-
 			}
-			
 		}
 		catch(BadResponseError $e)
 		{
@@ -308,10 +295,11 @@ class network{
 
 		$this->app->setOutput("ListNetworkNames", $list_names);
 	}
+	
 	/**
 	* List the CIDR of the SUBNETS
 	*
-	* @return List of SUBNETS CIDR
+	* @return void
 	*/
 	private function list_cidr()
 	{
@@ -344,10 +332,13 @@ class network{
 			$this->app->getErrorInstance->NotImplementedHandler($e);
 		}	
 	}
+	
 	/**
 	* retrieve a specific network
+	*
 	* @param networkId ID of network which we want to get
-	* @return Network
+	*
+	* @return void
 	*/ 
 	private function getNetwork()
 	{
@@ -383,8 +374,10 @@ class network{
 	
 	/**
 	* internal function
+	*
 	* @param String netId ID of network which we want to get
-	* @return Network
+	*
+	* @return OpenStack\Network
 	*/
 	private function getNetworkP($netId)
 	{
@@ -420,8 +413,10 @@ class network{
 
 	/**
 	* retrieve a specific subnet
+	*
 	* @param subnetId ID of subnet which we want to get
-	* @return subnet
+	*
+	* @return void
 	*/
 	private function getSubnet()
 	{
@@ -455,8 +450,10 @@ class network{
 	}
 	/**
 	* internal function
+	*
 	* @param String subnetId ID of subnet which we want to get
-	* @return subnet
+	*
+	* @return OpenStack\Subnet
 	*/
 	private function getSubnetP($subnetId)
 	{
@@ -498,7 +495,7 @@ class network{
 	* @param String tenantId Owner of network. Only admin users can specify a tenant ID other than their own
 	* 
 	*
-	* @return NULL	
+	* @return void	
 	**/	
 
 	private function updateNetwork()
@@ -561,7 +558,7 @@ class network{
 	* @param String allocationPools Subranges of the CIDR available for dynamic allocation to ports
 	* 
 	*
-	* @return NULL	
+	* @return void	
 	**/	
 
 	private function updateSubnet()
@@ -616,8 +613,7 @@ class network{
 	*
 	* @param String networkId ID if network which we want to delete
 	* 
-	*
-	* @return NULL	
+	* @return void	
 	**/	
 	private function deleteNetwork()
 	{
@@ -650,8 +646,7 @@ class network{
 	*
 	* @param String subnetId ID if network which we want to delete
 	* 
-	*
-	* @return NULL	
+	* @return void	
 	**/
 	private function deleteSubnet()
 	{
@@ -692,7 +687,7 @@ class network{
 	* @param String securityGroups 	Specifies the IDs of any security groups associated with this port
 	* @param String tenantId 	Owner of the port. Only admin users can specify a tenant ID other than their own.
 	*	
-	* @return NULL
+	* @return void
 	*/
 	
 	private function createPort()
@@ -769,7 +764,7 @@ class network{
 	/**
 	* List the of ports
 	*
-	* @return List of ports
+	* @return void
 	*/
 
 	private function listPorts()
@@ -798,8 +793,10 @@ class network{
 
 	/**
 	* retrieve a specific port given
+	*
 	* @param portId ID of port which we want to get
-	* @return port
+	*
+	* @return void
 	*/
 
 	private function getPort()
@@ -831,8 +828,11 @@ class network{
 
 	/**
 	* internal function
+	*
 	* retrieve a specific port given
+	*
 	* @param portId ID of port which we want to get
+	*
 	* @return port
 	*/
 
@@ -876,7 +876,7 @@ class network{
 	* @param String securityGroups 	Specifies the IDs of any security groups associated with this port
 	* @param String tenantId 	Owner of the port. Only admin users can specify a tenant ID other than their own.
 	*	
-	* @return NULL
+	* @return void
 	*/
 	private function updatePort()
 	{
@@ -953,7 +953,8 @@ class network{
 	* Delete a port given
 	*
 	* @param String portId 	id of port which we wante to delete
-	* @return NULL
+	*
+	* @return void
 	*/
 	private function deletePort()
 	{
@@ -988,7 +989,7 @@ class network{
 	* @param String name 	A human-readable name for the security group. This name might not be unique
 	* @param String description 	Description of the security group
 	*	
-	* @return NULL
+	* @return void
 	*/
 
 	private function createSecurityGroup()
@@ -1032,15 +1033,15 @@ class network{
 	* Create a new security groupe 
 	*
 	* @param String securityGroupId 	The security group ID to associate with this security group rule.
-	* @param String direction 	The direction in which the security group rule is applied. For a compute instance, an ingress security group 		*				rule is applied to incoming (ingress) traffic for that instance. An egress rule is applied 						to traffic leaving the instance.
+	* @param String direction 	The direction in which the security group rule is applied. For a compute instance, an ingress security group rule is applied to incoming (ingress) traffic for that instance. An egress rule is applied to traffic leaving the instance.
 	* @param String ethertype 	Must be IPv4 or IPv6, and addresses represented in CIDR must match the ingress or egress rules.	
-	* @param String portRangeMin 	The minimum port number in the range that is matched by the security group rule. If the protocol is TCP or 						UDP, this value must be less than or equal to the value of the portRangeMax attribute. If the protocol is 						ICMP, this value must be an ICMP type
-	*@param String portRangeMax 	The maximum port number in the range that is matched by the security group rule. If the protocol is TCP or 						UDP, this value must be less than or equal to the value of the portRangeMax attribute. If the protocol is 						ICMP, this value must be an ICMP type.
-	*@param String protocol 	The protocol that is matched by the security group rule
-	*@param String remoteGroupId 	The remote group ID to be associated with this security group rule. You can specify either remoteGroupId or 						remoteGroupPrefix
-	*@param String remoteIpPrefix 	The remote IP prefix to be associated with this security group rule. You can specify either remoteGroupId or 						remoteGroupPrefix
+	* @param String portRangeMin 	The minimum port number in the range that is matched by the security group rule. If the protocol is TCP or UDP, this value must be less than or equal to the value of the portRangeMax attribute. If the protocol is ICMP, this value must be an ICMP type
+	* @param String portRangeMax 	The maximum port number in the range that is matched by the security group rule. If the protocol is TCP or UDP, this value must be less than or equal to the value of the portRangeMax attribute. If the protocol is ICMP, this value must be an ICMP type.
+	* @param String protocol 	The protocol that is matched by the security group rule
+	* @param String remoteGroupId 	The remote group ID to be associated with this security group rule. You can specify either remoteGroupId or remoteGroupPrefix
+	* @param String remoteIpPrefix 	The remote IP prefix to be associated with this security group rule. You can specify either remoteGroupId or remoteGroupPrefix
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function createSecurityGroupRule()
 	{
@@ -1112,7 +1113,7 @@ class network{
 	/**
 	* List of Security Groupes
 	*
-	* @return List of Security Groupes
+	* @return void
 	*/
 
 	private function listSecurityGroupe()
@@ -1143,7 +1144,7 @@ class network{
 	/**
 	* List of Security Groupe Rules
 	*
-	* @return List of Security Groupe Rules
+	* @return void
 	*/
 
 	private function listSecurityGroupeRule()
@@ -1174,8 +1175,10 @@ class network{
 	
 	/**
 	* retrieve a specific Security Groupe given
+	*
 	* @param securityGroupeId ID of security Groupe which we want to get
-	* @return securityGroupe
+	*
+	* @return void
 	*/
 
 	private function getSecurityGroupe()
@@ -1207,9 +1210,12 @@ class network{
 	
 	/**
 	* internal function
+	*
 	* retrieve a specific Security Groupe given
+	*
 	* @param securityGroupeId ID of security Groupe which we want to get
-	* @return securityGroupe
+	*
+	* @return securityGroup
 	*/
 	private function getSecurityGroupeP($securityGroupeId)
 	{
@@ -1238,8 +1244,10 @@ class network{
 	}
 	/**
 	* Delete a specific Security Groupe given
+	*
 	* @param securityGroupeId ID of security Groupe which we want to get
-	* @return NULL
+	*
+	* @return void
 	*/
 	private function deleteSecurityGroupe()
 	{	
diff --git a/server/core/NetworkLayer3.php b/server/core/NetworkLayer3.php
index c0b773a..35bf707 100755
--- a/server/core/NetworkLayer3.php
+++ b/server/core/NetworkLayer3.php
@@ -1,41 +1,41 @@
 <?php
 /**
-* File containing the FloatingIp Class.
+* File containing the networkLayer3 Class.
 *
 * @version 1.0 Initialisation of this file
 * @since 1.0 Core application's file
 * 
 * @author Evan Pisani 'yogg at epsina . com'
 * 
-* @todo Complete the functions with errors detection and finish the descriptions
 */
+
 use OpenCloud\Common\Error\BadResponseError;
 use OpenCloud\Common\Error\BaseError;
 use OpenCloud\Common\Error\NotImplementedError;
 use OpenCloud\Common\Error\UserInputError;
 
-//include("CoreInterface.php");
+include("CoreInterface.php");
 
 /**
-* Image Class of the back-end application
+* networkLayer3 Class of the back-end application
 *
-* Management of images
+* Management of networkLayer3
 *
 */
-class networkLayer3 { 
+class networkLayer3 implements Core{ 
 
 	/** @var App $app protected, contains the main app object */
 	protected $app;
 	
-	/** @var OpenStack\Identity $libClass protected, contains the library Identity object */
+	/** @var OpenStack\NetworkLayer3 $libClass protected, contains the library NetworkLayer3 object */
 	protected $libClass;
 	
 	/**
-	* floatingip constructor
+	* networkLayer3 constructor
 	*
 	* @param App $app the main app object
 	*
-	* @return networkLayer3
+	* @return networkLayer3 Object
 	*/
 	public function __construct($app){
 		if(!isset($app)){
@@ -51,7 +51,7 @@ class networkLayer3 {
 	*
 	* @param String $action name of another function of this class
 	*
-	* @return NULL
+	* @return void
 	*/
 	public function action($action){
 		$this->{$action.""}();	
@@ -61,7 +61,7 @@ class networkLayer3 {
 	/**
 	* List floatingip
 	* 
-	* @return list of the floatingip
+	* @return void
 	*/
 	private function listFloatingIp(){
 		try{
@@ -91,7 +91,7 @@ class networkLayer3 {
 	*
 	* @param array $opt Options for the floating ip creation (floatingNetworkId is required)
 	*
-	* @return floatingip
+	* @return void
 	*/
 	private function createFloatingIp(){
 		$opt = $this->app->getPostParam("opt");
@@ -126,7 +126,7 @@ class networkLayer3 {
 	*
 	* @param String id the id of the floatingip
 	*
-	* @return floatingip details
+	* @return void
 	*/
 	private function getFloatingIp(){
 		$id = $this->app->getPostParam("id");
@@ -175,7 +175,7 @@ class networkLayer3 {
 	*
 	* @param id the id of the floatingip to update
 	* 
-	* @return NULL
+	* @return void
 	*/
 	private function updateFloatingIp(){
 		$id = $this->app->getPostParam("id");
@@ -224,7 +224,7 @@ class networkLayer3 {
 	*
 	* @param string floatingip_id the floating-ip id to delete
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function deleteFloatingIp(){
 		$id = $this->app->getPostParam("id");
@@ -273,7 +273,7 @@ class networkLayer3 {
 	*
 	* @param string floatingip_id the floating-ip id to retrieve
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function retrieveFloatingIp(){
 		$id = $this->app->getPostParam("id");
@@ -326,7 +326,7 @@ class networkLayer3 {
 	*					adminStateUp (optionnal)
 	*					name (optionnal)
 	*
-	* @return router
+	* @return void
 	*/
 	private function createRouter(){
 		$opt = $this->app->getPostParam("opt");
@@ -359,7 +359,7 @@ class networkLayer3 {
 	/**
 	* List routers
 	* 
-	* @return list of the routers
+	* @return void
 	*/
 	private function listRouters(){
 		try{
@@ -389,7 +389,7 @@ class networkLayer3 {
 	*
 	* @param String id the id of the router
 	*
-	* @return router details
+	* @return void
 	*/
 	private function getRouter(){
 		$id = $this->app->getPostParam("id");
@@ -437,7 +437,7 @@ class networkLayer3 {
 	*
 	* @param string router the router to delete
 	*
-	* @return NULL
+	* @return void
 	*/
 	private function deleteRouter(){
 		$id = $this->app->getPostParam("id");
@@ -485,7 +485,7 @@ class networkLayer3 {
 	*
 	* @param id the id of the floatingip to update
 	* 
-	* @return NULL
+	* @return void
 	*/
 	private function updateRouter(){
 		$id = $this->app->getPostParam("id");
diff --git a/server/index.php b/server/index.php
index 01203de..25c7c2e 100755
--- a/server/index.php
+++ b/server/index.php
@@ -9,6 +9,8 @@
 * 
 */
 
+/*
+*/
 //loading dependencies
 require "vendor/autoload.php";
 //Include general config file
diff --git a/server/init.php b/server/init.php
index 767224a..e6a90fb 100755
--- a/server/init.php
+++ b/server/init.php
@@ -1,14 +1,17 @@
 <?php
 /**
-* File containing the initialisation of the API.
-*
-* @version 1.0 Initialisation of this file
-* @since 1.0 Core application's file
-* 
-* @author Eole 'eoledev at outlook . fr'
-* 
-*/
+ * File containing the initialisation of the API.
+ *
+ * @version 1.0 Initialisation of this file
+ * @since 1.0 Core application's file
+ * 
+ * @author Eole 'eoledev at outlook . fr'
+ * 
+ */
 
+/*
+* Include Main Api Class
+*/ 
 include_once("core/App.php");
 
 $user = "";
-- 
cgit v1.2.3


From c9202d9113210981ae47df40511645da2ee140df Mon Sep 17 00:00:00 2001
From: root <root@serverpc.home>
Date: Wed, 27 Apr 2016 15:51:38 +0200
Subject: Error correction

---
 server/core/Automating.php                  | 1 +
 server/core/Compute.php                     | 1 +
 server/core/Identity.php                    | 1 +
 server/core/LibOverride/genTokenOptions.php | 6 +++++-
 server/core/Network.php                     | 2 ++
 5 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'server/core/Network.php')

diff --git a/server/core/Automating.php b/server/core/Automating.php
index 697b666..27dd018 100755
--- a/server/core/Automating.php
+++ b/server/core/Automating.php
@@ -13,6 +13,7 @@ include("Image.php");
 include("Network.php");
 include("Compute.php");
 include("NetworkLayer3.php");
+include("CoreInterface.php");
 
 /**
 * automating Class of the back-end application
diff --git a/server/core/Compute.php b/server/core/Compute.php
index 7e27d00..1db21bf 100755
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -11,6 +11,7 @@
 
 use OpenCloud\Common\Error;
 
+include("CoreInterface.php");
 /**
 * Compute Class of the back-end application
 *
diff --git a/server/core/Identity.php b/server/core/Identity.php
index a30dad2..112c9e3 100755
--- a/server/core/Identity.php
+++ b/server/core/Identity.php
@@ -9,6 +9,7 @@
 */
 use OpenCloud\Common\Error;
 
+include("CoreInterface.php");
 /**
 * Identity Class of the back-end application
 *
diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php
index f0b3b88..7134887 100755
--- a/server/core/LibOverride/genTokenOptions.php
+++ b/server/core/LibOverride/genTokenOptions.php
@@ -385,7 +385,9 @@ class genTokenOptions
 	*/
 	private function saveBackup($name, $data){
 		$token = $this->serializeToken($data["token"]);
-		file_put_contents("core/LibOverride/projectTokenData/".$token['saved']["project"]["name"], serialize($token['saved']));
+		$ret = file_put_contents("core/LibOverride/projectTokenData/".$token['saved']["project"]["name"], serialize($token['saved']));
+		if($ret === FALSE)
+			die("Internal Server Error : File Rights");
 		$this->backup['time'] = $token['time'];
 		$this->backup["roles"] = $token["roles"];
 		$this->backup["project"] = $token['saved']["project"]["name"];
@@ -504,6 +506,8 @@ class genTokenOptions
 	*/
 	private function unserializeToken($tokenSerialized){
 		$Saved = file_get_contents("core/LibOverride/projectTokenData/".$this->backup["project"]);
+		if($Saved === FALSE)
+			die("Internal Server Error : File Access");
 		$Saved = unserialize($Saved);
 
 		$api = new Api();
diff --git a/server/core/Network.php b/server/core/Network.php
index ee66eaa..b244e4e 100755
--- a/server/core/Network.php
+++ b/server/core/Network.php
@@ -13,6 +13,8 @@ use OpenCloud\Common\Error\BaseError;
 use OpenCloud\Common\Error\NotImplementedError;
 use OpenCloud\Common\Error\UserInputError;
 
+include("CoreInterface.php");
+
 /**
 * Network Class of the back-end application
 *
-- 
cgit v1.2.3