Correct conflicts

1 files changed, 113 insertions, 12 deletions

diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js
index 70359ee..36ddc16 100644
--- a/client/js/services/Compute.js
+++ b/client/js/services/Compute.js
@@ -2,38 +2,139 @@
 mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
 
 
-	
+	// Init data
 	var data={};
-	data.machines={};
+	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
 	
 
-	// Parser
-	var parseGetMachinesAnswer=function(response, failedToSendRequest){
+	/**
+	 * 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
+	 */
+	var parsePullMachinesAnswer=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){
 
+	/**
+	 * Retrieve machine list 
+	 * @param {callback} function to call after request complete
+	 */
+	var pullMachines=function(callback){
+		// Send listServers request
 		var result=$http.post('../server/index.php',
-						  $.param({"token" : Identity.profile.token, "task" : "Compute"}));		
+							  $.param({"token" : Identity.getToken(), "task" : "compute", "action":"listServers"}));		
+
+		// Wait and handle the response
+        result.then(function (response){
+			callback(parsePullMachinesAnswer(response, false));
+        },function(response){
+			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);
 	}
 
-		
+
+	/**
+	 * Get Data
+	 * @return {data} return the data object
+	 */
+	var getData=function(){
+		return data;
+	}
+	
 	// Return services objects
 	return {
-		getMachines: getMachines,
+		pullMachines: pullMachines,
 		pullData: pullData,
-		data:data
+		getData: getData
 	};