Merge pull request #184 from fogbow/develop

enabling BC provider in CertificateUtils
fogbow · Apr 22, 2015 · 2c275e2 · 2c275e2
2 parents 0f9a8bb + 5f94a1a
commit 2c275e2
Show file tree

Hide file tree

Showing 81 changed files with 4,536 additions and 1,382 deletions.
diff --git a/.m2/condor/classad/2.4/classad-2.4.jar b/.m2/condor/classad/2.4/classad-2.4.jar
diff --git a/bin/start-manager b/bin/start-manager
@@ -7,4 +7,4 @@ CONF_LOG=-Dlog4j.configuration=file:$LOG4J
 else
 CONF_LOG=
 fi
-java $CONF_LOG -cp target/manager-0.0.1-SNAPSHOT.jar:target/lib/* org.fogbowcloud.manager.Main manager.conf > /dev/null &
+java $CONF_LOG -cp target/manager-0.0.1-SNAPSHOT.jar:target/lib/* org.fogbowcloud.manager.Main manager.conf > /dev/null &
diff --git a/manager.conf.example b/manager.conf.example
@@ -39,22 +39,31 @@ compute_occi_resource_scheme=http://schemas.openstack.org/template/resource#
 compute_occi_network_id=ea51ed0c-0e8a-448d-8202-c79777109ffe
 
 # If you are using the EgiImageStoragePlugin
-image_storage_class=org.fogbowcloud.manager.core.plugins.egi.EgiImageStoragePlugin
+image_storage_class=org.fogbowcloud.manager.core.plugins.imagestorage.egi.EgiImageStoragePlugin
 image_storage_egi_base_url=http://lsd.ufcg.edu.br/~user/vm/ 
 image_storage_egi_tmp_storage=/tmp/ 
 
 # If you are using the EgiApplianceImageStoragePlugin
-image_storage_class=org.fogbowcloud.manager.core.plugins.appliance.EgiApplianceImageStoragePlugin
+image_storage_class=org.fogbowcloud.manager.core.plugins.imagestorage.appliance.EgiApplianceImageStoragePlugin
 image_storage_appliance_base_url=http://appliance-repo.egi.eu/images
 image_storage_appliance_tmp_storage=/tmp/
 
+# If you are using the VMCatcherStoragePlugin
+image_storage_class=org.fogbowcloud.manager.core.plugins.imagestorage.vmcatcher.VMCatcherStoragePlugin
+image_storage_vmcatcher_glancepush_vmcmapping_file=/etc/vmcatcher/vmcmapping
+image_storage_vmcatcher_push_method=glancepush
+image_storage_vmcatcher_push_method=cesga
+
+# Applies to all image storage plugins
 image_storage_static_fogbow-linux-x86=55d938ef-57d1-44ea-8155-6036d170780a 
 image_storage_static_fogbow-ubuntu-1204=81765250-a4e4-440d-a215-43c9c0849120
 
 member_picker_class=org.fogbowcloud.manager.core.RoundRobinMemberPicker
-#If you are using NoFMemberPicker class
+#If you are using NoFMemberPicker or NoFPrioritizationPlugin classes
 nof_trustworthy=false
 
+local_prioritization_plugin_class=org.fogbowcloud.manager.core.plugins.prioritization.FCFSPrioritizationPlugin
+remote_prioritization_plugin_class=org.fogbowcloud.manager.core.plugins.prioritization.nof.NoFPrioritizationPlugin
 
 compute_class=org.fogbowcloud.manager.core.plugins.openstack.OpenStackNovaV2ComputePlugin
 compute_novav2_url=http://localhost:8774

diff --git a/pom.xml b/pom.xml
@@ -6,20 +6,20 @@
   <version>0.0.1-SNAPSHOT</version>
 
   <repositories>
+	<repository>
+	  <id>local</id>
+	  <url>file://${basedir}/.m2</url>
+	</repository>
     <repository>
-      <id>maven-restlet</id>
-      <name>Public online Restlet repository</name>
-      <url>http://maven.restlet.org</url>
-    </repository>
+	  <id>maven-restlet</id>
+	  <name>Public online Restlet repository</name>
+	  <url>http://maven.restlet.com</url>
+	</repository> 
     <repository>
       <id>contrail</id>
       <name>Contrail repository</name>
       <url>http://contrail.ow2.org/repositories/thirdparty</url>
     </repository>
-    <repository>
-	  <id>local</id>
-	  <url>file://${basedir}/.m2</url>
-	</repository>
   </repositories>
 
   <build>
@@ -138,7 +138,12 @@
     <dependency>
       <groupId>org.jamppa</groupId>
       <artifactId>jamppa</artifactId>
-      <version>0.1.1</version>
+      <version>0.1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>condor</groupId>
+      <artifactId>classad</artifactId>
+      <version>2.4</version>
     </dependency>
     <dependency>
       <groupId>org.opennebula</groupId>
@@ -210,6 +215,11 @@
 		<artifactId>h2</artifactId>
 		<version>1.4.186</version>
 	</dependency>
+	<dependency>
+		<groupId>javax.mail</groupId>
+		<artifactId>mail</artifactId>
+		<version>1.4</version>
+	</dependency>
 
   </dependencies>
 

diff --git a/src/main/java/org/fogbowcloud/manager/Main.java b/src/main/java/org/fogbowcloud/manager/Main.java
@@ -17,10 +17,13 @@
 import org.fogbowcloud.manager.core.plugins.ComputePlugin;
 import org.fogbowcloud.manager.core.plugins.IdentityPlugin;
 import org.fogbowcloud.manager.core.plugins.ImageStoragePlugin;
+import org.fogbowcloud.manager.core.plugins.PrioritizationPlugin;
 import org.fogbowcloud.manager.core.plugins.accounting.FCUAccountingPlugin;
 import org.fogbowcloud.manager.core.plugins.benchmarking.FCUStaticBenchmarkingPlugin;
-import org.fogbowcloud.manager.core.plugins.egi.EgiImageStoragePlugin;
+import org.fogbowcloud.manager.core.plugins.prioritization.TwoFoldPrioritizationPlugin;
+import org.fogbowcloud.manager.core.plugins.imagestorage.egi.EgiImageStoragePlugin;
 import org.fogbowcloud.manager.occi.OCCIApplication;
+import org.fogbowcloud.manager.occi.core.ResourceRepository;
 import org.fogbowcloud.manager.xmpp.ManagerXmppComponent;
 import org.restlet.Component;
 import org.restlet.data.Protocol;
@@ -39,7 +42,8 @@ public static void main(String[] args) throws Exception {
 		Properties properties = new Properties();
 		FileInputStream input = new FileInputStream(args[0]);
 		properties.load(input);
-
+		ResourceRepository.init(properties);
+
 		ComputePlugin computePlugin = null;
 		try {
 			computePlugin = (ComputePlugin) createInstance(
@@ -127,6 +131,9 @@ public static void main(String[] args) throws Exception {
 			memberPickerPlugin = new RoundRobinMemberPicker(properties, accountingPlugin);
 			LOGGER.warn("Member picker plugin not specified in properties. Using the default one.", e);
 		}
+
+		PrioritizationPlugin prioritizationPlugin = new TwoFoldPrioritizationPlugin(properties,
+				accountingPlugin);
 
 		ManagerController facade = new ManagerController(properties);
 		facade.setComputePlugin(computePlugin);
@@ -138,6 +145,7 @@ public static void main(String[] args) throws Exception {
 		facade.setBenchmarkingPlugin(benchmarkingPlugin);
 		facade.setAccountingPlugin(accountingPlugin);
 		facade.setMemberPickerPlugin(memberPickerPlugin);
+		facade.setPrioritizationPlugin(prioritizationPlugin);
 
 		ManagerXmppComponent xmpp = new ManagerXmppComponent(
 				properties.getProperty(ConfigurationConstants.XMPP_JID_KEY),

diff --git a/src/main/java/org/fogbowcloud/manager/core/ConfigurationConstants.java b/src/main/java/org/fogbowcloud/manager/core/ConfigurationConstants.java
@@ -19,6 +19,8 @@ public class ConfigurationConstants {
 	public static final String MEMBER_VALIDATOR_KEY = "member_validator";
 	public static final String HTTP_PORT_KEY = "http_port";
 
+	public static final String PREFIX_FLAVORS = "flavor_";
+
 	//federation user
 	public static final String FEDERATION_USER_NAME_KEY = "local_proxy_account_user_name";
 	public static final String FEDERATION_USER_PASS_KEY = "local_proxy_account_password";

diff --git a/src/main/java/org/fogbowcloud/manager/core/FederationMemberPicker.java b/src/main/java/org/fogbowcloud/manager/core/FederationMemberPicker.java
@@ -1,9 +1,11 @@
 package org.fogbowcloud.manager.core;
 
+import java.util.List;
+
 import org.fogbowcloud.manager.core.model.FederationMember;
 
 public interface FederationMemberPicker {
 
-	public FederationMember pick(ManagerController facade);
+	public FederationMember pick(List<FederationMember> members);
 
 }