diff options
| author | dimitri staessens <dimitri.staessens@ugent.be> | 2017-10-18 11:56:27 +0200 |
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@ugent.be> | 2017-10-18 13:09:53 +0200 |
| commit | aa021a25fe563a7a97ec3327f20979f690613d0a (patch) | |
| tree | b4e8925dd795c4f051befe313d83117547871c14 | |
| parent | d62b3b2229653d431b4e01c465778df3a805ee9a (diff) | |
| download | rumba-aa021a25fe563a7a97ec3327f20979f690613d0a.tar.gz rumba-aa021a25fe563a7a97ec3327f20979f690613d0a.zip | |
testbeds: Fix image selection for jFed
The rspec for node images seems to work on all emulab instances if the
user is emulab-ops. Tested on cloudlab and virtual wall.
| -rw-r--r-- | rumba/testbeds/jfed.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/rumba/testbeds/jfed.py b/rumba/testbeds/jfed.py index a99a077..f40cb06 100644 --- a/rumba/testbeds/jfed.py +++ b/rumba/testbeds/jfed.py @@ -47,7 +47,7 @@ class Testbed(mod.Testbed): def __init__(self, exp_name, username, cert_file, exp_hours="2", proj_name="ARCFIRE", authority="wall2.ilabt.iminds.be", - image=None): + image=None, image_custom=False, image_owner=None): passwd = getpass.getpass(prompt="Password for certificate file: ") mod.Testbed.__init__(self, exp_name, @@ -65,8 +65,18 @@ class Testbed(mod.Testbed): self.jfed_jar = os.path.join(mod.cache_dir, 'jfed_cli/experimenter-cli.jar') if image is not None: + if image_owner is None: + if not image_custom: + image_owner = "emulab-ops" + else: + if authority == "wall1.ilabt.iminds.be": + image_owner = "wall2-ilabt-iminds-be" + elif authority == "wall2.ilabt.iminds.be": + image_owner = "wall2-ilabt-iminds-be" + else: + image_owner = "GeniSlices" self.image = "urn:publicid:IDN+" + authority + \ - "+image+wall2-ilabt-iminds-be:" + image + "+image+" + image_owner + ":" + image else: self.image = None |