Merge pull request #238 from fogbow/support-compute-post

Support compute post

Author: giovannifs

manager.conf.example

@@ -215,3 +215,19 @@ ssh_public_key=/etc/fogbow-manager/ssh/id_rsa.pub
 
 ## Benchmarking (Vanilla Benchmarking Plugin)
 # benchmarking_class=org.fogbowcloud.manager.core.plugins.benchmarking.VanillaBenchmarkingPlugin
+
+
+## OCCI extra resources
+#occi_extra_resource_file_path=
+
+
+public_key; scheme="http://schemas.openstack.org/instance/credentials#"; class="mixin"; 
+org.openstack.credentials.publickey.data
+
+# Request public key properties
+occi_extra_resource_fogbow_public_key=public_key
+occi_extra_resource_org.fogbowcloud.credentials.publickey.data=org.openstack.credentials.publickey.data
+
+# Request userdata properties
+occi_extra_resource_fogbow_userdata=user_data
+occi_extra_resource_org.fogbowcloud.request.extra-user-data=org.openstack.compute.user_data

src/main/java/org/fogbowcloud/manager/Main.java

@@ -144,6 +144,16 @@ public static void main(String[] args) throws Exception {
 			LOGGER.warn("Federation user crendetail plugin not specified in properties. Using the default one.", e);
 		}		
 
+		String occiExtraResourcesPath = properties
+				.getProperty(ConfigurationConstants.OCCI_EXTRA_RESOURCES_KEY_PATH);
+		if (occiExtraResourcesPath != null && !occiExtraResourcesPath.isEmpty()) {
+			if (properties.getProperty(ConfigurationConstants.INSTANCE_DATA_STORE_URL) == null) {
+				LOGGER.error("If OCCI extra resources was set for supporting post-compute, you must also set instance datastore property ("
+						+ ConfigurationConstants.INSTANCE_DATA_STORE_URL + ").");
+				System.exit(EXIT_ERROR_CODE);
+			}
+		}
+		
 		PrioritizationPlugin prioritizationPlugin = new TwoFoldPrioritizationPlugin(properties,
 				accountingPlugin);
 

src/main/java/org/fogbowcloud/manager/core/ConfigurationConstants.java

@@ -25,6 +25,7 @@ public class ConfigurationConstants {
 	public static final String LOCAL_PREFIX = "local_";
 	public static final String FEDERATION_PREFIX = "federation_";
 	public static final String PREFIX_FLAVORS = "flavor_";
+	public static final String OCCI_EXTRA_RESOURCES_PREFIX = "occi_extra_resource_";
 
 	// periods
 	public static final String ORDER_BD_UPDATER_PERIOD_KEY = "order_bd_updater_period";
@@ -50,4 +51,10 @@ public class ConfigurationConstants {
 	public static final String HTTP_PORT_KEY = "http_port";
 
 	public static final String PROP_MAX_WHOISALIVE_MANAGER_COUNT = "max_whoisalive_manager_count";
+	
+	// OCCI extra resource
+	public static final String OCCI_EXTRA_RESOURCES_KEY_PATH = "occi_extra_resource_file_path";
+	
+	// Instance Data Store
+	public static final String INSTANCE_DATA_STORE_URL = "instance_datastore_url";
 }

src/main/java/org/fogbowcloud/manager/occi/JSONHelper.java

@@ -0,0 +1,80 @@
+package org.fogbowcloud.manager.occi;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.fogbowcloud.manager.occi.instance.Instance.Link;
+import org.fogbowcloud.manager.occi.model.Category;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class JSONHelper {
+		
+	public static Map<String, String> toMap(String jsonStr) {
+		Map<String, String> newMap = new HashMap<String, String>();
+		jsonStr = jsonStr.replace("{", "").replace("}", "");
+		String[] blocks = jsonStr.split(",");
+		for (int i = 0; i < blocks.length; i++) {
+			String block = blocks[i];
+			int indexOfCarac = block.indexOf("=");
+			if (indexOfCarac < 0) {
+				continue;
+			}
+			String key = block.substring(0, indexOfCarac).trim();
+			String value = block.substring(indexOfCarac + 1, block.length()).trim();
+			newMap.put(key, value);
+		}
+		return newMap;
+	}
+
+	public static Map<String, String> getXOCCIAttrFromJSON(String jsonStr) throws JSONException {
+		JSONObject jsonObject = new JSONObject(jsonStr);
+		return toMap(jsonObject.optString("xocci_attributes"));
+	}
+	
+	public static JSONObject mountXOCCIAttrJSON(Map<String, String> xOCCIAtt) throws JSONException {
+		return new JSONObject().put("xocci_attributes", xOCCIAtt != null ? xOCCIAtt.toString()
+				: null);
+	}
+	
+	public static List<Category> getCategoriesFromJSON(String jsonArrayString) throws JSONException {
+		List<Category> categories = new ArrayList<Category>();
+		JSONArray jsonArray = new JSONArray(jsonArrayString);
+		for (int i = 0; i < jsonArray.length(); i++) {
+			categories.add(Category.fromJSON(jsonArray.getString(i)));
+		}
+		
+		return categories;
+	}
+	
+	public static JSONArray mountCategoriesJSON(List<Category> categories) throws JSONException {
+		List<JSONObject> categoryObj = new ArrayList<JSONObject>();
+		for (Category category : categories != null ? categories : new ArrayList<Category>()) {
+			categoryObj.add(category.toJSON());
+		}
+		return new JSONArray(categoryObj);
+	}
+
+	public static JSONArray mountLinksJSON(List<Link> links) throws JSONException {
+		List<JSONObject> linkObj = new ArrayList<JSONObject>();
+		for (Link link : links != null ? links : new ArrayList<Link>()) {
+			linkObj.add(link.toJSON());
+		}
+		return new JSONArray(linkObj);
+	}
+	
+	public static List<Link> getLinksFromJSON(String jsonArrayString) throws JSONException {
+		if (jsonArrayString == null) {
+			return null;
+		}
+		List<Link> links = new ArrayList<Link>();
+		JSONArray jsonArray = new JSONArray(jsonArrayString);
+		for (int i = 0; i < jsonArray.length(); i++) {
+			links.add(Link.fromJSON(jsonArray.getString(i)));
+		}
+		return links;
+	}
+}

src/main/java/org/fogbowcloud/manager/occi/OCCIApplication.java

@@ -42,9 +42,9 @@ public Restlet createInboundRoot() {
 		router.attach("/" + RequestConstants.TERM, RequestServerResource.class);
 		router.attach("/" + RequestConstants.TERM + "/", RequestServerResource.class);
 		router.attach("/" + RequestConstants.TERM + "/{requestId}", RequestServerResource.class);
-		router.attach("/compute", ComputeServerResource.class);
-		router.attach("/compute/", ComputeServerResource.class);
-		router.attach("/compute/{instanceId}", ComputeServerResource.class);
+		router.attach("/" + RequestConstants.COMPUTE_TERM, ComputeServerResource.class);
+		router.attach("/" + RequestConstants.COMPUTE_TERM + "/", ComputeServerResource.class);
+		router.attach("/" + RequestConstants.COMPUTE_TERM + "/{instanceId}", ComputeServerResource.class);
 		router.attach("/members", MemberServerResource.class);
 		//TODO remove this endpoint
 		router.attach("/token", TokenServerResource.class);
@@ -196,4 +196,8 @@ public ResourcesInfo getLocalUserQuota(String localAccessToken) {
 		return managerFacade.getLocalUserQuota(localAccessToken);
 	}
 
+	public String getUser(String authToken) {
+		return managerFacade.getUser(authToken);
+	}
+
 }