testbeds: Set default project to rumba

This will set the default project name to rumba for most testbeds,
since a dedicated group for rumba experiments has been setup.

6 files changed, 11 insertions, 10 deletions

diff --git a/examples/converged-operator-network.py b/examples/converged-operator-network.py
index ee54510..42df95d 100755
--- a/examples/converged-operator-network.py
+++ b/examples/converged-operator-network.py
@@ -172,7 +172,7 @@ c1n4 = Node("c1n4",
             dif_registrations = {c1: [c1e3, c1e4], m1: [c1, m1c2], n1: [m1]})
 
 tb = jfed.Testbed(exp_name   = "arcfiret43",
-                  proj_name  = "ARCFIRE",
+                  proj_name  = "rumba",
                   cert_file  = "/home/dstaesse/jfed/cert.pem",
                   authority  = "exogeni.net",
                   username   = "dstaesse")
diff --git a/rumba/testbeds/dockertb.py b/rumba/testbeds/dockertb.py
index f58ab92..1e92658 100644
--- a/rumba/testbeds/dockertb.py
+++ b/rumba/testbeds/dockertb.py
@@ -52,7 +52,7 @@ class Testbed(mod.Testbed):
         .. note:: In case no base image is provided, Rumba will automatically
                   download the latest version available from docker hub.
         """
-        mod.Testbed.__init__(self, exp_name, "", "", "")
+        mod.Testbed.__init__(self, exp_name, "", "", "rumba")
 
         self.base_image = base_image
         self.pull_image = pull_image
diff --git a/rumba/testbeds/emulab.py b/rumba/testbeds/emulab.py
index 664b4ff..8cd31cf 100644
--- a/rumba/testbeds/emulab.py
+++ b/rumba/testbeds/emulab.py
@@ -46,9 +46,9 @@ class Testbed(mod.Testbed):
     """
     Represents an emulab testbed.
     """
-    def __init__(self, exp_name, username, password="",
-                 proj_name="ARCFIRE", url="wall2.ilabt.iminds.be",
-                 image="UBUNTU14-64-STD"):
+    def __init__(self, exp_name, username, proj_name,
+                 password="", url="wall2.ilabt.iminds.be",
+                 image=None):
         """
         Initializes the testbed class.
 
@@ -179,8 +179,9 @@ class Testbed(mod.Testbed):
 
         for node in experiment.nodes:
             ns2_script += "set " + node.name + " [$ns node]\n"
-            ns2_script += "tb-set-node-os $" + node.name + " " + \
-                          self.image + "\n"
+            if self.image is not None:
+                ns2_script += "tb-set-node-os $" + node.name + " " + \
+                    self.image + "\n"
 
         for dif in experiment.dif_ordering:
             if isinstance(dif, mod.ShimEthDIF):
diff --git a/rumba/testbeds/jfed.py b/rumba/testbeds/jfed.py
index 530d9f0..cf12b16 100644
--- a/rumba/testbeds/jfed.py
+++ b/rumba/testbeds/jfed.py
@@ -51,7 +51,7 @@ class Testbed(mod.Testbed):
     Represents a jFed testbed.
     """
     def __init__(self, exp_name, username, cert_file, exp_hours="2",
-                 proj_name="ARCFIRE", authority="wall2.ilabt.iminds.be",
+                 proj_name="rumba", authority="wall2.ilabt.iminds.be",
                  image=None, image_custom=False, image_owner=None,
                  use_physical_machines=None):
         """
diff --git a/rumba/testbeds/local.py b/rumba/testbeds/local.py
index 8b57ed2..85e9e95 100644
--- a/rumba/testbeds/local.py
+++ b/rumba/testbeds/local.py
@@ -39,7 +39,7 @@ class Testbed(mod.Testbed):
     """
 
     def __init__(self, exp_name='foo', username='bar',
-                 proj_name="ARCFIRE", password=""):
+                 proj_name="rumba", password=""):
         """
         Initializes the parent class.
 
diff --git a/rumba/testbeds/qemu.py b/rumba/testbeds/qemu.py
index 2a42472..53a3e42 100644
--- a/rumba/testbeds/qemu.py
+++ b/rumba/testbeds/qemu.py
@@ -54,7 +54,7 @@ class Testbed(mod.Testbed):
     Represents a QEMU testbed.
     """
     def __init__(self, exp_name='foo', bzimage_path=None, initramfs_path=None,
-                 proj_name="ARCFIRE", password="root", username="root",
+                 proj_name="rumba", password="root", username="root",
                  public_key_path=os.path.join(USER_HOME, '.ssh', 'id_rsa.pub'),
                  use_vhost=True):
         """