Merge pull request #153 from fogbow/develop

Removing @ignore from test

Author: abmargb

bin/fogbow-create-reverse-tunnel

@@ -1,7 +1,9 @@
 #!/bin/sh
+ifconfig eth0 mtu 1420 | true
 IS_OPENSSH=$(ssh -ver 2>&1 | grep OpenSSH)
+IS_NEW_OPENSSH=$(ssh -V 2>&1 | grep OpenSSH)
 IS_DROPBEAR=$(ssh -ver 2>&1 | grep Dropbear)
-if [ -n "$IS_OPENSSH" ]; then
+if [ -n "$IS_OPENSSH" ] || [ -n "$IS_NEW_OPENSSH" ]; then
   SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ServerAliveInterval=30"
 elif [ -n "$IS_DROPBEAR" ]; then
   SSH_OPTIONS="-y -K 30"
@@ -12,6 +14,7 @@ cat > /bin/fogbow-autossh << EOL
 autossh() {
   while true; do
     echo "Starting tunnel in port $REMOTE_PORT"
+    echo "Command: ssh $SSH_OPTIONS -N -R 0.0.0.0:$REMOTE_PORT:localhost:22 #TOKEN_ID#@#TOKEN_HOST# -p #TOKEN_HOST_SSH_PORT#"
     ssh $SSH_OPTIONS -N -R 0.0.0.0:$REMOTE_PORT:localhost:22 #TOKEN_ID#@#TOKEN_HOST# -p #TOKEN_HOST_SSH_PORT#
     sleep 5
   done

manager.conf.example

@@ -11,7 +11,20 @@ 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
-compute_one_image_fogbow-linux-x86=0
+
+# 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
+# To register a new image, the image file needs to be in the some machine where ONE is running
+# If the fogbow manager is running in a different machine, set the SSH properties to transfer the image
+# Or if the fogbow manager is in the same machine, leave it blank
+compute_one_ssh_host=127.0.0.1
+compute_one_ssh_port=22
+compute_one_ssh_username=fogbow
+# The SSH try to access using private key, set the path to ssh id_rsa file
+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_class=org.fogbowcloud.manager.core.plugins.openstack.OpenStackOCCIComputePlugin
 compute_openstack_v2api_url=http://localhost:8182
@@ -36,7 +49,6 @@ compute_glancev2_url=http://localhost:9292
 compute_novav2_flavor_small=1
 compute_novav2_flavor_medium=2
 compute_novav2_flavor_large=3
-compute_novav2_image_fogbow-linux-x86=cadf2e29-7216-4a5e-9364-cf6513d5f1fd
 compute_novav2_network_id=ea51ed0c-0e8a-448d-8202-c79777109ffe
 
 local_identity_class=org.fogbowcloud.manager.core.plugins.openstack.KeystoneIdentityPlugin
@@ -58,6 +70,8 @@ cert_path=
 scheduler_period=30000
 token_update_period=300000
 instance_monitoring_period=120000
+served_request_monitoring_period=120000
+garbage_collector_period=240000
 
 ssh_tunnel_public_host=150.165.80.1
 ssh_tunnel_private_host=10.0.0.1

pom.xml

@@ -130,6 +130,11 @@
   </build>
 
   <dependencies>
+    <dependency>
+	  <groupId>org.apache.commons</groupId>
+	  <artifactId>commons-compress</artifactId>
+	  <version>1.9</version>
+	</dependency>  
     <dependency>
       <groupId>org.jamppa</groupId>
       <artifactId>jamppa</artifactId>

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

@@ -33,6 +33,8 @@ public class ConfigurationConstants {
 	public static final String SCHEDULER_PERIOD_KEY = "scheduler_period";
 	public static final String INSTANCE_MONITORING_PERIOD_KEY = "instance_monitoring_period";
 	public static final String TOKEN_UPDATE_PERIOD_KEY = "token_update_period";
+	public static final String SERVED_REQUEST_MONITORING_PERIOD_KEY = "served_request_monitoring_period";
+	public static final String GARBAGE_COLLECTOR_PERIOD_KEY = "garbage_collector_period";
 
 	//ssh properties TODO change these properties names to TOKEN_HOST_...
 	public static final String SSH_PRIVATE_HOST_KEY = "ssh_tunnel_private_host";