Merge branch 'master' into policies

2 files changed, 54 insertions, 5 deletions

diff --git a/tools/democonf2rumba.py b/tools/democonf2rumba.py
index a73d6b7..dc2f0a4 100755
--- a/tools/democonf2rumba.py
+++ b/tools/democonf2rumba.py
@@ -24,6 +24,8 @@ def make_experiment(filename, experiment_class, experiment_kwargs,
     difs = {}
 
     print('Reading file %s.' % (filename,))
+    print('+++++++++++++++++++')
+    print()
 
     with open(filename, 'r') as conf:
 
@@ -120,6 +122,12 @@ def make_experiment(filename, experiment_class, experiment_kwargs,
         parsed_nodes.append(mod.Node(name, difs, dif_registrations))
 
     log.set_logging_level(verbosity)
+    print()
+    print('++++++++++++++++++++')
+    print('Calling constructor of testbed %s with args %s.'
+          % (testbed_class, testbed_kwargs))
+    print('++++++++++++++++++++')
+    print()
 
     testbed = testbed_class(**testbed_kwargs)
 
@@ -130,6 +138,7 @@ def make_experiment(filename, experiment_class, experiment_kwargs,
     try:
         exp.swap_in()
         exp.bootstrap_prototype()
+        input("Press ENTER to quit")
     finally:
         exp.swap_out()
 
@@ -200,14 +209,14 @@ if __name__ == '__main__':
     jfed_p.add_argument('-C', '--cert_file', metavar='CERT', type=str,
                         required=True,
                         help='Certificate file')
-    jfed_p.add_argument('-J', '--jar', metavar='JAR', type=str,
-                        required=True,
-                        help='Jfed jar')
-    jfed_p.add_argument('-H', '--exp_hours', metavar='HOURS', type=int,
-                        default=2, help='Experiment hours')
+    jfed_p.add_argument('-H', '--exp_hours', metavar='HOURS', type=str,
+                        default="2", help='Experiment hours')
     jfed_p.add_argument('-A', '--authority', metavar='AUTH', type=str,
                         default="wall2.ilabt.iminds.be",
                         help='Authority')
+    jfed_p.add_argument('-I', '--image', metavar='IMAGE', type=str,
+                        default=None,
+                        help='Image to be used')
 
     args = parser.parse_args()
 
diff --git a/tools/rumba-access b/tools/rumba-access
new file mode 100755
index 0000000..1cf382e
--- /dev/null
+++ b/tools/rumba-access
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+
+FILE=ssh_info
+
+MACHINE_ID=$1
+if [ "$MACHINE_ID" == "" ]; then
+	echo "usage: $0 NODE_NAME"
+	exit 255
+fi
+
+USER=$(grep "\<${MACHINE_ID}\>" ${FILE} | awk -F';' '{print $2}')
+if [ "$USER" == "" ]; then
+	echo "Error: Node ${MACHINE_ID} unknown"
+	exit 255
+fi
+
+HOST=$(grep "\<${MACHINE_ID}\>" ${FILE} | awk -F';' '{print $3}')
+if [ "$HOST" == "" ]; then
+	echo "Error: Node ${MACHINE_ID} unknown"
+	exit 255
+fi
+
+SSH_PORT=$(grep "\<${MACHINE_ID}\>" ${FILE} | awk -F';' '{print $4}')
+if [ "$SSH_PORT" == "" ]; then
+	echo "Error: Node ${MACHINE_ID} unknown"
+	exit 255
+fi
+
+PROXY_CMD=$(grep "\<${MACHINE_ID}\>" ${FILE} | awk -F';' '{print $5}')
+if [ "$PROXY_CMD" == "" ]; then
+	echo "Error: Node ${MACHINE_ID} unknown"
+	exit 255
+fi
+
+echo "Accessing Rumba node ${MACHINE_ID}"
+if [[ $PROXY_CMD = "None" ]]; then
+    ssh -A -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p ${SSH_PORT} ${USER}@${HOST}
+else
+    ssh -A -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -oProxyCommand="$PROXY_CMD" -p ${SSH_PORT} ${USER}@${HOST}
+fi