Merge branch 'loic' into develop

1 files changed, 29 insertions, 7 deletions

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