Merge pull request #142 from fogbow/develop

Fixing bypass OCCIApplication.

Author: abmargb

bin/start-manager

@@ -22,11 +22,17 @@ compute_occi_flavor_large=m1-large
 compute_occi_os_scheme=http://schemas.openstack.org/template/os#
 compute_occi_instance_scheme=http://schemas.openstack.org/compute/instance#
 compute_occi_resource_scheme=http://schemas.openstack.org/template/resource#
-compute_occi_image_fogbow-linux-x86=cadf2e29-7216-4a5e-9364-cf6513d5f1fd
 compute_occi_network_id=ea51ed0c-0e8a-448d-8202-c79777109ffe
 
+image_storage_class=org.fogbowcloud.manager.core.plugins.egi.EgiImageStoragePlugin
+image_storage_egi_base_url=http://lsd.ufcg.edu.br/~user/vm/ 
+image_storage_egi_tmp_storage=/tmp/ 
+image_storage_static_fogbow-linux-x86=55d938ef-57d1-44ea-8155-6036d170780a 
+image_storage_static_fogbow-ubuntu-1204=81765250-a4e4-440d-a215-43c9c0849120
+
 compute_class=org.fogbowcloud.manager.core.plugins.openstack.OpenStackNovaV2ComputePlugin
 compute_novav2_url=http://localhost:8774
+compute_glancev2_url=http://localhost:9292
 compute_novav2_flavor_small=1
 compute_novav2_flavor_medium=2
 compute_novav2_flavor_large=3
@@ -60,6 +66,6 @@ ssh_tunnel_host_port=2222
 
 my_ip=127.0.0.1
 
-http_port = 8182
+http_port=8182
 
 max_whoisalive_manager_count=100

manager.conf.example

@@ -194,7 +194,12 @@
 	  <groupId>org.apache.ws.commons.util</groupId>
 	  <artifactId>ws-commons-util</artifactId>
 	  <version>1.0.2</version>
-	</dependency>		
+	</dependency>
+	<dependency>
+		<groupId>net.schmizz</groupId>
+		<artifactId>sshj</artifactId>
+		<version>0.8.1</version>
+	</dependency>
   </dependencies>
 
 </project>

pom.xml

@@ -12,9 +12,8 @@
 import org.fogbowcloud.manager.core.plugins.AuthorizationPlugin;
 import org.fogbowcloud.manager.core.plugins.ComputePlugin;
 import org.fogbowcloud.manager.core.plugins.IdentityPlugin;
-import org.fogbowcloud.manager.core.plugins.common.AllowAllAuthorizationPlugin;
-import org.fogbowcloud.manager.core.plugins.openstack.KeystoneIdentityPlugin;
-import org.fogbowcloud.manager.core.plugins.openstack.OpenStackOCCIComputePlugin;
+import org.fogbowcloud.manager.core.plugins.ImageStoragePlugin;
+import org.fogbowcloud.manager.core.plugins.egi.EgiImageStoragePlugin;
 import org.fogbowcloud.manager.occi.OCCIApplication;
 import org.fogbowcloud.manager.xmpp.ManagerXmppComponent;
 import org.restlet.Component;
@@ -39,7 +38,7 @@ public static void main(String[] args) throws Exception {
 			computePlugin = (ComputePlugin) createInstance(
 					ConfigurationConstants.COMPUTE_CLASS_KEY, properties);
 		} catch (Exception e) {
-			LOGGER.warn("Compute Plugin not especified in the properties.");
+			LOGGER.warn("Compute Plugin not especified in the properties.", e);
 			return;
 		}
 
@@ -48,7 +47,7 @@ public static void main(String[] args) throws Exception {
 			authorizationPlugin = (AuthorizationPlugin) createInstance(
 					ConfigurationConstants.AUTHORIZATION_CLASS_KEY, properties);
 		} catch (Exception e) {
-			LOGGER.warn("Authorization Plugin not especified in the properties.");
+			LOGGER.warn("Authorization Plugin not especified in the properties.", e);
 			return;
 		}
 
@@ -57,15 +56,16 @@ public static void main(String[] args) throws Exception {
 			localIdentityPlugin = (IdentityPlugin) getIdentityPluginByPrefix(properties,
 					ConfigurationConstants.LOCAL_PREFIX);
 		} catch (Exception e) {
-			LOGGER.warn("Local Identity Plugin not especified in the properties.");
+			LOGGER.warn("Local Identity Plugin not especified in the properties.", e);
 			return;
 		}
+		
 		IdentityPlugin federationIdentityPlugin = null;
 		try {
 			federationIdentityPlugin = (IdentityPlugin) getIdentityPluginByPrefix(properties,
 					ConfigurationConstants.FEDERATION_PREFIX);
 		} catch (Exception e) {
-			LOGGER.warn("Federation Identity Plugin not especified in the properties.");
+			LOGGER.warn("Federation Identity Plugin not especified in the properties.", e);
 			return;
 		}
 
@@ -76,12 +76,28 @@ public static void main(String[] args) throws Exception {
 		} catch (Exception e) {
 			LOGGER.warn("Member Validator not especified in the properties.");
 		}
+		
+		if (properties.get(ConfigurationConstants.RENDEZVOUS_JID_KEY) == null
+				|| properties.get(ConfigurationConstants.RENDEZVOUS_JID_KEY).toString().isEmpty()) {
+			LOGGER.warn("Rendezvous (" + ConfigurationConstants.RENDEZVOUS_JID_KEY
+					+ ") not especified in the properties.");
+		}
+		
+		ImageStoragePlugin imageStoragePlugin = null;
+		try {
+			imageStoragePlugin = (ImageStoragePlugin) createInstanceWithComputePlugin(
+					ConfigurationConstants.IMAGE_STORAGE_PLUGIN_CLASS, properties, computePlugin);
+		} catch (Exception e) {
+			imageStoragePlugin = new EgiImageStoragePlugin(properties, computePlugin);
+			LOGGER.warn("Image Storage plugin not specified in properties. Using the default one.", e);
+		}
 
 		ManagerController facade = new ManagerController(properties);
 		facade.setComputePlugin(computePlugin);
 		facade.setAuthorizationPlugin(authorizationPlugin);
 		facade.setLocalIdentityPlugin(localIdentityPlugin);
 		facade.setFederationIdentityPlugin(federationIdentityPlugin);
+		facade.setImageStoragePlugin(imageStoragePlugin);
 		facade.setValidator(validator);
 
 		ManagerXmppComponent xmpp = new ManagerXmppComponent(
@@ -131,6 +147,12 @@ private static Object createInstance(String propName, Properties properties) thr
 		return Class.forName(properties.getProperty(propName)).getConstructor(Properties.class)
 				.newInstance(properties);
 	}
+	
+	private static Object createInstanceWithComputePlugin(String propName, 
+			Properties properties, ComputePlugin computePlugin) throws Exception {
+		return Class.forName(properties.getProperty(propName)).getConstructor(Properties.class, ComputePlugin.class)
+				.newInstance(properties, computePlugin);
+	}
 
 	private static void configureLog4j() {
 		ConsoleAppender console = new ConsoleAppender();

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

@@ -0,0 +1,9 @@
+package org.fogbowcloud.manager.core;
+
+public interface AsynchronousRequestCallback {
+	
+	public void success(String instanceId);
+	
+	public void error(Throwable t);
+
+}

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

@@ -50,5 +50,6 @@ public class ConfigurationConstants {
 
 	//pagination
 	public static final String MAX_WHOISALIVE_MANAGER_COUNT = "max_whoisalive_manager_count";
+	public static final String IMAGE_STORAGE_PLUGIN_CLASS = "image_storage_class";
 
 }