Merge pull request #188 from fogbow/prioritization

Prioritization

Author: giovannifs

bin/start-manager

@@ -0,0 +1,10 @@
+#!/bin/bash
+DIRNAME=`dirname $0`
+LOG4J=log4j.properties
+cd $DIRNAME/..
+if [ -f $LOG4J ]; then
+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 &

manager.conf.example

@@ -59,9 +59,11 @@ 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

pom.xml

@@ -138,7 +138,7 @@
     <dependency>
       <groupId>org.jamppa</groupId>
       <artifactId>jamppa</artifactId>
-      <version>0.1.1</version>
+      <version>0.1.2</version>
     </dependency>
     <dependency>
       <groupId>condor</groupId>

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

@@ -17,8 +17,10 @@
 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.prioritization.TwoFoldPrioritizationPlugin;
 import org.fogbowcloud.manager.core.plugins.imagestorage.egi.EgiImageStoragePlugin;
 import org.fogbowcloud.manager.occi.OCCIApplication;
 import org.fogbowcloud.manager.occi.core.ResourceRepository;
@@ -129,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);
@@ -140,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),