Merge pull request #190 from fogbow/develop

Tests for VMCatcherStoragePlugin

bin/fogbow-cloud-config.cfg

@@ -0,0 +1,9 @@
+#cloud-config
+users:
+  - name: #TOKEN_MANAGER_SSH_USER#
+    chpasswd: {expire: False}
+    ssh_pwauth: True
+    shell: /bin/bash
+    sudo: ALL=(ALL) NOPASSWD:ALL
+    ssh_authorized_keys:
+      - #TOKEN_MANAGER_SSH_PUBLIC_KEY#

manager.conf.example

@@ -6,13 +6,20 @@ xmpp_port=5347
 rendezvous_jid=rendezvous.test.com
 greensitter_jid=greensitter.test.com
 
+# That flavor specification will be transformed into requirements.
+flavor_fogbow_small={mem=512, cpu=1}
+flavor_fogbow_medium={mem=1024, cpu=2}
+flavor_fogbow_large={mem=2048, cpu=4}
+
+# Compute Opennebula
 compute_class=org.fogbowcloud.manager.core.plugins.opennebula.OpenNebulaComputePlugin
 compute_one_url=http://localhost:2633/RPC2
-compute_one_flavor_small={mem=128, cpu=1}
-compute_one_flavor_medium={mem=256, cpu=2}
-compute_one_flavor_large={mem=512, cpu=4}
 compute_one_network_id=1
 
+# Setting used to find the correct flavor according to informed templates.
+# types :all or specific templates(template1,template2) 
+compute_one_templates=all
+
 # Settings used by ONE compute plugin to register new images in the cloud
 # ID of datastore to register the image
 compute_one_datastore_id=1
@@ -27,17 +34,25 @@ compute_one_ssh_key_file=/home/fogbow/.ssh/id_rsa
 # Set the directory to copy images in remote host
 compute_one_ssh_target_temp_folder=/tmp/images
 
+# Compute Openstack OCCI
 compute_class=org.fogbowcloud.manager.core.plugins.openstack.OpenStackOCCIComputePlugin
 compute_openstack_v2api_url=http://localhost:8182
 compute_occi_url=http://localhost:8182
-compute_occi_flavor_small=m1-small
-compute_occi_flavor_medium=m1-medium
-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_network_id=ea51ed0c-0e8a-448d-8202-c79777109ffe
 
+# Compute Opennebula OCCI
+compute_class=org.fogbowcloud.manager.core.plugins.opennebula.OpenNebulaOCCIComputePlugin
+compute_one_url=http://localhost:2633/RPC2
+compute_occi_url=http://localhost:3000
+compute_occi_template_scheme=http://occi.localhost/occi/infrastructure/os_tpl#
+compute_occi_resource_scheme=http://schema.fedcloud.egi.eu/occi/infrastructure/resource_tpl#
+compute_occi_flavors_small={cpu=1,mem=512}
+compute_occi_flavors_medium={cpu=2,mem=1024}
+compute_occi_flavors_large={cpu=4,mem=2048}
+
 # If you are using the EgiImageStoragePlugin
 image_storage_class=org.fogbowcloud.manager.core.plugins.imagestorage.egi.EgiImageStoragePlugin
 image_storage_egi_base_url=http://lsd.ufcg.edu.br/~user/vm/ 
@@ -61,21 +76,22 @@ image_storage_static_fogbow-ubuntu-1204=81765250-a4e4-440d-a215-43c9c0849120
 member_picker_class=org.fogbowcloud.manager.core.RoundRobinMemberPicker
 #If you are using NoFMemberPicker or NoFPrioritizationPlugin classes
 nof_trustworthy=false
+nof_prioritize_local=true
 
 local_prioritization_plugin_class=org.fogbowcloud.manager.core.plugins.prioritization.FCFSPrioritizationPlugin
 remote_prioritization_plugin_class=org.fogbowcloud.manager.core.plugins.prioritization.nof.NoFPrioritizationPlugin
 
+# Compute Openstack
 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
 compute_novav2_network_id=ea51ed0c-0e8a-448d-8202-c79777109ffe
 
+# Local identity
 local_identity_class=org.fogbowcloud.manager.core.plugins.openstack.KeystoneIdentityPlugin
 local_identity_url=http://localhost:5000
 
+# Federation identity
 federation_authorization_class=org.fogbowcloud.manager.core.plugins.common.AllowAllAuthorizationPlugin
 federation_identity_class=org.fogbowcloud.manager.core.plugins.openstack.KeystoneIdentityPlugin
 federation_identity_url=http://localhost:5000

pom.xml

@@ -210,6 +210,16 @@
 		<artifactId>sshj</artifactId>
 		<version>0.8.1</version>
 	</dependency>
+	<dependency>
+		<groupId>javax.mail</groupId>
+		<artifactId>mail</artifactId>
+		<version>1.4</version>
+	</dependency>
+	<dependency>
+		<groupId>com.google.guava</groupId>
+		<artifactId>guava</artifactId>
+		<version>r09</version>
+	</dependency>
 	<dependency>
 		<groupId>com.h2database</groupId>
 		<artifactId>h2</artifactId>
@@ -220,7 +230,6 @@
 		<artifactId>mail</artifactId>
 		<version>1.4</version>
 	</dependency>
-
   </dependencies>
 
 </project>

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

@@ -19,9 +19,9 @@
 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.benchmarking.VanillaBenchmarkingPlugin;
 import org.fogbowcloud.manager.core.plugins.imagestorage.egi.EgiImageStoragePlugin;
+import org.fogbowcloud.manager.core.plugins.prioritization.TwoFoldPrioritizationPlugin;
 import org.fogbowcloud.manager.occi.OCCIApplication;
 import org.fogbowcloud.manager.occi.core.ResourceRepository;
 import org.fogbowcloud.manager.xmpp.ManagerXmppComponent;
@@ -109,7 +109,7 @@ public static void main(String[] args) throws Exception {
 			benchmarkingPlugin = (BenchmarkingPlugin) createInstance(
 					ConfigurationConstants.BENCHMARKING_PLUGIN_CLASS_KEY, properties);
 		} catch (Exception e) {
-			benchmarkingPlugin = new FCUStaticBenchmarkingPlugin(properties);
+			benchmarkingPlugin = new VanillaBenchmarkingPlugin(properties);
 			LOGGER.warn("Benchmarking plugin not specified in properties. Using the default one.", e);
 		}
 

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

@@ -41,10 +41,10 @@ public class ConfigurationConstants {
 	public static final String ASYNC_REQUEST_WAITING_INTERVAL_KEY = "asyn_request_waiting_interval";
 
 	//ssh properties TODO change these properties names to TOKEN_HOST_...
-	public static final String SSH_PRIVATE_HOST_KEY = "ssh_tunnel_private_host";
-	public static final String SSH_PUBLIC_HOST_KEY = "ssh_tunnel_public_host";
-	public static final String SSH_HOST_PORT_KEY = "ssh_tunnel_host_port";
-	public static final String SSH_HOST_HTTP_PORT_KEY = "ssh_tunnel_host_http_port";
+	public static final String TUNNEL_SSH_PRIVATE_HOST_KEY = "ssh_tunnel_private_host";
+	public static final String TUNNEL_SSH_PUBLIC_HOST_KEY = "ssh_tunnel_public_host";
+	public static final String TUNNEL_SSH_HOST_PORT_KEY = "ssh_tunnel_host_port";
+	public static final String TUNNEL_SSH_HOST_HTTP_PORT_KEY = "ssh_tunnel_host_http_port";
 
 	//voms
 	public static final String VOMS_PATH_VOMSES = "path_vomses";
@@ -59,6 +59,10 @@ public class ConfigurationConstants {
 	public static final String MAX_WHOISALIVE_MANAGER_COUNT = "max_whoisalive_manager_count";
 	public static final String IMAGE_STORAGE_PLUGIN_CLASS = "image_storage_class";
 
+	public static final String SSH_PUBLIC_KEY_PATH = "ssh_public_key";
+	public static final String SSH_PRIVATE_KEY_PATH = "ssh_private_key";
+	public static final String SSH_COMMON_USER = "ssh_common_user";
+
 	//benchmarking
 	public static final String BENCHMARKING_PLUGIN_CLASS_KEY = "benchmarking_class";