From c511010ec41e57d99d1756780ee968269fa2b8fb Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Wed, 24 Feb 2016 14:39:47 +0100
Subject: Manager session cookie OK !

---
 client/js/controllers/home/main.js |  1 -
 client/js/controllers/login.js     |  1 -
 client/js/services/Compute.js      |  4 ++--
 client/js/services/Identity.js     | 34 +++++++++++++++++++++++++++-------
 4 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js
index d25bfad..27de5f3 100644
--- a/client/js/controllers/home/main.js
+++ b/client/js/controllers/home/main.js
@@ -6,7 +6,6 @@
 mainApp.controller('homeCtrl', [ '$scope', 'Compute', function ($scope, Compute)
 {
 
-
 	var updatePage=function(){
 		// TODO Update graph etc...
 	}
diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js
index 829fc1d..a37591c 100644
--- a/client/js/controllers/login.js
+++ b/client/js/controllers/login.js
@@ -20,7 +20,6 @@ mainApp.controller('loginCtrl', ['$scope','$sce','Identity', function ($scope,$s
     $('#loadingLoginButton').hide();
     $('#failedToLoginAlert').hide();
 
-     
     $scope.loginAction=function(){
 		
 		// Begin login state for template
diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js
index c5c8da9..70359ee 100644
--- a/client/js/services/Compute.js
+++ b/client/js/services/Compute.js
@@ -31,8 +31,8 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 		
 	// Return services objects
 	return {
-		getMachines: getMachines
-		pullData: pullData
+		getMachines: getMachines,
+		pullData: pullData,
 		data:data
 	};
 
diff --git a/client/js/services/Identity.js b/client/js/services/Identity.js
index 8ee664c..0dfba47 100644
--- a/client/js/services/Identity.js
+++ b/client/js/services/Identity.js
@@ -7,14 +7,17 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
     var profile={};
     profile.username=null;
     profile.projectname=null;
-	profile.token=null;
-
+	var token={};
+	token.part_0=null;
+	token.part_1=null;
 
 	/**
 	 * Save profile in cookies 
 	 */
 	var saveCookieForSession=function(){
-		$cookies.putObject('profile', 5);
+		$cookies.putObject('profile', profile);
+		$cookies.putObject('token.part_0', token.part_0);
+		$cookies.putObject('token.part_1', token.part_1);
 	};
 
 
@@ -23,10 +26,17 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 	 */
 	var isAlreadyLogin=function(){
 		var profileInCookie=$cookies.getObject('profile');
-		console.log(profileInCookie);
+		var tokenPart_0InCookie=$cookies.getObject('token.part_0');
+		var tokenPart_1InCookie=$cookies.getObject('token.part_0');
+
 		
-		if(typeof profileInCookie !== 'undefined'){
+		if(typeof profileInCookie !== 'undefined'
+		   && typeof tokenPart_0InCookie !== 'undefined'
+		   && typeof tokenPart_1InCookie !== 'undefined'
+		  ){
 			angular.extend(profile, profileInCookie);
+			token.part_0=tokenPart_0InCookie;
+			token.part_1=tokenPart_1InCookie;
 			return true;
 		}
 
@@ -38,6 +48,8 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 	 */
 	var logout=function(){
 		$cookies.remove('profile');
+		$cookies.remove('token.part_0');
+		$cookies.remove('token.part_1');
 	}
 
 	
@@ -56,7 +68,11 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 
 		if (typeof response.data.token !== 'undefined') {
 			requestParserResult.status=0;
-			profile.token=response.data.token;
+
+			var middle=parseInt(response.data.token.length/2);
+			token.part_0=response.data.token.substring(0, middle);
+			token.part_1=response.data.token.substring(middle, response.data.token.length);
+			
 			saveCookieForSession();
 		}
 		else if(failedToSendRequest){
@@ -70,6 +86,9 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 	};
 
 
+	var getToken=function(){
+		return token.part_0+token.part_1;
+	}
 	
 	/**
 	 * Function to connect to OpenStack
@@ -104,7 +123,8 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 		login: login,
 		profile: profile,
 		isAlreadyLogin: isAlreadyLogin,
-		logout:logout
+		logout:logout,
+		getToken:getToken
 	};
 
 	
-- 
cgit v1.2.3


From 211ebb0e432b5fee2031dd6e7338e659146867bb Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Wed, 24 Feb 2016 15:02:14 +0100
Subject: Simplify Identity

---
 client/js/controllers/login.js  |  7 ++++++-
 client/js/controllers/status.js |  2 +-
 client/js/services/Identity.js  | 46 +++++++++++++++++++++++++++--------------
 3 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js
index a37591c..66d1793 100644
--- a/client/js/controllers/login.js
+++ b/client/js/controllers/login.js
@@ -13,13 +13,18 @@ mainApp.controller('loginCtrl', ['$scope','$sce','Identity', function ($scope,$s
 	if(!Identity.isAlreadyLogin()){
 		$('#loginModal').modal({backdrop: 'static', keyboard: false});
 	}
+
+	// Manager logout event
 	$scope.$on('logoutEvent', function(){
 		$('#loginModal').modal({backdrop: 'static', keyboard: false});
 	});
-	
+
+	// Hide loading button and message alert
     $('#loadingLoginButton').hide();
     $('#failedToLoginAlert').hide();
 
+	
+	// Defined function for login
     $scope.loginAction=function(){
 		
 		// Begin login state for template
diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js
index e01df34..5ec6fa8 100644
--- a/client/js/controllers/status.js
+++ b/client/js/controllers/status.js
@@ -10,7 +10,7 @@ mainApp.controller('statusCtrl', ['$scope','Identity', '$rootScope', function ($
 {
 
 	// Give profile to model
-    $scope.profile=Identity.profile;
+    $scope.profile=Identity.getProfile();
 
     // Function to logout
     $scope.logout=function(){
diff --git a/client/js/services/Identity.js b/client/js/services/Identity.js
index 0dfba47..2042efd 100644
--- a/client/js/services/Identity.js
+++ b/client/js/services/Identity.js
@@ -7,10 +7,9 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
     var profile={};
     profile.username=null;
     profile.projectname=null;
-	var token={};
-	token.part_0=null;
-	token.part_1=null;
+	var token=null;
 
+	
 	/**
 	 * Save profile in cookies 
 	 */
@@ -27,7 +26,7 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 	var isAlreadyLogin=function(){
 		var profileInCookie=$cookies.getObject('profile');
 		var tokenPart_0InCookie=$cookies.getObject('token.part_0');
-		var tokenPart_1InCookie=$cookies.getObject('token.part_0');
+		var tokenPart_1InCookie=$cookies.getObject('token.part_1');
 
 		
 		if(typeof profileInCookie !== 'undefined'
@@ -35,14 +34,29 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 		   && typeof tokenPart_1InCookie !== 'undefined'
 		  ){
 			angular.extend(profile, profileInCookie);
-			token.part_0=tokenPart_0InCookie;
-			token.part_1=tokenPart_1InCookie;
+			token=tokenPart_0InCookie+tokenPart_1InCookie;
+			
 			return true;
 		}
 
 		return false;
 	}
 
+
+	/*
+     * Get the profile
+	 */
+	var getProfile=function(){
+		return profile;
+	}
+
+	/*
+     * Get the token
+	 */	
+	var getToken=function(){
+		return token;
+	}
+	
 	/*
 	 * Destroy profile cookies
 	 */
@@ -67,13 +81,18 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 		requestParserResult.failReason=null;
 
 		if (typeof response.data.token !== 'undefined') {
+			// Set status code
 			requestParserResult.status=0;
 
+			// Find the middle of the token to split it
 			var middle=parseInt(response.data.token.length/2);
-			token.part_0=response.data.token.substring(0, middle);
-			token.part_1=response.data.token.substring(middle, response.data.token.length);
-			
-			saveCookieForSession();
+
+			// Save profile
+			$cookies.putObject('profile', profile);
+			// Save first part of token
+			$cookies.putObject('token.part_0', response.data.token.substring(0, middle));
+			// Save second part of token
+			$cookies.putObject('token.part_1', response.data.token.substring(middle, response.data.token.length));
 		}
 		else if(failedToSendRequest){
 			requestParserResult.failReason="Failed to send request";
@@ -84,11 +103,6 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 		
 		return requestParserResult;
 	};
-
-
-	var getToken=function(){
-		return token.part_0+token.part_1;
-	}
 	
 	/**
 	 * Function to connect to OpenStack
@@ -121,7 +135,7 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 	// Return services objects
 	return {
 		login: login,
-		profile: profile,
+		getProfile: getProfile,
 		isAlreadyLogin: isAlreadyLogin,
 		logout:logout,
 		getToken:getToken
-- 
cgit v1.2.3


From 5d8b904a328c87c533231ebf6ba68965256a035f Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Wed, 24 Feb 2016 15:22:10 +0100
Subject: Change logout event

---
 client/js/controllers/login.js  | 1 +
 client/js/controllers/status.js | 4 +---
 client/partials/nav.html        | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js
index 66d1793..1a89563 100644
--- a/client/js/controllers/login.js
+++ b/client/js/controllers/login.js
@@ -16,6 +16,7 @@ mainApp.controller('loginCtrl', ['$scope','$sce','Identity', function ($scope,$s
 
 	// Manager logout event
 	$scope.$on('logoutEvent', function(){
+		Identity.logout();
 		$('#loginModal').modal({backdrop: 'static', keyboard: false});
 	});
 
diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js
index 5ec6fa8..940d794 100644
--- a/client/js/controllers/status.js
+++ b/client/js/controllers/status.js
@@ -13,10 +13,8 @@ mainApp.controller('statusCtrl', ['$scope','Identity', '$rootScope', function ($
     $scope.profile=Identity.getProfile();
 
     // Function to logout
-    $scope.logout=function(){
-		Identity.logout();
+    $scope.raiseLogoutEvent=function(){
 		$rootScope.$broadcast('logoutEvent');
-
 	};
 
 }]);
diff --git a/client/partials/nav.html b/client/partials/nav.html
index 3c72844..b3ef76a 100644
--- a/client/partials/nav.html
+++ b/client/partials/nav.html
@@ -32,7 +32,7 @@
             <li><a href="#">Informations</a></li>
             <li><a href="#">Settings</a></li>
             <li role="separator" class="divider"></li>
-            <li><a href="#" ng-click="logout()">Logout</a></li>
+            <li><a href="#" ng-click="raiseLogoutEvent()">Logout</a></li>
           </ul>
         </li>
       </ul>
-- 
cgit v1.2.3


From fa77d200c525d0c53118d5d4d60758880e9ca11c Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Wed, 24 Feb 2016 16:16:19 +0100
Subject: Add expire time and remove useless function

---
 client/js/services/Identity.js | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/client/js/services/Identity.js b/client/js/services/Identity.js
index 2042efd..7604230 100644
--- a/client/js/services/Identity.js
+++ b/client/js/services/Identity.js
@@ -9,17 +9,6 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
     profile.projectname=null;
 	var token=null;
 
-	
-	/**
-	 * Save profile in cookies 
-	 */
-	var saveCookieForSession=function(){
-		$cookies.putObject('profile', profile);
-		$cookies.putObject('token.part_0', token.part_0);
-		$cookies.putObject('token.part_1', token.part_1);
-	};
-
-
 	/* 
 	 * @returns {boolean} Return true if a cookie is found (and load it in profile) false else 
 	 */
@@ -87,12 +76,16 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 			// Find the middle of the token to split it
 			var middle=parseInt(response.data.token.length/2);
 
+			// Create expire date (cookie expire in 55 mins)
+			var expireDate=new Date();
+			expireDate.setMinutes(expireDate.getMinutes()+55);
+			
 			// Save profile
-			$cookies.putObject('profile', profile);
+			$cookies.putObject('profile', profile, {'expires': expireDate});
 			// Save first part of token
-			$cookies.putObject('token.part_0', response.data.token.substring(0, middle));
+			$cookies.putObject('token.part_0', response.data.token.substring(0, middle), {'expires': expireDate});
 			// Save second part of token
-			$cookies.putObject('token.part_1', response.data.token.substring(middle, response.data.token.length));
+			$cookies.putObject('token.part_1', response.data.token.substring(middle, response.data.token.length), {'expires': expireDate});
 		}
 		else if(failedToSendRequest){
 			requestParserResult.failReason="Failed to send request";
-- 
cgit v1.2.3


From 82cae7df993533cd56291e37f569eac64a412892 Mon Sep 17 00:00:00 2001
From: EoleDev <EoleDev@outlook.fr>
Date: Wed, 24 Feb 2016 23:06:02 +0100
Subject: Add Network class Generation in App

---
 server/Test/AppTestClass.php | 29 ++++++++++++++++++++++++-----
 server/core/App.php          |  5 +++++
 2 files changed, 29 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 server/core/App.php

diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php
index 311b9bf..2babed4 100755
--- a/server/Test/AppTestClass.php
+++ b/server/Test/AppTestClass.php
@@ -6,6 +6,7 @@ class AppTest{
 	
 	protected $openstack;
 	protected $pluginsApi;
+	protected $postParams;
 	protected $tokenClass;
 	protected $tokenPost;
 	protected $output;
@@ -15,8 +16,10 @@ class AppTest{
 		$this->tokenPost = NULL;
 		$this->tokenClass = new genTokenOptions($args);
 		$this->openstack = new OpenStack\OpenStack([]);
-		$this->pluginsApi = plugin_api::getInstance();
+		$this->pluginsApi = plugin_api::getInstance();
+		$this->errorClass = new errorManagement($this);
 		$this->output = array();
+		$this->postParams = $_POST;
 
 	}
 	
@@ -40,6 +43,11 @@ class AppTest{
 				$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;
 		}
 		
 	}
@@ -53,10 +61,21 @@ class AppTest{
 			$this->tokenClass->genNetworkToken();
 			
 			$this->setOutput("token", $this->tokenClass->getBackup());
-		}catch(Exception $e){
-			echo $e;
-			exit();
-		}
+		}catch(BadResponseError $e){
+			$this->errorClass->BadResponseHandler($e);
+        }catch(UserInputError $e){
+			$this->errorClass->UserInputHandler($e);
+        }catch(BaseError $e){
+			$this->errorClass->BaseErrorHandler($e);
+        }catch(NotImplementedError $e){
+			$this->errorClass->NotImplementedHandler($e);
+        }
+		
+	}
+	
+	public function getPostParam($name){
+		
+		return $this->postParams[$name];
 		
 	}
 	
diff --git a/server/core/App.php b/server/core/App.php
old mode 100644
new mode 100755
index babb3d9..5495a1f
--- a/server/core/App.php
+++ b/server/core/App.php
@@ -50,6 +50,11 @@ class App{
 				$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;
 		}
 		
 	}
-- 
cgit v1.2.3


From e53410a587e8d67a4e5ee8108955e736109f6dd2 Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Sun, 28 Feb 2016 10:18:34 +0100
Subject: added compute to index

---
 server/index.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/server/index.php b/server/index.php
index 166e82e..41b4e73 100644
--- a/server/index.php
+++ b/server/index.php
@@ -34,5 +34,12 @@
 			$imageObject->action($action);
 			$App->show();
 			break;
+
+		case "compute":
+			include_once("core/Compute.php");
+			$computeObject = new compute($App);
+			$computeObject->action($action);
+			$App->show();
+			break;
 	}
 	
-- 
cgit v1.2.3


From 59041ccb45d7cba18a66d0623d9b5875e6ac32b6 Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Sun, 28 Feb 2016 10:23:17 +0100
Subject: added Compute case for libclass generation

---
 server/Test/AppTestClass.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php
index 2babed4..68d0cfc 100755
--- a/server/Test/AppTestClass.php
+++ b/server/Test/AppTestClass.php
@@ -43,6 +43,11 @@ class AppTest{
 				$opt = $this->tokenClass->getOptions($service);
 				return $this->openstack->imagesV2($opt);
 				break;
+			case "Compute":
+				if($this->tokenPost == NULL) $this->tokenClass->genComputeToken();
+				$opt = $this->tokenClass->getOptions($service);
+				return $this->openstack->computeV2($opt);
+				break;
 			case "Network":
 				if($this->tokenPost == NULL) $this->tokenClass->genNetworkToken();
 				$opt = $this->tokenClass->getOptions($service);
@@ -89,4 +94,4 @@ class AppTest{
 		echo json_encode($this->output);
 	}
 	
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From 07aea6ce3991db4a87d16663412aecde199adbc0 Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Sun, 28 Feb 2016 10:35:07 +0100
Subject: added computeTest to Test

---
 server/Test/computeTest.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 server/Test/computeTest.php

diff --git a/server/Test/computeTest.php b/server/Test/computeTest.php
new file mode 100644
index 0000000..3fae820
--- /dev/null
+++ b/server/Test/computeTest.php
@@ -0,0 +1,21 @@
+re '../vendor/autoload.php';
+include('/istic-openstack/server/init.php');
+include_once("../core/Compute.php");
+$compute = new compute($App);
+
+$servers = $compute->listServers();
+
+$servers= $compute->listServers(true);
+foreach($servers as $server){
+        //print_r($server);
+        echo $server->name." ".$server->id."<br>";
+
+//$opt = Array();
+//$opt['name'] = "Test";
+//$serverid"id"[] = "69d5bcc4-2fab-4634-b0d2-f455fee5b7bd";
+//$serverid = Array("id"=>"69d5bcc4-2fab-4634-b0d2-f455fee5b7bd");
+//$serverid["id"] = "{69d5bcc4-2fab-4634-b0d2-f455fee5b7bd}";
+//unset($server);
+//$server = $compute->getServer($serverid);
+//echo $server->name." ".$server->image;
+//$server->update(array('name' => 'test'));
-- 
cgit v1.2.3


From 869538121bdc07adba1637252bf1d7338f1a27de Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Sun, 28 Feb 2016 10:48:28 +0100
Subject: updated Compute.php

---
 server/core/Compute.php | 146 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 146 insertions(+)

diff --git a/server/core/Compute.php b/server/core/Compute.php
index 8d1c8b6..3df3ada 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -1 +1,147 @@
+<?php
+//namespace istic-openstack\Server\core;
+// TODO introduce error-handling based on errors specific to the compute module
+use OpenStack\Common\Error;
+
+class compute 
+{
+        /** @var App $app protected, contains the main app object */
+        protected $app;
+
+        /** @var OpenStack\Identity $libClass protected, contains the library Compute object */
+        protected $libClass;
+
+
+    public function __construct($app)
+    {
+                $this->app = $app;
+                $this->libClass = $app->getLibClass("Compute");
+    }
+    /**
+     * List servers.
+     * @return array
+     */
+        public function listServers()
+        {
+                $servers = $this->libClass->listServers();
+                return $servers;
+        }
+        /**
+         * List flavors.
+         * @return array
+         */
+        public function listFlavors()
+        {
+                $flavors = $this->libClass->listFlavors();
+                return $flavors;
+        }
+        /**
+         * List images.
+         * @return array
+         */
+        public function listImages()
+        {
+                $images = $this->libClass->listImages();
+                return $images;
+        }
+        /**
+         * Create server.
+         * @return array
+         
+        public function createServer(array $options)
+        {
+
+                $server = $this->libClass->createServer();
+        }
+        /**
+         * Get server details.
+         * @return array
+         */
+        public function getServer(array $options = [])
+        {
+                $server = $this->libClass->getServer($options);
+                return $server;
+        }
+        /**
+         * Get flavor details.
+         * @return array
+         */
+        public function getFlavor(array $options = [])
+        {
+                $flavor = $this->libClass->getFlavor($options);
+                return $flavor;
+        }
+        /**
+         * Get image details.
+         * @return array
+         */
+        public function getImage(array $options = [])
+        {
+                $image = $this->libClass->getImage($options);
+                return $image;
+        }
+        //working on tests
+        public function update()
+        {
+                $image = $this->app->getServer(array $options = []);
+
+        }
+        public function delete()
+        {
+                //TODO
+        }
+        public function changePassword($newPassword)
+        {
+                //TODO
+        }
+        public function reboot($type = Enum::REBOOT_SOFT)
+        {
+                //TODO
+        }
+        public function rebuild(array $options)
+        {
+                //TODO
+        }
+        public function resize($flavorId)
+        {
+                //TODO
+        }
+        public function confirmResize()
+        {
+                //TODO
+        }
+        public function revertResize()
+        {
+                //TODO
+        }
+        public function createImage(array $options)
+        {
+                //TODO
+        }
+        public function listAddresses(array $options = [])
+        {
+                //TODO
+        }
+        public function getMetadata()
+        {
+                //TODO
+        }
+        public function resetMetadata(array $metadata)
+        {
+                //TODO
+        }
+        public function mergeMetadata(array $metadata)
+        {
+                //TODO
+        }
+        public function getMetadataItem($key)
+        {
+                //TODO
+        }
+        public function deleteMetadataItem($key)
+        {
+                //TODO
+        }
+
+}
  
-- 
cgit v1.2.3


From c6abd77fc241894a4052d4212c25b0e2291683a1 Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Sun, 28 Feb 2016 10:56:56 +0100
Subject: syntax correction

---
 server/core/Compute.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/core/Compute.php b/server/core/Compute.php
index 3df3ada..e95380e 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -47,7 +47,7 @@ class compute
         /**
          * Create server.
          * @return array
-         
+         */ 
         public function createServer(array $options)
         {
 
-- 
cgit v1.2.3


From ca0c2377788d65b043ea5ccc2a5d52b40726e06b Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Sun, 28 Feb 2016 11:13:22 +0100
Subject: test

---
 server/Test/computeTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/Test/computeTest.php b/server/Test/computeTest.php
index 3fae820..3ce1f2e 100644
--- a/server/Test/computeTest.php
+++ b/server/Test/computeTest.php
@@ -12,7 +12,6 @@ foreach($servers as $server){
 
 //$opt = Array();
 //$opt['name'] = "Test";
-//$serverid"id"[] = "69d5bcc4-2fab-4634-b0d2-f455fee5b7bd";
 //$serverid = Array("id"=>"69d5bcc4-2fab-4634-b0d2-f455fee5b7bd");
 //$serverid["id"] = "{69d5bcc4-2fab-4634-b0d2-f455fee5b7bd}";
 //unset($server);
-- 
cgit v1.2.3


From 1f397cf0c6a4f177c9f66e4a0f4d2274f26ae5be Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sun, 28 Feb 2016 16:07:52 +0100
Subject: Begin machine details overlay

---
 client/index.html                            |  5 ++++
 client/js/controllers/home/machineDetails.js | 21 +++++++++++++++
 client/js/controllers/home/main.js           |  7 ++++-
 client/partials/home/machineDetails.html     | 38 ++++++++++++++++++++++++++++
 client/partials/home/main.html               |  5 ++--
 5 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 client/js/controllers/home/machineDetails.js
 create mode 100644 client/partials/home/machineDetails.html

diff --git a/client/index.html b/client/index.html
index ba183df..8d81ac3 100644
--- a/client/index.html
+++ b/client/index.html
@@ -26,6 +26,9 @@
                 <div class="col-lg-12">
                     <!-- Login Overlay -->
                     <div ng-include="'./partials/login.html'"></div>
+					<!-- Machine Details Overlay -->
+                    <div ng-include="'./partials/home/machineDetails.html'"></div>
+
                     <!-- Nav -->
                     <div ng-include="'./partials/nav.html'"></div>
                 </div>
@@ -81,7 +84,9 @@
     <script src="./js/controllers/login.js"></script>
     <script src="./js/controllers/status.js"></script>
     <script src="./js/controllers/home/main.js"></script>
+    <script src="./js/controllers/home/machineDetails.js"></script>	
     <script src="./js/controllers/network/main.js"></script>
+
     
     
 
diff --git a/client/js/controllers/home/machineDetails.js b/client/js/controllers/home/machineDetails.js
new file mode 100644
index 0000000..43cfe07
--- /dev/null
+++ b/client/js/controllers/home/machineDetails.js
@@ -0,0 +1,21 @@
+/**
+ * The home controller
+ * 
+ * @param {$scope} $scope The $scope service from angular
+ */
+mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', function ($scope, Compute, $rootScope)
+{
+
+
+
+
+	$scope.$on('showMachineDetailsEvent', function(eventName ,machine){
+		$scope.machine=machine;
+		$('#machineDetailsModal').modal({backdrop: false, keyboard: true});
+	});
+
+
+	
+
+	
+}]);
diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js
index 27de5f3..3d57f8d 100644
--- a/client/js/controllers/home/main.js
+++ b/client/js/controllers/home/main.js
@@ -3,7 +3,7 @@
  * 
  * @param {$scope} $scope The $scope service from angular
  */
-mainApp.controller('homeCtrl', [ '$scope', 'Compute', function ($scope, Compute)
+mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', function ($scope, Compute, $rootScope)
 {
 
 	var updatePage=function(){
@@ -12,5 +12,10 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', function ($scope, Compute)
 
 	// Retrieve all Data
 	Compute.pullData(updatePage);
+
+	$scope.raiseShowMachineDetailsEvent=function(){
+		var machine={name: "Machine 1"};
+		$rootScope.$broadcast("showMachineDetailsEvent", machine);		
+	}
     
 }]);
diff --git a/client/partials/home/machineDetails.html b/client/partials/home/machineDetails.html
new file mode 100644
index 0000000..9da131e
--- /dev/null
+++ b/client/partials/home/machineDetails.html
@@ -0,0 +1,38 @@
+<div class="modal" id="machineDetailsModal" ng-controller="machineDetailsCtrl" >
+    <div class="modal-dialog">
+        <div class="modal-content"></div>
+    </div>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <!--<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>-->
+                <h4 class="modal-title">Machine</h4>
+
+            </div>
+            <div class="modal-body">
+
+				<form class="form-horizontal" role="form">
+					<div class="form-group">
+						<label class="control-label col-sm-2" for="email">Name</label>
+						<div class="col-sm-10">
+							      <p class="form-control-static">{{ machine.name  }}</p>
+						</div>
+					</div>
+					<div class="form-group">
+						<label class="control-label col-sm-2" for="pwd">State</label>
+						<div class="col-sm-10">
+							Offline &nbsp;
+							<button class="btn btn-success">Turn On</button>		  
+						</div>
+					</div>
+				</form>
+
+
+			</div>
+            <div class="modal-footer"> 
+                <a href="#" data-dismiss="modal" class="btn btn-primary">Apply</a>
+                <a href="#" data-dismiss="modal" class="btn btn-default">Cancel</a>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/client/partials/home/main.html b/client/partials/home/main.html
index 7a5045a..e3611e5 100644
--- a/client/partials/home/main.html
+++ b/client/partials/home/main.html
@@ -1,8 +1,9 @@
- <div class="panel panel-default">
+ <div class="panel panel-default" ng-controller="homeCtrl">
     <div class="panel-heading">
         Home 
     </div>
     <div class="panel-body">
         Main Content
+		<button ng-click="raiseShowMachineDetailsEvent()" > Show Machine details</button>
     </div>
-</div>
\ No newline at end of file
+</div>
-- 
cgit v1.2.3


From 04b66da25740e569f9d66e21077a1e998b9f9d0f Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sun, 28 Feb 2016 17:29:34 +0100
Subject: Edit machine details

---
 client/js/controllers/home/machineDetails.js | 24 +++++++++++++++---
 client/js/controllers/home/main.js           |  2 +-
 client/partials/home/machineDetails.html     | 38 +++++++++++++++++++++++++++-
 3 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/client/js/controllers/home/machineDetails.js b/client/js/controllers/home/machineDetails.js
index 43cfe07..3ee4625 100644
--- a/client/js/controllers/home/machineDetails.js
+++ b/client/js/controllers/home/machineDetails.js
@@ -3,11 +3,11 @@
  * 
  * @param {$scope} $scope The $scope service from angular
  */
-mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', function ($scope, Compute, $rootScope)
+mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$timeout', function ($scope, Compute, $rootScope, $timeout)
 {
 
-
-
+	$scope.machine={};
+	$("#waitingForToggleMachine").hide();
 
 	$scope.$on('showMachineDetailsEvent', function(eventName ,machine){
 		$scope.machine=machine;
@@ -15,6 +15,24 @@ mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', fu
 	});
 
 
+	$scope.toggleMachineState=function(){
+		$("#waitingForToggleMachine").show();
+
+		// Fake timeout
+		$timeout(function(){
+		$("#waitingForToggleMachine").hide();	
+		}, 1000);
+		$timeout(function(){
+		$scope.machine.online=!$scope.machine.online;
+
+		}, 1000);
+
+		
+	};
+
+	$scope.applyModifications=function(){
+		//Todo
+	}
 	
 
 	
diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js
index 3d57f8d..6545c1a 100644
--- a/client/js/controllers/home/main.js
+++ b/client/js/controllers/home/main.js
@@ -14,7 +14,7 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', function ($s
 	Compute.pullData(updatePage);
 
 	$scope.raiseShowMachineDetailsEvent=function(){
-		var machine={name: "Machine 1"};
+		var machine={name: "Machine 1", online:true};
 		$rootScope.$broadcast("showMachineDetailsEvent", machine);		
 	}
     
diff --git a/client/partials/home/machineDetails.html b/client/partials/home/machineDetails.html
index 9da131e..5e33a53 100644
--- a/client/partials/home/machineDetails.html
+++ b/client/partials/home/machineDetails.html
@@ -22,9 +22,45 @@
 						<label class="control-label col-sm-2" for="pwd">State</label>
 						<div class="col-sm-10">
 							Offline &nbsp;
-							<button class="btn btn-success">Turn On</button>		  
+
+							<button class="btn btn-danger" ng-if="machine.online" ng-click="toggleMachineState()">Turn Off</button>		 
+							<button class="btn btn-success" ng-if="!machine.online" ng-click="toggleMachineState()">Turn On</button>		 
+							&nbsp;<span class="glyphicon glyphicon-refresh" aria-hidden="true" id="waitingForToggleMachine"></span>
+
+							
 						</div>
 					</div>
+					<fieldset class="form-group">
+						<label class="control-label col-sm-2">RAM</label>
+						<select class="col-sm-20" id="ramSelected">
+							<option>128 MB</option>
+							<option>512 MB</option>
+							<option>1024 MB</option>
+							<option>2048 MB</option>
+							<option>4096 MB</option>
+						</select>
+					</fieldset>
+
+					<fieldset class="form-group">
+						<label class="control-label col-sm-2">Disk</label>
+						<select class="col-sm-20" id="ramSelected">
+							<option>1 Go</option>
+							<option>2 Go</option>
+							<option>5 Go</option>
+							<option>10 Go</option>
+							<option>25 Go</option>
+							<option>50 Go</option>
+							<option>100 Go</option>
+							<option>150 Go</option>
+							<option>200 Go</option>
+						</select>
+					</fieldset>
+
+
+
+
+
+
 				</form>
 
 
-- 
cgit v1.2.3


From 27a39a9448eac036d3af994b36d77093a2304e00 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sun, 28 Feb 2016 17:32:32 +0100
Subject: Edit machine details

---
 client/partials/home/machineDetails.html | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/client/partials/home/machineDetails.html b/client/partials/home/machineDetails.html
index 5e33a53..2a79f52 100644
--- a/client/partials/home/machineDetails.html
+++ b/client/partials/home/machineDetails.html
@@ -56,6 +56,15 @@
 						</select>
 					</fieldset>
 
+					<fieldset class="form-group">
+						<label class="control-label col-sm-2">Image</label>
+						<select class="col-sm-20" id="ramSelected">
+							<option>Cirros</option>
+							<option>Debian</option>
+							<option>Tiny Core</option>
+							<option>Centos</option>
+						</select>
+					</fieldset>
 
 
 
-- 
cgit v1.2.3


From 81c4c30c69f63a8605d5e7d2d317aa85fd7fdb05 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sun, 28 Feb 2016 17:54:15 +0100
Subject: Add spin icon

---
 client/images/spin/128x128/Preloader_1.gif   | Bin 0 -> 71831 bytes
 client/images/spin/128x128/Preloader_10.gif  | Bin 0 -> 19793 bytes
 client/images/spin/128x128/Preloader_2.gif   | Bin 0 -> 7879 bytes
 client/images/spin/128x128/Preloader_3.gif   | Bin 0 -> 22053 bytes
 client/images/spin/128x128/Preloader_4.gif   | Bin 0 -> 19963 bytes
 client/images/spin/128x128/Preloader_5.gif   | Bin 0 -> 84698 bytes
 client/images/spin/128x128/Preloader_6.gif   | Bin 0 -> 19299 bytes
 client/images/spin/128x128/Preloader_7.gif   | Bin 0 -> 12651 bytes
 client/images/spin/128x128/Preloader_8.gif   | Bin 0 -> 81985 bytes
 client/images/spin/128x128/Preloader_9.gif   | Bin 0 -> 48009 bytes
 client/images/spin/32x32/Preloader_1.gif     | Bin 0 -> 17796 bytes
 client/images/spin/32x32/Preloader_10.gif    | Bin 0 -> 5943 bytes
 client/images/spin/32x32/Preloader_2.gif     | Bin 0 -> 3551 bytes
 client/images/spin/32x32/Preloader_3.gif     | Bin 0 -> 7980 bytes
 client/images/spin/32x32/Preloader_4.gif     | Bin 0 -> 6852 bytes
 client/images/spin/32x32/Preloader_5.gif     | Bin 0 -> 22755 bytes
 client/images/spin/32x32/Preloader_6.gif     | Bin 0 -> 5965 bytes
 client/images/spin/32x32/Preloader_7.gif     | Bin 0 -> 4217 bytes
 client/images/spin/32x32/Preloader_8.gif     | Bin 0 -> 13706 bytes
 client/images/spin/32x32/Preloader_9.gif     | Bin 0 -> 13661 bytes
 client/images/spin/64x64/Preloader_1.gif     | Bin 0 -> 35166 bytes
 client/images/spin/64x64/Preloader_10.gif    | Bin 0 -> 10015 bytes
 client/images/spin/64x64/Preloader_2.gif     | Bin 0 -> 4799 bytes
 client/images/spin/64x64/Preloader_3.gif     | Bin 0 -> 12080 bytes
 client/images/spin/64x64/Preloader_4.gif     | Bin 0 -> 10456 bytes
 client/images/spin/64x64/Preloader_5.gif     | Bin 0 -> 41405 bytes
 client/images/spin/64x64/Preloader_6.gif     | Bin 0 -> 9959 bytes
 client/images/spin/64x64/Preloader_7.gif     | Bin 0 -> 6225 bytes
 client/images/spin/64x64/Preloader_8.gif     | Bin 0 -> 25056 bytes
 client/images/spin/64x64/Preloader_9.gif     | Bin 0 -> 23767 bytes
 client/js/controllers/home/machineDetails.js |   4 ++--
 client/js/controllers/home/main.js           |   3 ++-
 client/partials/home/machineDetails.html     |   2 +-
 client/partials/home/main.html               |   2 ++
 34 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 client/images/spin/128x128/Preloader_1.gif
 create mode 100644 client/images/spin/128x128/Preloader_10.gif
 create mode 100644 client/images/spin/128x128/Preloader_2.gif
 create mode 100644 client/images/spin/128x128/Preloader_3.gif
 create mode 100644 client/images/spin/128x128/Preloader_4.gif
 create mode 100644 client/images/spin/128x128/Preloader_5.gif
 create mode 100644 client/images/spin/128x128/Preloader_6.gif
 create mode 100644 client/images/spin/128x128/Preloader_7.gif
 create mode 100644 client/images/spin/128x128/Preloader_8.gif
 create mode 100644 client/images/spin/128x128/Preloader_9.gif
 create mode 100644 client/images/spin/32x32/Preloader_1.gif
 create mode 100644 client/images/spin/32x32/Preloader_10.gif
 create mode 100644 client/images/spin/32x32/Preloader_2.gif
 create mode 100644 client/images/spin/32x32/Preloader_3.gif
 create mode 100644 client/images/spin/32x32/Preloader_4.gif
 create mode 100644 client/images/spin/32x32/Preloader_5.gif
 create mode 100644 client/images/spin/32x32/Preloader_6.gif
 create mode 100644 client/images/spin/32x32/Preloader_7.gif
 create mode 100644 client/images/spin/32x32/Preloader_8.gif
 create mode 100644 client/images/spin/32x32/Preloader_9.gif
 create mode 100644 client/images/spin/64x64/Preloader_1.gif
 create mode 100644 client/images/spin/64x64/Preloader_10.gif
 create mode 100644 client/images/spin/64x64/Preloader_2.gif
 create mode 100644 client/images/spin/64x64/Preloader_3.gif
 create mode 100644 client/images/spin/64x64/Preloader_4.gif
 create mode 100644 client/images/spin/64x64/Preloader_5.gif
 create mode 100644 client/images/spin/64x64/Preloader_6.gif
 create mode 100644 client/images/spin/64x64/Preloader_7.gif
 create mode 100644 client/images/spin/64x64/Preloader_8.gif
 create mode 100644 client/images/spin/64x64/Preloader_9.gif

diff --git a/client/images/spin/128x128/Preloader_1.gif b/client/images/spin/128x128/Preloader_1.gif
new file mode 100644
index 0000000..dafe17e
Binary files /dev/null and b/client/images/spin/128x128/Preloader_1.gif differ
diff --git a/client/images/spin/128x128/Preloader_10.gif b/client/images/spin/128x128/Preloader_10.gif
new file mode 100644
index 0000000..cdfa680
Binary files /dev/null and b/client/images/spin/128x128/Preloader_10.gif differ
diff --git a/client/images/spin/128x128/Preloader_2.gif b/client/images/spin/128x128/Preloader_2.gif
new file mode 100644
index 0000000..3cb9003
Binary files /dev/null and b/client/images/spin/128x128/Preloader_2.gif differ
diff --git a/client/images/spin/128x128/Preloader_3.gif b/client/images/spin/128x128/Preloader_3.gif
new file mode 100644
index 0000000..7f7d415
Binary files /dev/null and b/client/images/spin/128x128/Preloader_3.gif differ
diff --git a/client/images/spin/128x128/Preloader_4.gif b/client/images/spin/128x128/Preloader_4.gif
new file mode 100644
index 0000000..78baff6
Binary files /dev/null and b/client/images/spin/128x128/Preloader_4.gif differ
diff --git a/client/images/spin/128x128/Preloader_5.gif b/client/images/spin/128x128/Preloader_5.gif
new file mode 100644
index 0000000..c9c1530
Binary files /dev/null and b/client/images/spin/128x128/Preloader_5.gif differ
diff --git a/client/images/spin/128x128/Preloader_6.gif b/client/images/spin/128x128/Preloader_6.gif
new file mode 100644
index 0000000..3203d7f
Binary files /dev/null and b/client/images/spin/128x128/Preloader_6.gif differ
diff --git a/client/images/spin/128x128/Preloader_7.gif b/client/images/spin/128x128/Preloader_7.gif
new file mode 100644
index 0000000..2eb19be
Binary files /dev/null and b/client/images/spin/128x128/Preloader_7.gif differ
diff --git a/client/images/spin/128x128/Preloader_8.gif b/client/images/spin/128x128/Preloader_8.gif
new file mode 100644
index 0000000..3ba8217
Binary files /dev/null and b/client/images/spin/128x128/Preloader_8.gif differ
diff --git a/client/images/spin/128x128/Preloader_9.gif b/client/images/spin/128x128/Preloader_9.gif
new file mode 100644
index 0000000..7018192
Binary files /dev/null and b/client/images/spin/128x128/Preloader_9.gif differ
diff --git a/client/images/spin/32x32/Preloader_1.gif b/client/images/spin/32x32/Preloader_1.gif
new file mode 100644
index 0000000..b810330
Binary files /dev/null and b/client/images/spin/32x32/Preloader_1.gif differ
diff --git a/client/images/spin/32x32/Preloader_10.gif b/client/images/spin/32x32/Preloader_10.gif
new file mode 100644
index 0000000..f9c462f
Binary files /dev/null and b/client/images/spin/32x32/Preloader_10.gif differ
diff --git a/client/images/spin/32x32/Preloader_2.gif b/client/images/spin/32x32/Preloader_2.gif
new file mode 100644
index 0000000..f23998f
Binary files /dev/null and b/client/images/spin/32x32/Preloader_2.gif differ
diff --git a/client/images/spin/32x32/Preloader_3.gif b/client/images/spin/32x32/Preloader_3.gif
new file mode 100644
index 0000000..bb7c60d
Binary files /dev/null and b/client/images/spin/32x32/Preloader_3.gif differ
diff --git a/client/images/spin/32x32/Preloader_4.gif b/client/images/spin/32x32/Preloader_4.gif
new file mode 100644
index 0000000..117c756
Binary files /dev/null and b/client/images/spin/32x32/Preloader_4.gif differ
diff --git a/client/images/spin/32x32/Preloader_5.gif b/client/images/spin/32x32/Preloader_5.gif
new file mode 100644
index 0000000..7169708
Binary files /dev/null and b/client/images/spin/32x32/Preloader_5.gif differ
diff --git a/client/images/spin/32x32/Preloader_6.gif b/client/images/spin/32x32/Preloader_6.gif
new file mode 100644
index 0000000..9087ded
Binary files /dev/null and b/client/images/spin/32x32/Preloader_6.gif differ
diff --git a/client/images/spin/32x32/Preloader_7.gif b/client/images/spin/32x32/Preloader_7.gif
new file mode 100644
index 0000000..0b1e633
Binary files /dev/null and b/client/images/spin/32x32/Preloader_7.gif differ
diff --git a/client/images/spin/32x32/Preloader_8.gif b/client/images/spin/32x32/Preloader_8.gif
new file mode 100644
index 0000000..6816be3
Binary files /dev/null and b/client/images/spin/32x32/Preloader_8.gif differ
diff --git a/client/images/spin/32x32/Preloader_9.gif b/client/images/spin/32x32/Preloader_9.gif
new file mode 100644
index 0000000..e38dd5a
Binary files /dev/null and b/client/images/spin/32x32/Preloader_9.gif differ
diff --git a/client/images/spin/64x64/Preloader_1.gif b/client/images/spin/64x64/Preloader_1.gif
new file mode 100644
index 0000000..2004c5f
Binary files /dev/null and b/client/images/spin/64x64/Preloader_1.gif differ
diff --git a/client/images/spin/64x64/Preloader_10.gif b/client/images/spin/64x64/Preloader_10.gif
new file mode 100644
index 0000000..944ec82
Binary files /dev/null and b/client/images/spin/64x64/Preloader_10.gif differ
diff --git a/client/images/spin/64x64/Preloader_2.gif b/client/images/spin/64x64/Preloader_2.gif
new file mode 100644
index 0000000..9821827
Binary files /dev/null and b/client/images/spin/64x64/Preloader_2.gif differ
diff --git a/client/images/spin/64x64/Preloader_3.gif b/client/images/spin/64x64/Preloader_3.gif
new file mode 100644
index 0000000..52b81ba
Binary files /dev/null and b/client/images/spin/64x64/Preloader_3.gif differ
diff --git a/client/images/spin/64x64/Preloader_4.gif b/client/images/spin/64x64/Preloader_4.gif
new file mode 100644
index 0000000..3408b5d
Binary files /dev/null and b/client/images/spin/64x64/Preloader_4.gif differ
diff --git a/client/images/spin/64x64/Preloader_5.gif b/client/images/spin/64x64/Preloader_5.gif
new file mode 100644
index 0000000..6f0585d
Binary files /dev/null and b/client/images/spin/64x64/Preloader_5.gif differ
diff --git a/client/images/spin/64x64/Preloader_6.gif b/client/images/spin/64x64/Preloader_6.gif
new file mode 100644
index 0000000..c577f24
Binary files /dev/null and b/client/images/spin/64x64/Preloader_6.gif differ
diff --git a/client/images/spin/64x64/Preloader_7.gif b/client/images/spin/64x64/Preloader_7.gif
new file mode 100644
index 0000000..5f6dd5e
Binary files /dev/null and b/client/images/spin/64x64/Preloader_7.gif differ
diff --git a/client/images/spin/64x64/Preloader_8.gif b/client/images/spin/64x64/Preloader_8.gif
new file mode 100644
index 0000000..b57e4d8
Binary files /dev/null and b/client/images/spin/64x64/Preloader_8.gif differ
diff --git a/client/images/spin/64x64/Preloader_9.gif b/client/images/spin/64x64/Preloader_9.gif
new file mode 100644
index 0000000..fc3ddb7
Binary files /dev/null and b/client/images/spin/64x64/Preloader_9.gif differ
diff --git a/client/js/controllers/home/machineDetails.js b/client/js/controllers/home/machineDetails.js
index 3ee4625..f84a073 100644
--- a/client/js/controllers/home/machineDetails.js
+++ b/client/js/controllers/home/machineDetails.js
@@ -21,11 +21,11 @@ mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$
 		// Fake timeout
 		$timeout(function(){
 		$("#waitingForToggleMachine").hide();	
-		}, 1000);
+		}, 3000);
 		$timeout(function(){
 		$scope.machine.online=!$scope.machine.online;
 
-		}, 1000);
+		}, 3000);
 
 		
 	};
diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js
index 6545c1a..d93c376 100644
--- a/client/js/controllers/home/main.js
+++ b/client/js/controllers/home/main.js
@@ -17,5 +17,6 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', function ($s
 		var machine={name: "Machine 1", online:true};
 		$rootScope.$broadcast("showMachineDetailsEvent", machine);		
 	}
-    
+
+
 }]);
diff --git a/client/partials/home/machineDetails.html b/client/partials/home/machineDetails.html
index 2a79f52..1a4edde 100644
--- a/client/partials/home/machineDetails.html
+++ b/client/partials/home/machineDetails.html
@@ -25,7 +25,7 @@
 
 							<button class="btn btn-danger" ng-if="machine.online" ng-click="toggleMachineState()">Turn Off</button>		 
 							<button class="btn btn-success" ng-if="!machine.online" ng-click="toggleMachineState()">Turn On</button>		 
-							&nbsp;<span class="glyphicon glyphicon-refresh" aria-hidden="true" id="waitingForToggleMachine"></span>
+							&nbsp;<img src="images/spin/32x32/Preloader_1.gif" id="waitingForToggleMachine"></span>
 
 							
 						</div>
diff --git a/client/partials/home/main.html b/client/partials/home/main.html
index e3611e5..37638d3 100644
--- a/client/partials/home/main.html
+++ b/client/partials/home/main.html
@@ -5,5 +5,7 @@
     <div class="panel-body">
         Main Content
 		<button ng-click="raiseShowMachineDetailsEvent()" > Show Machine details</button>
+		<div id="test">
+		</div>
     </div>
 </div>
-- 
cgit v1.2.3


From 726562f0426d94c7822cf99d12cd35a9d913ca45 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sun, 28 Feb 2016 18:13:27 +0100
Subject: Correct bug

---
 client/partials/home/machineDetails.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/partials/home/machineDetails.html b/client/partials/home/machineDetails.html
index 1a4edde..606edcf 100644
--- a/client/partials/home/machineDetails.html
+++ b/client/partials/home/machineDetails.html
@@ -21,8 +21,9 @@
 					<div class="form-group">
 						<label class="control-label col-sm-2" for="pwd">State</label>
 						<div class="col-sm-10">
-							Offline &nbsp;
-
+							<span ng-if="machine.online">Online</span>
+							<span ng-if="!machine.online">Offline</span>
+							&nbsp;
 							<button class="btn btn-danger" ng-if="machine.online" ng-click="toggleMachineState()">Turn Off</button>		 
 							<button class="btn btn-success" ng-if="!machine.online" ng-click="toggleMachineState()">Turn On</button>		 
 							&nbsp;<img src="images/spin/32x32/Preloader_1.gif" id="waitingForToggleMachine"></span>
-- 
cgit v1.2.3


From 7a0a19743053d4802146f579d793eec42ac3731d Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Sun, 28 Feb 2016 19:02:06 +0100
Subject: syntax correction

---
 server/core/Compute.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/core/Compute.php b/server/core/Compute.php
index 3df3ada..e95380e 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -47,7 +47,7 @@ class compute
         /**
          * Create server.
          * @return array
-         
+         */ 
         public function createServer(array $options)
         {
 
-- 
cgit v1.2.3


From 3fe5596998b88e20aa3965a5b44d0a8ec9f0a4cb Mon Sep 17 00:00:00 2001
From: EoleDev <EoleDev@outlook.fr>
Date: Sun, 28 Feb 2016 19:10:51 +0100
Subject: Correct Error in App, Add Compute in App, add Network in Index

---
 server/core/App.php | 9 +++++++--
 server/index.php    | 9 ++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/server/core/App.php b/server/core/App.php
index 5495a1f..282a1db 100755
--- a/server/core/App.php
+++ b/server/core/App.php
@@ -33,7 +33,7 @@ class App{
 	public function setToken($token){
 		
 		$this->tokenPost = $token;
-		$this->tokenClass->loadBackup($his->tokenPost);
+		$this->tokenClass->loadBackup($this->tokenPost);
 		
 	}
 	
@@ -55,6 +55,11 @@ class App{
 				$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;
 		}
 		
 	}
@@ -102,4 +107,4 @@ class App{
 		echo json_encode($this->output);
 	}
 	
-}
\ No newline at end of file
+}
diff --git a/server/index.php b/server/index.php
index 41b4e73..f888671 100644
--- a/server/index.php
+++ b/server/index.php
@@ -27,7 +27,14 @@
 			$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);
-- 
cgit v1.2.3


From 9280eecbcf42253363a30f97d265069d0159de77 Mon Sep 17 00:00:00 2001
From: EoleDev <EoleDev@outlook.fr>
Date: Sun, 28 Feb 2016 19:26:53 +0100
Subject: Support gestion output

---
 server/Test/AppTestClass.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php
index 68d0cfc..4d7cab5 100755
--- a/server/Test/AppTestClass.php
+++ b/server/Test/AppTestClass.php
@@ -16,10 +16,10 @@ class AppTest{
 		$this->tokenPost = NULL;
 		$this->tokenClass = new genTokenOptions($args);
 		$this->openstack = new OpenStack\OpenStack([]);
-		$this->pluginsApi = plugin_api::getInstance();
+		$this->pluginsApi = plugin_api::getInstance();
 		$this->errorClass = new errorManagement($this);
 		$this->output = array();
-		$this->postParams = $_POST;
+		$this->postParams = $_POST;
 
 	}
 	
@@ -91,7 +91,7 @@ class AppTest{
 	}
 	
 	public function show(){
-		echo json_encode($this->output);
+		return json_encode($this->output);
 	}
 	
-}
+}
-- 
cgit v1.2.3


From 153c1f4602e7a8247c7dc3e59e64d5eb65260ef2 Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Sun, 28 Feb 2016 19:50:33 +0100
Subject: updated Compute to use formatted return

---
 server/core/Compute.php | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/server/core/Compute.php b/server/core/Compute.php
index e95380e..5a45362 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -24,7 +24,8 @@ class compute
         public function listServers()
         {
                 $servers = $this->libClass->listServers();
-                return $servers;
+		$this->app->setOutput("Servers", $servers);
+                return;
         }
         /**
          * List flavors.
@@ -33,7 +34,8 @@ class compute
         public function listFlavors()
         {
                 $flavors = $this->libClass->listFlavors();
-                return $flavors;
+		$this->app->setOutput("Flavors", $flavors);
+                return;
         }
         /**
          * List images.
@@ -42,7 +44,8 @@ class compute
         public function listImages()
         {
                 $images = $this->libClass->listImages();
-                return $images;
+		$this->app->setOutput("Images", $images);
+                return;
         }
         /**
          * Create server.
@@ -60,7 +63,8 @@ class compute
         public function getServer(array $options = [])
         {
                 $server = $this->libClass->getServer($options);
-                return $server;
+		$this->app->setOutput("MyServer", $server);
+                return;
         }
         /**
          * Get flavor details.
@@ -69,7 +73,8 @@ class compute
         public function getFlavor(array $options = [])
         {
                 $flavor = $this->libClass->getFlavor($options);
-                return $flavor;
+		$this->app->setOutput("MyFlavor", $flavor);
+                return;
         }
         /**
          * Get image details.
@@ -78,9 +83,11 @@ class compute
         public function getImage(array $options = [])
         {
                 $image = $this->libClass->getImage($options);
-                return $image;
+		$this->app->setOutput("MyImage", $image);
+                return;
         }
-        //working on tests
+        /* working on tests
+
         public function update()
         {
                 $image = $this->app->getServer(array $options = []);
@@ -142,6 +149,6 @@ class compute
         {
                 //TODO
         }
-
+*/
 }
  
-- 
cgit v1.2.3


From 847e4c04aea8c56ac4e4b8d12fcb405e78159026 Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Sun, 28 Feb 2016 20:21:05 +0100
Subject: updated getserver, getimage and getflavor

---
 server/core/Compute.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/server/core/Compute.php b/server/core/Compute.php
index 5a45362..1312083 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -51,7 +51,7 @@ class compute
          * Create server.
          * @return array
          */ 
-        public function createServer(array $options)
+        public function createServer()
         {
 
                 $server = $this->libClass->createServer();
@@ -60,9 +60,11 @@ class compute
          * Get server details.
          * @return array
          */
-        public function getServer(array $options = [])
+        public function getServer()
         {
-                $server = $this->libClass->getServer($options);
+		$serverId = $this->app->getPostParam("serverId");
+		$opt = array('id' => $serverId);
+                $server = $this->libClass->getServer($opt);
 		$this->app->setOutput("MyServer", $server);
                 return;
         }
@@ -70,9 +72,11 @@ class compute
          * Get flavor details.
          * @return array
          */
-        public function getFlavor(array $options = [])
+        public function getFlavor()
         {
-                $flavor = $this->libClass->getFlavor($options);
+		$flavorId = $this->app->getPostParam("flavorId");
+		$opt = array('id' => $flavorId);
+                $flavor = $this->libClass->getFlavor($opt);
 		$this->app->setOutput("MyFlavor", $flavor);
                 return;
         }
@@ -82,7 +86,9 @@ class compute
          */
         public function getImage(array $options = [])
         {
-                $image = $this->libClass->getImage($options);
+		$imageId = $this->app->getPostParam("imageId");
+		$opt = array('id' => $imageId);
+                $image = $this->libClass->getImage($opt);
 		$this->app->setOutput("MyImage", $image);
                 return;
         }
-- 
cgit v1.2.3


From 79a65198e45076c5db58be3e749d533d3f4acc03 Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Sun, 28 Feb 2016 20:29:18 +0100
Subject: minor corrections

---
 server/core/Compute.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/core/Compute.php b/server/core/Compute.php
index 1312083..84af889 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -84,7 +84,7 @@ class compute
          * Get image details.
          * @return array
          */
-        public function getImage(array $options = [])
+        public function getImage()
         {
 		$imageId = $this->app->getPostParam("imageId");
 		$opt = array('id' => $imageId);
-- 
cgit v1.2.3


From d1991fca2b3e9517da9aff571494dbc1374344d9 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sun, 28 Feb 2016 20:30:57 +0100
Subject: Erreur !

---
 client/js/controllers/home/main.js |  2 ++
 client/js/services/Compute.js      | 13 +++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js
index d93c376..4e3bcda 100644
--- a/client/js/controllers/home/main.js
+++ b/client/js/controllers/home/main.js
@@ -13,6 +13,8 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', function ($s
 	// Retrieve all Data
 	Compute.pullData(updatePage);
 
+	Compute.getMachines(function(adzda){});
+	
 	$scope.raiseShowMachineDetailsEvent=function(){
 		var machine={name: "Machine 1", online:true};
 		$rootScope.$broadcast("showMachineDetailsEvent", machine);		
diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js
index 70359ee..7e1764f 100644
--- a/client/js/services/Compute.js
+++ b/client/js/services/Compute.js
@@ -15,9 +15,18 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 
 	// Get Machine
 	var getMachines=function(callback){
-
+		
 		var result=$http.post('../server/index.php',
-						  $.param({"token" : Identity.profile.token, "task" : "Compute"}));		
+							  $.param({"token" : Identity.getToken(), "task" : "compute", action:"getImage", serverID:"69d5bcc4-2fab-4634-b0d2-f455fee5b7bd"}));		
+
+		// Wait and handle the response
+        result.then(function (response){
+			alert(response);
+			callback(parseGetMachinesAnswer(response, false));
+        },function(response){
+			alert(response.status);
+					callback(parseGetMachinesAnswer(response, true));
+        });		
 
 		
 	};
-- 
cgit v1.2.3


From 2583ae04deed167ba3bcb12c52d1188d2538536a Mon Sep 17 00:00:00 2001
From: EoleDev <EoleDev@outlook.fr>
Date: Sun, 28 Feb 2016 20:44:17 +0100
Subject: Error correction function call

---
 server/core/LibOverride/genTokenOptions.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php
index b71defa..f239d84 100644
--- a/server/core/LibOverride/genTokenOptions.php
+++ b/server/core/LibOverride/genTokenOptions.php
@@ -263,10 +263,10 @@ class genTokenOptions
 		$this->backup["roles"] = $backup["roles"];
 		$this->backup["project"] = $backup["project"];
 		$this->backup["user"] = $backup["user"];
-		loadComputeBackup($backup["Compute"]);
-		loadIdentityBackup($backup["Identity"]);
-		loadImageBackup($backup["Image"]);
-		loadNetworkBackup($backup["Network"]);
+		$this->loadComputeBackup($backup["Compute"]);
+		$this->loadIdentityBackup($backup["Identity"]);
+		$this->loadImageBackup($backup["Image"]);
+		$this->loadNetworkBackup($backup["Network"]);
 		
 	}
 	
-- 
cgit v1.2.3


From ef28780fba689daefdb9e770d370deed14f2447e Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sun, 28 Feb 2016 20:45:21 +0100
Subject: Test

---
 client/js/services/Compute.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js
index 7e1764f..43d13c4 100644
--- a/client/js/services/Compute.js
+++ b/client/js/services/Compute.js
@@ -17,7 +17,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 	var getMachines=function(callback){
 		
 		var result=$http.post('../server/index.php',
-							  $.param({"token" : Identity.getToken(), "task" : "compute", action:"getImage", serverID:"69d5bcc4-2fab-4634-b0d2-f455fee5b7bd"}));		
+							  $.param({"token" : Identity.getToken(), "task" : "compute", "action":"getImage", "serverID":"69d5bcc4-2fab-4634-b0d2-f455fee5b7bd"}));		
 
 		// Wait and handle the response
         result.then(function (response){
-- 
cgit v1.2.3


From c67651168a08cdd5209fafedea86c48c3fe6d6f0 Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Sun, 28 Feb 2016 20:49:52 +0100
Subject: updated action

---
 server/core/Compute.php | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/server/core/Compute.php b/server/core/Compute.php
index 84af889..fdc6b20 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -17,10 +17,22 @@ class compute
                 $this->app = $app;
                 $this->libClass = $app->getLibClass("Compute");
     }
-    /**
-     * List servers.
-     * @return array
-     */
+	/**
+	* Execute an action
+	*
+	* @param String $action name of another function of this class
+	*
+	* @return void
+	*/
+	public function action($action){
+		
+		 $this->{$action.""}();
+		
+	}
+    	/**
+     	* List servers.
+     	* @return array
+     	*/
         public function listServers()
         {
                 $servers = $this->libClass->listServers();
@@ -50,12 +62,13 @@ class compute
         /**
          * Create server.
          * @return array
-         */ 
+         * 
         public function createServer()
         {
 
                 $server = $this->libClass->createServer();
         }
+	*/
         /**
          * Get server details.
          * @return array
-- 
cgit v1.2.3


From 829c7ba8f3b65cd43f6a93e44028ad5cfe354d50 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sun, 28 Feb 2016 21:14:06 +0100
Subject: Test

---
 client/js/services/Compute.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js
index 43d13c4..59f6291 100644
--- a/client/js/services/Compute.js
+++ b/client/js/services/Compute.js
@@ -17,11 +17,11 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 	var getMachines=function(callback){
 		
 		var result=$http.post('../server/index.php',
-							  $.param({"token" : Identity.getToken(), "task" : "compute", "action":"getImage", "serverID":"69d5bcc4-2fab-4634-b0d2-f455fee5b7bd"}));		
+							  $.param({"token" : Identity.getToken(), "task" : "compute", "action":"listServers"}));		
 
 		// Wait and handle the response
         result.then(function (response){
-			alert(response);
+			console.log(response.data.Servers);
 			callback(parseGetMachinesAnswer(response, false));
         },function(response){
 			alert(response.status);
-- 
cgit v1.2.3


From 8ea4b64f9305fd493bce2967063190586531e3aa Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Sun, 28 Feb 2016 21:23:28 +0100
Subject: updated get functions

---
 server/core/Compute.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server/core/Compute.php b/server/core/Compute.php
index fdc6b20..94e219c 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -78,6 +78,7 @@ class compute
 		$serverId = $this->app->getPostParam("serverId");
 		$opt = array('id' => $serverId);
                 $server = $this->libClass->getServer($opt);
+		$server->retrieve();
 		$this->app->setOutput("MyServer", $server);
                 return;
         }
@@ -90,6 +91,7 @@ class compute
 		$flavorId = $this->app->getPostParam("flavorId");
 		$opt = array('id' => $flavorId);
                 $flavor = $this->libClass->getFlavor($opt);
+		$flavor->retrieve();
 		$this->app->setOutput("MyFlavor", $flavor);
                 return;
         }
@@ -102,6 +104,7 @@ class compute
 		$imageId = $this->app->getPostParam("imageId");
 		$opt = array('id' => $imageId);
                 $image = $this->libClass->getImage($opt);
+		$image->retrieve();
 		$this->app->setOutput("MyImage", $image);
                 return;
         }
-- 
cgit v1.2.3


From 0ab3116656c41300c571832b4f543125f93da399 Mon Sep 17 00:00:00 2001
From: EoleDev <root@serverpc.home>
Date: Sun, 28 Feb 2016 22:54:51 +0100
Subject: Error Correction on Token Save

---
 server/core/App.php                         | 1 +
 server/core/LibOverride/genTokenOptions.php | 2 ++
 2 files changed, 3 insertions(+)
 mode change 100644 => 100755 server/core/LibOverride/genTokenOptions.php

diff --git a/server/core/App.php b/server/core/App.php
index 282a1db..edb75f6 100755
--- a/server/core/App.php
+++ b/server/core/App.php
@@ -105,6 +105,7 @@ class App{
 	
 	public function show(){
 		echo json_encode($this->output);
+		//error_log(var_dump(json_encode($this->output), true), 0);
 	}
 	
 }
diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php
old mode 100644
new mode 100755
index f239d84..50826ed
--- a/server/core/LibOverride/genTokenOptions.php
+++ b/server/core/LibOverride/genTokenOptions.php
@@ -260,6 +260,7 @@ class genTokenOptions
 	public function loadBackup($back){
 		
 		$backup = unserialize($back);
+
 		$this->backup["roles"] = $backup["roles"];
 		$this->backup["project"] = $backup["project"];
 		$this->backup["user"] = $backup["user"];
@@ -324,6 +325,7 @@ class genTokenOptions
 	
 	private function unserializeToken($tokenSerialized){
 		$Saved = file_get_contents("core/LibOverride/projectTokenData/".$this->backup["project"]);
+		$Saved = unserialize($Saved);
 		$api = new Api();
 		$token = new Models\Token($this->httpClient, $api);
 		$token->methods = unserialize($tokenSerialized["methods"]);
-- 
cgit v1.2.3


From 6a67f6ba9dce19b046a5fc86e7437fbaa873c1e8 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Mon, 29 Feb 2016 08:32:48 +0100
Subject: Test

---
 client/js/services/Compute.js  | 2 +-
 client/js/services/Identity.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js
index 59f6291..9f404c4 100644
--- a/client/js/services/Compute.js
+++ b/client/js/services/Compute.js
@@ -17,7 +17,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 	var getMachines=function(callback){
 		
 		var result=$http.post('../server/index.php',
-							  $.param({"token" : Identity.getToken(), "task" : "compute", "action":"listServers"}));		
+							  $.param({"token" : Identity.getToken(), "task" : "compute", "action":"getServer", serverId:"69d5bcc4-2fab-4634-b0d2-f455fee5b7bd"}));		
 
 		// Wait and handle the response
         result.then(function (response){
diff --git a/client/js/services/Identity.js b/client/js/services/Identity.js
index 7604230..a13c457 100644
--- a/client/js/services/Identity.js
+++ b/client/js/services/Identity.js
@@ -117,9 +117,9 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 
 		// Wait and handle the response
         result.then(function (response){
-			callback(parseLoginAnswer(response), false);
+			callback(parseLoginAnswer(response, false));
         },function(response){
-			callback(parseLoginAnswer(response), true)
+			callback(parseLoginAnswer(response, true));
         });		
 	};	
 
-- 
cgit v1.2.3


From 3656654077f505dd782678451760eba45b59707b Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Mon, 29 Feb 2016 08:54:04 +0100
Subject: Clean code

---
 client/js/services/Compute.js  | 14 +++++++++++---
 client/js/services/Identity.js | 42 ++++++++++++++++++++++++++----------------
 2 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js
index 9f404c4..8148948 100644
--- a/client/js/services/Compute.js
+++ b/client/js/services/Compute.js
@@ -2,11 +2,12 @@
 mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 
 
-	
+	// Create data
 	var data={};
 	data.machines={};
 	
 
+	
 	// Parser
 	var parseGetMachinesAnswer=function(response, failedToSendRequest){
 		
@@ -15,9 +16,16 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 
 	// Get Machine
 	var getMachines=function(callback){
+
+		var params={
+			"token" : Identity.getToken(),
+			"task" : "compute",
+			"action":"getServer",
+			"serverId":"69d5bcc4-2fab-4634-b0d2-f455fee5b7bd"
+		};
 		
 		var result=$http.post('../server/index.php',
-							  $.param({"token" : Identity.getToken(), "task" : "compute", "action":"getServer", serverId:"69d5bcc4-2fab-4634-b0d2-f455fee5b7bd"}));		
+							  $.param(params));		
 
 		// Wait and handle the response
         result.then(function (response){
@@ -25,7 +33,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 			callback(parseGetMachinesAnswer(response, false));
         },function(response){
 			alert(response.status);
-					callback(parseGetMachinesAnswer(response, true));
+			callback(parseGetMachinesAnswer(response, true));
         });		
 
 		
diff --git a/client/js/services/Identity.js b/client/js/services/Identity.js
index a13c457..b1d2a48 100644
--- a/client/js/services/Identity.js
+++ b/client/js/services/Identity.js
@@ -9,42 +9,37 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
     profile.projectname=null;
 	var token=null;
 
+	
 	/* 
 	 * @returns {boolean} Return true if a cookie is found (and load it in profile) false else 
 	 */
 	var isAlreadyLogin=function(){
+
+		// Load cookies
 		var profileInCookie=$cookies.getObject('profile');
 		var tokenPart_0InCookie=$cookies.getObject('token.part_0');
 		var tokenPart_1InCookie=$cookies.getObject('token.part_1');
 
 		
+		// Check if cookie is defined
 		if(typeof profileInCookie !== 'undefined'
 		   && typeof tokenPart_0InCookie !== 'undefined'
 		   && typeof tokenPart_1InCookie !== 'undefined'
 		  ){
+
+			// If yes, put it into variables
 			angular.extend(profile, profileInCookie);
 			token=tokenPart_0InCookie+tokenPart_1InCookie;
-			
+
+			// Return I'm Login
 			return true;
 		}
 
+		// Return I'm not Login
 		return false;
 	}
 
 
-	/*
-     * Get the profile
-	 */
-	var getProfile=function(){
-		return profile;
-	}
-
-	/*
-     * Get the token
-	 */	
-	var getToken=function(){
-		return token;
-	}
 	
 	/*
 	 * Destroy profile cookies
@@ -64,7 +59,7 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 	 */
 	var parseLoginAnswer=function(response, failedToSendRequest){
 		
-
+		// Defined return object
 		var requestParserResult={};
 		requestParserResult.status=1;
 		requestParserResult.failReason=null;
@@ -96,6 +91,7 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 		
 		return requestParserResult;
 	};
+
 	
 	/**
 	 * Function to connect to OpenStack
@@ -113,7 +109,7 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 		profile.projectname=projectname;
 		
 		var result=$http.post('../server/index.php',
-						  $.param({"task" : "Authenticate", "user" : username, "password" : password, "project" : projectname}));  
+							  $.param({"task" : "Authenticate", "user" : username, "password" : password, "project" : projectname}));  
 
 		// Wait and handle the response
         result.then(function (response){
@@ -124,6 +120,20 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 	};	
 
 
+	/*
+     * Get the profile
+	 */
+	var getProfile=function(){
+		return profile;
+	}
+
+	/*
+     * Get the token
+	 */	
+	var getToken=function(){
+		return token;
+	}
+	
 
 	// Return services objects
 	return {
-- 
cgit v1.2.3


From 24773559e2d6e6c418baf97a6e9d41917d4cb244 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Mon, 29 Feb 2016 09:32:12 +0100
Subject: Test

---
 client/js/services/Compute.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js
index 8148948..e0c28ae 100644
--- a/client/js/services/Compute.js
+++ b/client/js/services/Compute.js
@@ -21,7 +21,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 			"token" : Identity.getToken(),
 			"task" : "compute",
 			"action":"getServer",
-			"serverId":"69d5bcc4-2fab-4634-b0d2-f455fee5b7bd"
+			"serverId":"a2926ce3-501b-4285-82ce-c6e451295599"
 		};
 		
 		var result=$http.post('../server/index.php',
@@ -29,7 +29,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 
 		// Wait and handle the response
         result.then(function (response){
-			console.log(response.data.Servers);
+			console.log(response.data.MyServer.image);
 			callback(parseGetMachinesAnswer(response, false));
         },function(response){
 			alert(response.status);
-- 
cgit v1.2.3


From 1af80a481fa49d4d48f5f0d711e60359bcc93614 Mon Sep 17 00:00:00 2001
From: Yoggzo <yogg@epsina.com>
Date: Mon, 29 Feb 2016 15:30:42 +0100
Subject: Add error management

---
 server/core/Image.php | 571 +++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 431 insertions(+), 140 deletions(-)

diff --git a/server/core/Image.php b/server/core/Image.php
index 3001eea..4025595 100644
--- a/server/core/Image.php
+++ b/server/core/Image.php
@@ -1,7 +1,4 @@
 <?php
-
-//require 'CoreInterface.php';
-
 /**
 * File containing the Image Class.
 *
@@ -12,16 +9,18 @@
 * 
 * @todo Complete the functions with errors detection and finish the descriptions
 */
- 
- 
+use OpenStack\Common\Error\BadResponseError;
+use OpenStack\Common\Error\BaseError;
+use OpenStack\Common\Error\NotImplementedError;
+use OpenStack\Common\Error\UserInputError;
+
 /**
 * Image Class of the back-end application
 *
 * ADD CLASS DESCRIPTION
 *
 */
-class image{ 
-	//implements Core
+class image implements Core{ 
 
 	/** @var App $app protected, contains the main app object */
 	protected $app;
@@ -29,10 +28,6 @@ class image{
 	/** @var OpenStack\Identity $libClass protected, contains the library Identity object */
 	protected $libClass;
 	
-	/** @var array $actions protected, contains the functions which can be call by the front-end */
-	protected $actions = array();
-
-	
 	/**
 	* Image constructor
 	*
@@ -43,12 +38,36 @@ class image{
 	* @return Image
 	*/
 	public function __construct($app){
-		$this->app = $app;
-		$this->libClass = $app->getLibClass("Image");
+		if(!isset($app)){
+			$this->app->setOutput("Error", "Incorrect parameter");
+		}
+		try{
+			$this->app = $app;
+			$this->libClass = $app->getLibClass("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);
+        }
 	}
 
 
-	
+	/**
+	* Execute an action
+	*
+	* @param String $action name of another function of this class
+	*
+	* @return void
+	*/
+	public function action($action){
+		
+		 $this->{$action.""}();
+		
+	}
 
 	/**
 	* Details about an image
@@ -57,55 +76,96 @@ class image{
 	*	options for the image creation
 	*
 	**/
-	public function create_image(array $opt){
-		// VOIR SI MAUVAIS TYPE
-		$options = Array();
-		if(isset($opt['name'])){ // string, rendre le nom obligatoire, vérifier nom pas déjà pris
-		}
-		else{
-			//ERROR
-		}
-		if(isset($opt['id'])){ // UUID : nnnnnnnn-nnnn-nnnn-nnnn-nnnnnnnnnnnn
-			$options['id'] = $opt['id'];
-		}
-		if(isset($opt['visibility'])){ // public, private
-			$options['visibility'] = $opt['visibility'];
-		}
-		if(isset($opt['tags'])){ // list
-			$options['tags'] = $opt['tags'];
-		}
-		if(isset($opt['containerFormat'])){ // string : ami, ari, aki, bare, ovf, ova, docker
-			$options['containerFormat'] = $opt['containerFormat'];
-		}
-		if(isset($opt['diskFormat'])){ // string : ami, ari, aki, vhd, vmdk, raw, qcow2, vdi, iso
-			$options['diskFormat'] = $opt['diskFormat'];
-		}
-		if(isset($opt['minDisk'])){ //int
-			$options['minDisk'] = $opt['minDisk'];
-		}
-		if(isset($opt['minRam'])){ // int
-			$options['minRam'] = $opt['minRam'];
-		}
-		if(isset($opt['protected'])){ // boolean
-			$options['protected'] = $opt['protected'];
+	private function createImage(array $opt){
+
+		if(!isset($opt)){
+			$this->app->setOutput("Error", "Incorrect parameter");
 		}
-		if(isset($opt['properties'])){ // type dict ?
-			$options['properties'] = $opt['properties'];
-		}	
 
-		$image = $this->oidentity->createImage($options);
 
+		try{	
+			// VOIR SI MAUVAIS TYPE
+			$options = Array();
+			if(isset($opt['name'])){ // if the image name already exists -> error
+				$imagesList = listImage();
+				if(isset($images)){
+    				foreach($imagesList as $image){
+    					if(strcmp($image->name, $opt['name']) == 0){
+
+    					}
+    				}
+    			}
+
+			}
+			else{
+				$this->app->setOutput("Error", "Image name already exists");
+			}
+			if(isset($opt['id'])){ // UUID : nnnnnnnn-nnnn-nnnn-nnnn-nnnnnnnnnnnn
+				if($this->libClass->getImage($opt['id']) != null){ // if the id already exists -> error
+
+				}
+				$options['id'] = $opt['id'];
+			}
+			if(isset($opt['visibility'])){ // public, private
+				$options['visibility'] = $opt['visibility'];
+			}
+			if(isset($opt['tags'])){ // list
+				$options['tags'] = $opt['tags'];
+			}
+			if(isset($opt['containerFormat'])){ // string : ami, ari, aki, bare, ovf, ova, docker
+				$options['containerFormat'] = $opt['containerFormat'];
+			}
+			if(isset($opt['diskFormat'])){ // string : ami, ari, aki, vhd, vmdk, raw, qcow2, vdi, iso
+				$options['diskFormat'] = $opt['diskFormat'];
+			}
+			if(isset($opt['minDisk'])){ //int
+				$options['minDisk'] = $opt['minDisk'];
+			}
+			if(isset($opt['minRam'])){ // int
+				$options['minRam'] = $opt['minRam'];
+			}
+			if(isset($opt['protected'])){ // boolean
+				$options['protected'] = $opt['protected'];
+			}
+			if(isset($opt['properties'])){ // type dict ?
+				$options['properties'] = $opt['properties'];
+			}	
+
+			$image = $this->libClass->createImage($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 $image;
 	}
 
-	/*
-	* List images
+	/**
+	* List the images of the server
+	*
+	* @return the list with all images on the server
 	*/
-	public function list_images(){
-		// vérifier si au moins une image
-		$service = $this->oidentity;
-		$images = $service->listImages();
-		return $images;
+	private function listImage(){
+		try{
+			$l = $this->libClass->listImages();
+			if(!isset($l)){ // if the list is empty there is no images
+				$this->app->setOutput("Error", "No 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);
+        }
+		return $l;
+
 	}
 
 	/**
@@ -115,11 +175,27 @@ class image{
 	*	identifier of the image
 	*
 	**/
-	public function image_details($id){
-		//vérifier existence image
-		$service = $this->oidentity;
-		$image = $service->getImage($id);
-		return $image;
+	private function detailsImage($id){
+		if(!isset($id)){
+			// Renvoyer erreur 
+		}
+		try{
+			$service = $this->libClass;
+			$image = $service->getImage($id);
+			if($image == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "Image doesn't exist");
+			}
+			
+			return $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);
+        }
 	}
 
 	/**
@@ -131,33 +207,53 @@ class image{
 	* @param array $opt
 	*	options for the image creation
 	**/
-	public function update_image($id, array $opt){
-		//vérifier existence image
-		$service = $this->oidentity;
-		$image = $service->getImage($id);
-		$options = Array();
-
-		// Voir vérification des types
-		if(isset($opt['name'])){ //string
-			$options['name'] = $opt['name'];
-		}
-		if(isset($opt['minDisk'])){ //int
-			$options['minDisk'] = $opt['minDisk'];
-		}
-		if(isset($opt['minRam'])){ // int
-			$options['minRam'] = $opt['minRam'];
-		}
-		if(isset($opt['protected'])){ // boolean
-			$options['protected'] = $opt['protected'];
+	private function updateImage($id, array $opt){
+		if(!isset($id)){
+			$this->app->setOutput("Error", "Incorrect id parameter"); 
 		}
-		if(isset($opt['visibility'])){ // public, private
-			$options['visibility'] = $opt['visibility'];
+		if(!isset($opt)){
+			$this->app->setOutput("Error", "Incorrect opt parameter");
 		}
-		if(isset($opt['tags'])){ // list
-			$options['tags'] = $opt['tags'];
-		}
-		$image->update($options);
 
+		try{
+			//vérifier existence image
+			$service = $this->libClass;
+			$image = $service->getImage($id);
+			if($image == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "Image doesn't exist");
+			}
+
+			$options = Array();
+
+			// Voir vérification des types
+			if(isset($opt['name'])){ //string
+				$options['name'] = $opt['name'];
+			}
+			if(isset($opt['minDisk'])){ //int
+				$options['minDisk'] = $opt['minDisk'];
+			}
+			if(isset($opt['minRam'])){ // int
+				$options['minRam'] = $opt['minRam'];
+			}
+			if(isset($opt['protected'])){ // boolean
+				$options['protected'] = $opt['protected'];
+			}
+			if(isset($opt['visibility'])){ // public, private
+				$options['visibility'] = $opt['visibility'];
+			}
+			if(isset($opt['tags'])){ // list
+				$options['tags'] = $opt['tags'];
+			}
+			$image->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);
+        }
 		return $image;
 	}
 
@@ -167,11 +263,30 @@ class image{
 	* @param string $id
 	*	identifier of the image
 	**/
-	public function delete_image($id){
+	private function deleteImage($id){
 		// si protected = true, demander de le mettre a false
 		// vérifier existence image
-		$service = $this->oidentity;
-		$service->getImage($id)->delete();
+		if(!isset($id)){
+			$this->app->setOutput("Error", "Image doesn't exist");
+		}
+
+		try{
+			$service = $this->libClass;
+			$image = $this->libClass->getImage($id);
+			if($image == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "Image doesn't exist");
+			}
+			$image->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);
+        }
+		
 	}
 
 	/**
@@ -180,11 +295,27 @@ class image{
 	* @param string $id
 	*	identifier of the image
 	**/
-	public function reactivate_image($id){
-		// vérifier existence image
-		$service = $this->oidentity;
-		$image = $service->getImage($id);
-		$image->reactivate();
+	private function reactivateImage($id){
+		if(!isset($id)){
+			$this->app->setOutput("Error", "Incorrect parameter");
+		}
+		try{
+			// vérifier existence image
+			$service = $this->libClass;
+			$image = $service->getImage($id);
+			if($image == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "Image doesn't exist");
+			}
+			$image->reactivate();
+		}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);
+        }
 	}
 
 	/**
@@ -193,11 +324,27 @@ class image{
 	* @param string $id
 	*	identifier of the image
 	**/
-	public function desactivate_image($id){
-		// vérifier existence image
-		$service = $this->oidentity;
-		$image = $service->getImage($id);
-		$image->deactivate();
+	private function desactivateImage($id){
+		if(!isset($id)){
+			$this->app->setOutput("Error", "Incorrect parameter");
+		}
+		try{
+			// vérifier existence image
+			$service = $this->libClass;
+			$image = $service->getImage($id);
+			if($image == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "Image doesn't exist");
+			}
+			$image->deactivate();
+		}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);
+        }
 	}
 
 	/**
@@ -209,12 +356,31 @@ class image{
 	* @param string $file_name
 	*	path of the image
 	**/
-	public function upload_image($id, $file_name){
-		// vérifier existence image
-		$service = $this->oidentity;
-		$image  = $service->getImage($id);
-		$stream = \GuzzleHttp\Psr7\stream_for(fopen($file_name, 'r')); // A VOIR
-		$image->uploadData($stream);
+	private function uploadImage($id, $file_name){
+		if(!isset($id)){
+			$this->app->setOutput("Error", "Incorrect id parameter");
+		}
+		if(!isset($file_name)){
+			$this->app->setOutput("Error", "Incorrect file_name parameter");
+		}
+		try{
+			// vérifier existence image
+			$service = $this->libClass;
+			$image  = $service->getImage($id);
+			if($image == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "Image doesn't exist");
+			}
+			$stream = \GuzzleHttp\Psr7\stream_for(fopen($file_name, 'r'));
+			$image->uploadData($stream);
+		}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);
+        }
 	}
 
 	/**
@@ -223,12 +389,28 @@ class image{
 	* @param string $id
 	*	identifier of the image
 	**/
-	public function download_image($id){
-		// vérifier existence image 
-		$service = $this->oidentity;
-		$image  = $service->getImage($id);
-		$stream = $image->downloadData();
-		return $stream;
+	private function downloadImage($id){
+		if(!isset($id)){
+			$this->app->setOutput("Error", "Incorrect parameter");
+		}
+		try{
+			// vérifier existence image 
+			$service = $this->libClass;
+			$image  = $service->getImage($id);
+			if($image == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "Image doesn't exist");
+			}
+			$stream = $image->downloadData();
+		}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 $stream;
 	}
 
 	/**
@@ -240,12 +422,30 @@ class image{
 	* @param string $member_id
 	*	identifier of the member
 	**/
-	public function add_member($image_id, $member_id){
-		// vérifier existence image
-		// on doit être le proprio de l'image
-		// vérifier membre existe
-		$service = $this->oidentity;		
-		$member_id = $service>getImage($image_id)->addMember($member_id);
+	private function addMemberImage($image_id, $member_id){
+		if(!isset($image_id)){
+			$this->app->setOutput("Error", "Incorrect parameter image_id");
+		}
+		if(!isset($member_id)){
+			$this->app->setOutput("Error", "Incorrect parameter member_id");
+		}
+		try{
+			$service = $this->libClass;	
+
+			$image  = $service->getImage($id);
+			if($image == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "Image doesn't exist");
+			}
+			$member_id = $image->addMember($member_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);
+        }
 	}
 
 	
@@ -255,11 +455,33 @@ class image{
 	* @param string $image_id
 	*	identifier of the image
 	**/
-	public function list_member($image_id, $member_id){
-		// vérifier existence image
-		$service = $this->oidentity;
-		$image = $service->getImage($image_id);
-		$members = $image->listMembers();
+	private function listMemberImage($image_id, $member_id){
+		if(!isset($image_id)){
+			$this->app->setOutput("Error", "Incorrect parameter image_id");
+		}
+		if(!isset($member_id)){
+			$this->app->setOutput("Error", "Incorrect parameter member_id"); 
+		}
+		try{
+			// vérifier existence image
+			$service = $this->libClass;
+			$image = $service->getImage($image_id);
+			if($image == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "Image doesn't exist"); 
+			}
+			$members = $image->listMembers();
+			if($member == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "No member");
+			}
+		}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 $members;
 	}
 
@@ -272,12 +494,37 @@ class image{
 	* @param string $member_id
 	*	identifier of the member
 	**/
-	public function detail_member($image_id, $member_id){
-		// vérifier existence image
-		// on doit être le proprio de l'image
-		// vérifier membre existe
-		$service = $this->oidentity;		
-		$member = $service>getImage($image_id)->getMember($member_id);
+	private function detailMemberImage($image_id, $member_id){
+		if(!isset($image_id)){
+			$this->app->setOutput("Error", "Incorrect parameter image_id"); 
+		}
+		if(!isset($member_id)){
+			$this->app->setOutput("Error", "Incorrect parameter member_id");
+		}
+		try{
+			// vérifier existence image
+			// on doit être le proprio de l'image
+			// vérifier membre existe
+			$service = $this->libClass;	
+
+			$image  = $service->getImage($id);
+			if($image == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "Image doesn't exist");
+			}
+
+			$member = $image->getMember($member_id);
+			if($member == null){ // if the member don't exists -> error
+				$this->app->setOutput("Error", "Member doesn't exist");
+			}
+		}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 $member;
 	}
 	
@@ -290,12 +537,34 @@ class image{
 	* @param string $member_id
 	*	identifier of the member
 	**/
-	public function remove_member($image_id, $member_id){
-		// vérifier existence image
-		// on doit être le proprio de l'image
-		// vérifier membre existe
-		$service = $this->oidentity;		
-		$service>getImage($image_id)->getMember($member_id)->delete();
+	private function removeMemberImage($image_id, $member_id){
+		if(!isset($image_id)){
+			$this->app->setOutput("Error", "Incorrect parameter image_id"); 
+		}
+		if(!isset($member_id)){
+			$this->app->setOutput("Error", "Incorrect parameter member_id");
+		}
+		try{
+			$service = $this->libClass;	
+
+			$image  = $service->getImage($id);
+			if($image == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "Image doesn't exist");
+			}	
+			$member = $image->getMember($member_id);
+			if($member == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "Member doesn't exist");
+			}
+			$member->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);
+        }
 	}
 
 	/**
@@ -310,13 +579,35 @@ class image{
 	* @param string $status
 	*	new status for the member
 	**/
-	public function update_member($image_id, $member_id, $status){
-		// vérifier existence image
-		// on doit être le proprio de l'image
-		// vérifier membre existe
-		$service = $this->oidentity;		
-		$member = $service>getImage($image_id)->getMember($member_id)->updateStatus($status);
+	private function updateMemberImage($image_id, $member_id, $status){
+		if(!isset($image_id)){
+			$this->app->setOutput("Error", "Incorrect parameter image_id");
+		}
+		if(!isset($member_id)){
+			$this->app->setOutput("Error", "Incorrect parameter member_id");
+		}
+		try{
+			$service = $this->libClass;		
+
+			$image  = $service->getImage($id);
+			if($image == null){ // if the image don't exists -> error
+				$this->app->setOutput("Error", "Image doesn't exist");
+			}
+			$member = $image->getMember($member_id);
+			if($member == null){ // if the member don't exists -> error
+				$this->app->setOutput("Error", "Member doesn't exist");
+			}
+			$member->updateStatus($status);
+		}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);
+        }
 	}
 
 }
-?> 
+?>
\ No newline at end of file
-- 
cgit v1.2.3


From 2d0a01358def95161d45d41f728b9bec93d652dc Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Mon, 29 Feb 2016 16:59:27 +0100
Subject: fixed list function output format

---
 server/core/Compute.php | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/server/core/Compute.php b/server/core/Compute.php
index 94e219c..6bdb46a 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -35,7 +35,15 @@ class compute
      	*/
         public function listServers()
         {
-                $servers = $this->libClass->listServers();
+                $serverList = $this->libClass->listServers();
+		$servers = Array();
+		foreach($serverList as $server){
+		$servers["$server->id"]["id"]  = "$server->id;
+		$servers["$server->id"]["name"] = "$server->name";
+		$servers["$server->id"]["imageId"] = "$server->image->id"; 
+		$servers["$server->id"]["flavorId"] = "$server->flavor->id"; 
+		$servers["$server->id"]["status"] = "$server->status";
+		}
 		$this->app->setOutput("Servers", $servers);
                 return;
         }
@@ -45,7 +53,12 @@ class compute
          */
         public function listFlavors()
         {
-                $flavors = $this->libClass->listFlavors();
+                $flavorList = $this->libClass->listFlavors();
+		$flavors = Array();
+		foreach($flavorList as $flavor){
+		$flavors["$flavor->id"]["id"]  = "$flavor->id;
+		$flavors["$flavor->id"]["name"] = "$flavor->name";
+		}
 		$this->app->setOutput("Flavors", $flavors);
                 return;
         }
@@ -55,7 +68,12 @@ class compute
          */
         public function listImages()
         {
-                $images = $this->libClass->listImages();
+                $imageList = $this->libClass->listImages();
+		$images = Array();
+		foreach($imageList as $image){
+		$images["$image->id"]["id"]  = "$image->id;
+		$images["$image->id"]["name"] = "$image->name";
+		}
 		$this->app->setOutput("Images", $images);
                 return;
         }
-- 
cgit v1.2.3


From 3bf50ae06f84d60a5890454ef216c9251d3670d2 Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Tue, 1 Mar 2016 13:19:39 +0100
Subject: fixed syntax error

---
 server/core/Compute.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/server/core/Compute.php b/server/core/Compute.php
index 6bdb46a..17cd2ea 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -38,11 +38,11 @@ class compute
                 $serverList = $this->libClass->listServers();
 		$servers = Array();
 		foreach($serverList as $server){
-		$servers["$server->id"]["id"]  = "$server->id;
-		$servers["$server->id"]["name"] = "$server->name";
-		$servers["$server->id"]["imageId"] = "$server->image->id"; 
-		$servers["$server->id"]["flavorId"] = "$server->flavor->id"; 
-		$servers["$server->id"]["status"] = "$server->status";
+		$servers["$server->id"]["id"]  = $server->id;
+		$servers["$server->id"]["name"] = $server->name;
+		$servers["$server->id"]["imageId"] = $server->image->id; 
+		$servers["$server->id"]["flavorId"] = $server->flavor->id; 
+		$servers["$server->id"]["status"] = $server->status;
 		}
 		$this->app->setOutput("Servers", $servers);
                 return;
@@ -56,8 +56,8 @@ class compute
                 $flavorList = $this->libClass->listFlavors();
 		$flavors = Array();
 		foreach($flavorList as $flavor){
-		$flavors["$flavor->id"]["id"]  = "$flavor->id;
-		$flavors["$flavor->id"]["name"] = "$flavor->name";
+		$flavors["$flavor->id"]["id"]  = $flavor->id;
+		$flavors["$flavor->id"]["name"] = $flavor->name;
 		}
 		$this->app->setOutput("Flavors", $flavors);
                 return;
@@ -71,8 +71,8 @@ class compute
                 $imageList = $this->libClass->listImages();
 		$images = Array();
 		foreach($imageList as $image){
-		$images["$image->id"]["id"]  = "$image->id;
-		$images["$image->id"]["name"] = "$image->name";
+		$images["$image->id"]["id"]  = $image->id;
+		$images["$image->id"]["name"] = $image->name;
 		}
 		$this->app->setOutput("Images", $images);
                 return;
-- 
cgit v1.2.3


From 575b8ea4b611a5bd06c92471ecb8fb31d45c1c45 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Tue, 1 Mar 2016 15:50:57 +0100
Subject: Test

---
 client/js/controllers/home/main.js | 14 +++++++++-----
 client/js/services/Compute.js      | 36 +++++++++++++++++++++++++++++-------
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js
index 4e3bcda..805bc63 100644
--- a/client/js/controllers/home/main.js
+++ b/client/js/controllers/home/main.js
@@ -10,14 +10,18 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', function ($s
 		// TODO Update graph etc...
 	}
 
-	// Retrieve all Data
-	Compute.pullData(updatePage);
 
-	Compute.getMachines(function(adzda){});
+
+
 	
 	$scope.raiseShowMachineDetailsEvent=function(){
-		var machine={name: "Machine 1", online:true};
-		$rootScope.$broadcast("showMachineDetailsEvent", machine);		
+		var callback=function(){
+			var data=Compute.getData();
+			console.log(data.machines[Object.keys(data.machines)[0]]);
+			$rootScope.$broadcast("showMachineDetailsEvent", data.machines[Object.keys(data.machines)[0]]);		
+	
+		}
+		Compute.pullMachines(callback);
 	}
 
 
diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js
index e0c28ae..7c9df26 100644
--- a/client/js/services/Compute.js
+++ b/client/js/services/Compute.js
@@ -10,18 +10,36 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 	
 	// Parser
 	var parseGetMachinesAnswer=function(response, failedToSendRequest){
+		// Defined return object
+		var requestParserResult={};
+		requestParserResult.status=1;
+		requestParserResult.failReason=null;
+
+		if (typeof response.data.Servers !== 'undefined') {
+			// Set status code
+			requestParserResult.status=0;
+			data.machines=response.data.Servers;
+		}
+		else if(failedToSendRequest){
+			requestParserResult.failReason="Failed to send request";
+		}
+		else{
+			requestParserResult.failReason="Error";
+		}
+		
+		return requestParserResult;
+
 		
 	};
 
 
 	// Get Machine
-	var getMachines=function(callback){
+	var pullMachines=function(callback){
 
 		var params={
 			"token" : Identity.getToken(),
 			"task" : "compute",
-			"action":"getServer",
-			"serverId":"a2926ce3-501b-4285-82ce-c6e451295599"
+			"action":"listServers"
 		};
 		
 		var result=$http.post('../server/index.php',
@@ -29,7 +47,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 
 		// Wait and handle the response
         result.then(function (response){
-			console.log(response.data.MyServer.image);
+
 			callback(parseGetMachinesAnswer(response, false));
         },function(response){
 			alert(response.status);
@@ -45,12 +63,16 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 		// TODO call getMachines etc...
 	}
 
-		
+
+	var getData=function(){
+		return data;
+	}
+	
 	// Return services objects
 	return {
-		getMachines: getMachines,
+		pullMachines: pullMachines,
 		pullData: pullData,
-		data:data
+		getData: getData
 	};
 
 	
-- 
cgit v1.2.3


From dfd0566a9dfb8c012db832b4aea119858056a7d2 Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Tue, 1 Mar 2016 16:12:19 +0100
Subject: minor correction in list output format

---
 server/core/Compute.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/server/core/Compute.php b/server/core/Compute.php
index 17cd2ea..bdc9753 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -38,11 +38,11 @@ class compute
                 $serverList = $this->libClass->listServers();
 		$servers = Array();
 		foreach($serverList as $server){
-		$servers["$server->id"]["id"]  = $server->id;
-		$servers["$server->id"]["name"] = $server->name;
-		$servers["$server->id"]["imageId"] = $server->image->id; 
-		$servers["$server->id"]["flavorId"] = $server->flavor->id; 
-		$servers["$server->id"]["status"] = $server->status;
+		$servers[$server->id]["id"]  = $server->id;
+		$servers[$server->id]["name"] = $server->name;
+		$servers[$server->id]["imageId"] = $server->image->id; 
+		$servers[$server->id]["flavorId"] = $server->flavor->id; 
+		$servers[$server->id]["status"] = $server->status;
 		}
 		$this->app->setOutput("Servers", $servers);
                 return;
@@ -56,8 +56,8 @@ class compute
                 $flavorList = $this->libClass->listFlavors();
 		$flavors = Array();
 		foreach($flavorList as $flavor){
-		$flavors["$flavor->id"]["id"]  = $flavor->id;
-		$flavors["$flavor->id"]["name"] = $flavor->name;
+		$flavors[$flavor->id]["id"]  = $flavor->id;
+		$flavors[$flavor->id]["name"] = $flavor->name;
 		}
 		$this->app->setOutput("Flavors", $flavors);
                 return;
@@ -71,8 +71,8 @@ class compute
                 $imageList = $this->libClass->listImages();
 		$images = Array();
 		foreach($imageList as $image){
-		$images["$image->id"]["id"]  = $image->id;
-		$images["$image->id"]["name"] = $image->name;
+		$images[$image->id]["id"]  = $image->id;
+		$images[$image->id]["name"] = $image->name;
 		}
 		$this->app->setOutput("Images", $images);
                 return;
-- 
cgit v1.2.3


From 53c507194d2304254f0ce7541568be29377f65c8 Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Tue, 1 Mar 2016 16:29:49 +0100
Subject: further fix for 2-dimensional array output

---
 server/core/Compute.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server/core/Compute.php b/server/core/Compute.php
index bdc9753..1aad8a9 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -38,6 +38,7 @@ class compute
                 $serverList = $this->libClass->listServers();
 		$servers = Array();
 		foreach($serverList as $server){
+		$servers[$server->id] = Array();
 		$servers[$server->id]["id"]  = $server->id;
 		$servers[$server->id]["name"] = $server->name;
 		$servers[$server->id]["imageId"] = $server->image->id; 
@@ -56,6 +57,7 @@ class compute
                 $flavorList = $this->libClass->listFlavors();
 		$flavors = Array();
 		foreach($flavorList as $flavor){
+		$flavors[$flavor->id] = Array();
 		$flavors[$flavor->id]["id"]  = $flavor->id;
 		$flavors[$flavor->id]["name"] = $flavor->name;
 		}
@@ -71,6 +73,7 @@ class compute
                 $imageList = $this->libClass->listImages();
 		$images = Array();
 		foreach($imageList as $image){
+		$images[$image->id] = Array();
 		$images[$image->id]["id"]  = $image->id;
 		$images[$image->id]["name"] = $image->name;
 		}
-- 
cgit v1.2.3


From f551dffd8a960d4a322ba2b99fd98a02dd98b402 Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Tue, 1 Mar 2016 16:53:23 +0100
Subject: compute listServers fix

---
 server/core/Compute.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/core/Compute.php b/server/core/Compute.php
index 1aad8a9..131d02c 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -35,7 +35,7 @@ class compute
      	*/
         public function listServers()
         {
-                $serverList = $this->libClass->listServers();
+                $serverList = $this->libClass->listServers(true);
 		$servers = Array();
 		foreach($serverList as $server){
 		$servers[$server->id] = Array();
-- 
cgit v1.2.3


From bb8b3dd14060bbad8d4c1295c8395b5cb1108e59 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Tue, 1 Mar 2016 16:55:36 +0100
Subject: test

---
 client/js/controllers/home/main.js | 1 -
 client/js/services/Compute.js      | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js
index 805bc63..ee564b2 100644
--- a/client/js/controllers/home/main.js
+++ b/client/js/controllers/home/main.js
@@ -17,7 +17,6 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', function ($s
 	$scope.raiseShowMachineDetailsEvent=function(){
 		var callback=function(){
 			var data=Compute.getData();
-			console.log(data.machines[Object.keys(data.machines)[0]]);
 			$rootScope.$broadcast("showMachineDetailsEvent", data.machines[Object.keys(data.machines)[0]]);		
 	
 		}
diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js
index 7c9df26..28f8a69 100644
--- a/client/js/services/Compute.js
+++ b/client/js/services/Compute.js
@@ -14,11 +14,12 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 		var requestParserResult={};
 		requestParserResult.status=1;
 		requestParserResult.failReason=null;
-
+		console.log(response.data.Images[Object.keys(response.data.Images)[0]])
 		if (typeof response.data.Servers !== 'undefined') {
 			// Set status code
 			requestParserResult.status=0;
 			data.machines=response.data.Servers;
+
 		}
 		else if(failedToSendRequest){
 			requestParserResult.failReason="Failed to send request";
@@ -39,7 +40,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 		var params={
 			"token" : Identity.getToken(),
 			"task" : "compute",
-			"action":"listServers"
+			"action":"listImages"
 		};
 		
 		var result=$http.post('../server/index.php',
-- 
cgit v1.2.3


From 3c1fe7e6dcd80b19ed01ecf15fd0a69812a1bffa Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Tue, 1 Mar 2016 18:52:29 +0100
Subject: added disksize and ram to listServers

---
 server/core/Compute.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server/core/Compute.php b/server/core/Compute.php
index 131d02c..720ab0c 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -44,6 +44,8 @@ class compute
 		$servers[$server->id]["imageId"] = $server->image->id; 
 		$servers[$server->id]["flavorId"] = $server->flavor->id; 
 		$servers[$server->id]["status"] = $server->status;
+		$servers[$server->id]["ram"] = $server->flavor->ram;
+		$servers[$server->id]["disk"] = $server->flavor->disk;
 		}
 		$this->app->setOutput("Servers", $servers);
                 return;
-- 
cgit v1.2.3


From cdc3c2cdcb4fc863701afba9b48916857414208f Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Tue, 1 Mar 2016 19:08:30 +0100
Subject: test

---
 client/js/services/Compute.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js
index 28f8a69..f4e8fa8 100644
--- a/client/js/services/Compute.js
+++ b/client/js/services/Compute.js
@@ -14,7 +14,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 		var requestParserResult={};
 		requestParserResult.status=1;
 		requestParserResult.failReason=null;
-		console.log(response.data.Images[Object.keys(response.data.Images)[0]])
+		console.log(response.data.Servers[Object.keys(response.data.Servers)[0]])
 		if (typeof response.data.Servers !== 'undefined') {
 			// Set status code
 			requestParserResult.status=0;
@@ -40,7 +40,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 		var params={
 			"token" : Identity.getToken(),
 			"task" : "compute",
-			"action":"listImages"
+			"action":"listServers"
 		};
 		
 		var result=$http.post('../server/index.php',
-- 
cgit v1.2.3


From 603645dbeb9e4a20f0b086c15fbc418bdee58d2b Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Tue, 1 Mar 2016 20:02:27 +0100
Subject: fetch ram and disk for server's flavor in listServers

---
 server/core/Compute.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server/core/Compute.php b/server/core/Compute.php
index 720ab0c..a5b8375 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -39,6 +39,8 @@ class compute
 		$servers = Array();
 		foreach($serverList as $server){
 		$servers[$server->id] = Array();
+		$server->flavor->retrieve();
+		$server->image->retrieve();
 		$servers[$server->id]["id"]  = $server->id;
 		$servers[$server->id]["name"] = $server->name;
 		$servers[$server->id]["imageId"] = $server->image->id; 
-- 
cgit v1.2.3


From f1628e280abaf47bfdcabc7d463ce6ad5d0f0752 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Tue, 1 Mar 2016 20:20:05 +0100
Subject: Clean Identity service

---
 client/js/services/Identity.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/client/js/services/Identity.js b/client/js/services/Identity.js
index b1d2a48..da85ecd 100644
--- a/client/js/services/Identity.js
+++ b/client/js/services/Identity.js
@@ -48,6 +48,9 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 		$cookies.remove('profile');
 		$cookies.remove('token.part_0');
 		$cookies.remove('token.part_1');
+		token=null;
+		profile.username=null;
+		profile.projectname=null;
 	}
 
 	
@@ -81,6 +84,10 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 			$cookies.putObject('token.part_0', response.data.token.substring(0, middle), {'expires': expireDate});
 			// Save second part of token
 			$cookies.putObject('token.part_1', response.data.token.substring(middle, response.data.token.length), {'expires': expireDate});
+
+			// Put token in var
+			token=response.data.token;
+			
 		}
 		else if(failedToSendRequest){
 			requestParserResult.failReason="Failed to send request";
@@ -102,7 +109,7 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 	 * @param {string} projectname The user project name
 	 * @param {function} function to call when data is avalaible
 	 */
-	var login=function(username, password,projectname, callback){    
+	var login=function(username, password,projectname,callback){    
 		
 		// Set profile information (early)
 		profile.username=username;
@@ -120,6 +127,9 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 	};	
 
 
+
+
+	
 	/*
      * Get the profile
 	 */
@@ -133,6 +143,7 @@ mainApp.factory('Identity',[ '$http', '$cookies', function($http, $cookies){
 	var getToken=function(){
 		return token;
 	}
+
 	
 
 	// Return services objects
-- 
cgit v1.2.3


From 5ef1c9b8b1ab47b659f512db86e51dacf1bec860 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Tue, 1 Mar 2016 20:51:08 +0100
Subject: Edit machineDetails

---
 client/js/controllers/home/machineDetails.js |  1 +
 client/js/controllers/home/main.js           |  9 +++--
 client/js/services/Compute.js                | 55 +++++++++++++++-------------
 client/partials/home/machineDetails.html     | 14 +++----
 client/partials/home/main.html               |  9 +++--
 5 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/client/js/controllers/home/machineDetails.js b/client/js/controllers/home/machineDetails.js
index f84a073..7476c69 100644
--- a/client/js/controllers/home/machineDetails.js
+++ b/client/js/controllers/home/machineDetails.js
@@ -11,6 +11,7 @@ mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$
 
 	$scope.$on('showMachineDetailsEvent', function(eventName ,machine){
 		$scope.machine=machine;
+		console.log(machine);
 		$('#machineDetailsModal').modal({backdrop: false, keyboard: true});
 	});
 
diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js
index ee564b2..b44836b 100644
--- a/client/js/controllers/home/main.js
+++ b/client/js/controllers/home/main.js
@@ -6,18 +6,19 @@
 mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', function ($scope, Compute, $rootScope)
 {
 
-	var updatePage=function(){
-		// TODO Update graph etc...
+	var callMeAfterGetMachines=function(data){
+		$scope.machines=Compute.getData().machines;
 	}
 
 
+	Compute.pullMachines(callMeAfterGetMachines);
 
 
 	
-	$scope.raiseShowMachineDetailsEvent=function(){
+	$scope.raiseShowMachineDetailsEvent=function(id){
 		var callback=function(){
 			var data=Compute.getData();
-			$rootScope.$broadcast("showMachineDetailsEvent", data.machines[Object.keys(data.machines)[0]]);		
+			$rootScope.$broadcast("showMachineDetailsEvent", data.machines[id]);		
 	
 		}
 		Compute.pullMachines(callback);
diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js
index f4e8fa8..e2fb3df 100644
--- a/client/js/services/Compute.js
+++ b/client/js/services/Compute.js
@@ -2,19 +2,27 @@
 mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 
 
-	// Create data
+	// Init data
 	var data={};
-	data.machines={};
+	data.machines=null;
 	
 
 	
-	// Parser
-	var parseGetMachinesAnswer=function(response, failedToSendRequest){
+
+	/**
+	 * Retrieve machine list 
+	 * @param {response} the server response
+	 * @param {boolean} false if the request as been send true else
+	 * @return {requestParserResult} the result of parsing
+	 */
+	var parsePullMachinesAnswer=function(response, failedToSendRequest){
+
 		// Defined return object
 		var requestParserResult={};
 		requestParserResult.status=1;
 		requestParserResult.failReason=null;
-		console.log(response.data.Servers[Object.keys(response.data.Servers)[0]])
+
+		
 		if (typeof response.data.Servers !== 'undefined') {
 			// Set status code
 			requestParserResult.status=0;
@@ -27,44 +35,41 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 		else{
 			requestParserResult.failReason="Error";
 		}
-		
 		return requestParserResult;
-
-		
 	};
 
 
-	// Get Machine
+	/**
+	 * Retrieve machine list 
+	 * @param {callback} function to call after request complete
+	 */
 	var pullMachines=function(callback){
-
-		var params={
-			"token" : Identity.getToken(),
-			"task" : "compute",
-			"action":"listServers"
-		};
-		
+		// Send listServers request
 		var result=$http.post('../server/index.php',
-							  $.param(params));		
+							  $.param({"token" : Identity.getToken(), "task" : "compute", "action":"listServers"}));		
 
 		// Wait and handle the response
         result.then(function (response){
-
-			callback(parseGetMachinesAnswer(response, false));
+			callback(parsePullMachinesAnswer(response, false));
         },function(response){
-			alert(response.status);
-			callback(parseGetMachinesAnswer(response, true));
-        });		
-
-		
+			callback(parsePullMachinesAnswer(response, true));
+        });
 	};
 	
 
-
+	/**
+	 * Retrieve all data 
+	 * @param {callback} function to call after request complete
+	 */
 	var pullData=function(callback){
 		// TODO call getMachines etc...
 	}
 
 
+	/**
+	 * Get Data
+	 * @return {data} return the data object
+	 */
 	var getData=function(){
 		return data;
 	}
diff --git a/client/partials/home/machineDetails.html b/client/partials/home/machineDetails.html
index 606edcf..28c9165 100644
--- a/client/partials/home/machineDetails.html
+++ b/client/partials/home/machineDetails.html
@@ -21,11 +21,11 @@
 					<div class="form-group">
 						<label class="control-label col-sm-2" for="pwd">State</label>
 						<div class="col-sm-10">
-							<span ng-if="machine.online">Online</span>
-							<span ng-if="!machine.online">Offline</span>
+							<span ng-if="machine.status=='ACTIVE'">Online</span>
+							<span ng-if="machine.status!=='ACTIVE'">Offline</span>
 							&nbsp;
-							<button class="btn btn-danger" ng-if="machine.online" ng-click="toggleMachineState()">Turn Off</button>		 
-							<button class="btn btn-success" ng-if="!machine.online" ng-click="toggleMachineState()">Turn On</button>		 
+							<button class="btn btn-danger" ng-if="machine.status=='ACTIVE'" ng-click="toggleMachineState()">Turn Off</button>		 
+							<button class="btn btn-success" ng-if="machine.status!=='ACTIVE'" ng-click="toggleMachineState()">Turn On</button>		 
 							&nbsp;<img src="images/spin/32x32/Preloader_1.gif" id="waitingForToggleMachine"></span>
 
 							
@@ -34,7 +34,7 @@
 					<fieldset class="form-group">
 						<label class="control-label col-sm-2">RAM</label>
 						<select class="col-sm-20" id="ramSelected">
-							<option>128 MB</option>
+							<option>{{ machine.ram  }} MB</option>
 							<option>512 MB</option>
 							<option>1024 MB</option>
 							<option>2048 MB</option>
@@ -45,7 +45,7 @@
 					<fieldset class="form-group">
 						<label class="control-label col-sm-2">Disk</label>
 						<select class="col-sm-20" id="ramSelected">
-							<option>1 Go</option>
+							<option>{{ machine.disk }} Go</option>
 							<option>2 Go</option>
 							<option>5 Go</option>
 							<option>10 Go</option>
@@ -60,7 +60,7 @@
 					<fieldset class="form-group">
 						<label class="control-label col-sm-2">Image</label>
 						<select class="col-sm-20" id="ramSelected">
-							<option>Cirros</option>
+							<option>{{ machine.imageId  }}</option>
 							<option>Debian</option>
 							<option>Tiny Core</option>
 							<option>Centos</option>
diff --git a/client/partials/home/main.html b/client/partials/home/main.html
index 37638d3..77a9bc4 100644
--- a/client/partials/home/main.html
+++ b/client/partials/home/main.html
@@ -3,9 +3,10 @@
         Home 
     </div>
     <div class="panel-body">
-        Main Content
-		<button ng-click="raiseShowMachineDetailsEvent()" > Show Machine details</button>
-		<div id="test">
-		</div>
+        
+		
+		Selectionner une machine:
+		<div ng-repeat="machine in machines"> <a ng-click="raiseShowMachineDetailsEvent(machine.id)"> {{ machine.name  }}</a></div>
+		
     </div>
 </div>
-- 
cgit v1.2.3


From e9108d4b97132e853a71cb1dfbad6cf4bddb599b Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Tue, 1 Mar 2016 22:50:37 +0100
Subject: Finish details machine

---
 client/js/controllers/home/machineDetails.js |  3 +-
 client/js/controllers/home/main.js           |  6 +--
 client/js/services/Compute.js                | 64 ++++++++++++++++++++++++++--
 client/partials/home/machineDetails.html     | 22 ++--------
 4 files changed, 69 insertions(+), 26 deletions(-)

diff --git a/client/js/controllers/home/machineDetails.js b/client/js/controllers/home/machineDetails.js
index 7476c69..24fac42 100644
--- a/client/js/controllers/home/machineDetails.js
+++ b/client/js/controllers/home/machineDetails.js
@@ -9,8 +9,9 @@ mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', '$
 	$scope.machine={};
 	$("#waitingForToggleMachine").hide();
 
-	$scope.$on('showMachineDetailsEvent', function(eventName ,machine){
+	$scope.$on('showMachineDetailsEvent', function(eventName ,machine, axioms){
 		$scope.machine=machine;
+		$scope.axioms=axioms;
 		console.log(machine);
 		$('#machineDetailsModal').modal({backdrop: false, keyboard: true});
 	});
diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js
index b44836b..9d7ddfc 100644
--- a/client/js/controllers/home/main.js
+++ b/client/js/controllers/home/main.js
@@ -6,19 +6,19 @@
 mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', function ($scope, Compute, $rootScope)
 {
 
-	var callMeAfterGetMachines=function(data){
+	var callMeAfterPullData=function(data){
 		$scope.machines=Compute.getData().machines;
 	}
 
 
-	Compute.pullMachines(callMeAfterGetMachines);
+	Compute.pullData(callMeAfterPullData);
 
 
 	
 	$scope.raiseShowMachineDetailsEvent=function(id){
 		var callback=function(){
 			var data=Compute.getData();
-			$rootScope.$broadcast("showMachineDetailsEvent", data.machines[id]);		
+			$rootScope.$broadcast("showMachineDetailsEvent", data.machines[id], data.axioms);		
 	
 		}
 		Compute.pullMachines(callback);
diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js
index e2fb3df..36ddc16 100644
--- a/client/js/services/Compute.js
+++ b/client/js/services/Compute.js
@@ -5,12 +5,14 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 	// Init data
 	var data={};
 	data.machines=null;
-	
-
+	data.axioms={} // Contain static data
+	data.axioms.ram=[128,512,1024,2048,4096];
+	data.axioms.disk=[1,2,5,10,25,50,100,150,200]
+	data.axioms.images={}; // Retrieve after
 	
 
 	/**
-	 * Retrieve machine list 
+	 * Parse pullMachines answer
 	 * @param {response} the server response
 	 * @param {boolean} false if the request as been send true else
 	 * @return {requestParserResult} the result of parsing
@@ -55,14 +57,68 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 			callback(parsePullMachinesAnswer(response, true));
         });
 	};
+
+
+	/**
+	 * Parse pullImages answer
+	 * @param {response} the server response
+	 * @param {boolean} false if the request as been send true else
+	 * @return {requestParserResult} the result of parsing
+	 */
+	var parsePullImagesAnswer=function(response, failedToSendRequest){
+
+		// Defined return object
+		var requestParserResult={};
+		requestParserResult.status=1;
+		requestParserResult.failReason=null;
+
+		
+		if (typeof response.data.Images !== 'undefined') {
+			// Set status code
+			requestParserResult.status=0;
+			data.axioms.images=response.data.Images;
+		}
+		else if(failedToSendRequest){
+			requestParserResult.failReason="Failed to send request";
+		}
+		else{
+			requestParserResult.failReason="Error";
+		}
+		return requestParserResult;
+	};
+
+
+
 	
+	/**
+	 * Retrieve machine list 
+	 * @param {callback} function to call after request complete
+	 */
+	var pullImages=function(callback){
+		// Send listServers request
+		var result=$http.post('../server/index.php',
+							  $.param({"token" : Identity.getToken(), "task" : "compute", "action":"listImages"}));		
+
+		// Wait and handle the response
+        result.then(function (response){
+			callback(parsePullImagesAnswer(response, false));
+        },function(response){
+			callback(parsePullImagesAnswer(response, true));
+        });
+	};
+
 
 	/**
 	 * Retrieve all data 
 	 * @param {callback} function to call after request complete
 	 */
 	var pullData=function(callback){
-		// TODO call getMachines etc...
+		var nextFunction=function(response){
+			if(response.status==0){
+				pullMachines(callback);
+			}
+		}
+		pullImages(nextFunction);
 	}
 
 
diff --git a/client/partials/home/machineDetails.html b/client/partials/home/machineDetails.html
index 28c9165..47a65fb 100644
--- a/client/partials/home/machineDetails.html
+++ b/client/partials/home/machineDetails.html
@@ -34,36 +34,22 @@
 					<fieldset class="form-group">
 						<label class="control-label col-sm-2">RAM</label>
 						<select class="col-sm-20" id="ramSelected">
-							<option>{{ machine.ram  }} MB</option>
-							<option>512 MB</option>
-							<option>1024 MB</option>
-							<option>2048 MB</option>
-							<option>4096 MB</option>
+							<option ng-repeat="ram in axioms.ram" ng-selected="machine.ram == ram">{{ ram }}</option>
 						</select>
+						<span>MB</span>
 					</fieldset>
 
 					<fieldset class="form-group">
 						<label class="control-label col-sm-2">Disk</label>
 						<select class="col-sm-20" id="ramSelected">
-							<option>{{ machine.disk }} Go</option>
-							<option>2 Go</option>
-							<option>5 Go</option>
-							<option>10 Go</option>
-							<option>25 Go</option>
-							<option>50 Go</option>
-							<option>100 Go</option>
-							<option>150 Go</option>
-							<option>200 Go</option>
+							<option ng-repeat="disk in axioms.disk" ng-selected="machine.disk == disk">{{ disk }}</option>
 						</select>
 					</fieldset>
 
 					<fieldset class="form-group">
 						<label class="control-label col-sm-2">Image</label>
 						<select class="col-sm-20" id="ramSelected">
-							<option>{{ machine.imageId  }}</option>
-							<option>Debian</option>
-							<option>Tiny Core</option>
-							<option>Centos</option>
+							<option ng-repeat="image in axioms.images" ng-selected="machine.imageId == Object.keys(image)">{{ image.name }}</option>
 						</select>
 					</fieldset>
 
-- 
cgit v1.2.3


From 2d99f1ecf2164431b03eff5bcbaa7abe67287602 Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Wed, 2 Mar 2016 07:14:05 +0100
Subject: Create loading service

---
 client/index.html                  |  4 +++-
 client/js/controllers/home/main.js |  8 ++++++--
 client/js/services/Loading.js      | 22 ++++++++++++++++++++++
 client/partials/loading.html       | 18 ++++++++++++++++++
 4 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 client/js/services/Loading.js
 create mode 100644 client/partials/loading.html

diff --git a/client/index.html b/client/index.html
index 8d81ac3..8ca2b9f 100644
--- a/client/index.html
+++ b/client/index.html
@@ -28,8 +28,9 @@
                     <div ng-include="'./partials/login.html'"></div>
 					<!-- Machine Details Overlay -->
                     <div ng-include="'./partials/home/machineDetails.html'"></div>
+					<div ng-include="'./partials/loading.html'"></div>
 
-                    <!-- Nav -->
+					<!-- Nav -->
                     <div ng-include="'./partials/nav.html'"></div>
                 </div>
             </div>
@@ -79,6 +80,7 @@
     <script src="./js/services/Identity.js"></script>
     <script src="./js/services/Image.js"></script>
     <script src="./js/services/Compute.js"></script>
+    <script src="./js/services/Loading.js"></script>
 	
     <!-- Include controller -->
     <script src="./js/controllers/login.js"></script>
diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js
index 9d7ddfc..2e9c00b 100644
--- a/client/js/controllers/home/main.js
+++ b/client/js/controllers/home/main.js
@@ -3,24 +3,28 @@
  * 
  * @param {$scope} $scope The $scope service from angular
  */
-mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', function ($scope, Compute, $rootScope)
+mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading', function ($scope, Compute, $rootScope, Loading)
 {
 
 	var callMeAfterPullData=function(data){
 		$scope.machines=Compute.getData().machines;
+			Loading.stop();
 	}
 
-
+	Loading.start();
 	Compute.pullData(callMeAfterPullData);
 
 
 	
 	$scope.raiseShowMachineDetailsEvent=function(id){
+
 		var callback=function(){
+			Loading.stop();
 			var data=Compute.getData();
 			$rootScope.$broadcast("showMachineDetailsEvent", data.machines[id], data.axioms);		
 	
 		}
+		Loading.start();
 		Compute.pullMachines(callback);
 	}
 
diff --git a/client/js/services/Loading.js b/client/js/services/Loading.js
new file mode 100644
index 0000000..b12aaa0
--- /dev/null
+++ b/client/js/services/Loading.js
@@ -0,0 +1,22 @@
+
+mainApp.factory('Loading',[ '$http', 'Identity', function($http, Identity){
+
+
+
+
+	var start=function(){
+		$('#loadingModal').modal({backdrop: 'static', keyboard: false});	
+	};
+
+	var stop=function(){
+		$('#loadingModal').modal('hide');
+	}
+
+
+	return {
+		start:start,
+		stop:stop
+	};
+
+
+}]);
diff --git a/client/partials/loading.html b/client/partials/loading.html
new file mode 100644
index 0000000..c978190
--- /dev/null
+++ b/client/partials/loading.html
@@ -0,0 +1,18 @@
+<div class="modal fade" id="loadingModal" ng-controller="loginCtrl">
+    <div class="modal-dialog">
+        <div class="modal-content"></div>
+    </div>
+    <div class="modal-dialog" style="width:200px;">
+        <div class="modal-content">
+
+            <div class="modal-body" >
+				<div align="center">
+					<img src="images/spin/128x128/Preloader_8.gif" />
+				</div>
+
+
+            </div>
+
+        </div>
+    </div>
+</div>
-- 
cgit v1.2.3


From b6d7d2c30efe5e9758072bb82ea3a947bda7fd1d Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Wed, 2 Mar 2016 07:25:28 +0100
Subject: Correct bug

---
 client/js/controllers/home/main.js | 10 +++++++---
 client/partials/home/main.html     |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js
index 2e9c00b..f84f625 100644
--- a/client/js/controllers/home/main.js
+++ b/client/js/controllers/home/main.js
@@ -3,7 +3,7 @@
  * 
  * @param {$scope} $scope The $scope service from angular
  */
-mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading', function ($scope, Compute, $rootScope, Loading)
+mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','Identity', function ($scope, Compute, $rootScope, Loading, Identity)
 {
 
 	var callMeAfterPullData=function(data){
@@ -11,8 +11,12 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading', f
 			Loading.stop();
 	}
 
-	Loading.start();
-	Compute.pullData(callMeAfterPullData);
+	;
+	if(Compute.getData().machines == null && Identity.isAlreadyLogin()){
+		Loading.start();
+		Compute.pullData(callMeAfterPullData);		
+	}
+
 
 
 	
diff --git a/client/partials/home/main.html b/client/partials/home/main.html
index 77a9bc4..f9f8878 100644
--- a/client/partials/home/main.html
+++ b/client/partials/home/main.html
@@ -4,7 +4,7 @@
     </div>
     <div class="panel-body">
         
-		
+		Pour charger les machines, recharger la page (temporaire)<br />
 		Selectionner une machine:
 		<div ng-repeat="machine in machines"> <a ng-click="raiseShowMachineDetailsEvent(machine.id)"> {{ machine.name  }}</a></div>
 		
-- 
cgit v1.2.3