diff options
author | Sander Vrijders <sander.vrijders@ugent.be> | 2018-07-27 10:56:27 +0200 |
---|---|---|
committer | Sander Vrijders <sander.vrijders@ugent.be> | 2018-07-27 10:58:56 +0200 |
commit | 0ea1646ab448d51edc2bc7802d7b075ed0f3f324 (patch) | |
tree | d0d9e39309677ce1695afef8f329664755652ea0 /rumba/testbeds/emulab.py | |
parent | bb9004b851dbea68a3cec57a957593c730119fe8 (diff) | |
download | rumba-0ea1646ab448d51edc2bc7802d7b075ed0f3f324.tar.gz rumba-0ea1646ab448d51edc2bc7802d7b075ed0f3f324.zip |
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.
Diffstat (limited to 'rumba/testbeds/emulab.py')
-rw-r--r-- | rumba/testbeds/emulab.py | 11 |
1 files changed, 6 insertions, 5 deletions
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): |