aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rumba/testbeds/jfed.py4
-rwxr-xr-xtools/democonf2rumba.py23
2 files changed, 20 insertions, 7 deletions
diff --git a/rumba/testbeds/jfed.py b/rumba/testbeds/jfed.py
index a651b63..0bb8cd3 100644
--- a/rumba/testbeds/jfed.py
+++ b/rumba/testbeds/jfed.py
@@ -98,9 +98,9 @@ class Testbed(mod.Testbed):
if use_physical_machines is None:
if "wall" in authority or "cloudlab" in authority:
- self.use_physical_machines=True
+ self.use_physical_machines = True
else:
- self.use_physical_machines=False
+ self.use_physical_machines = False
if image is not None:
if image_owner is None:
diff --git a/tools/democonf2rumba.py b/tools/democonf2rumba.py
index e398308..795cf22 100755
--- a/tools/democonf2rumba.py
+++ b/tools/democonf2rumba.py
@@ -106,8 +106,10 @@ def make_experiment(filename, experiment_class, experiment_kwargs,
parsed_difs = {}
for shim_name, shim in shims.items():
- parsed_difs[shim_name] = (mod.ShimEthDIF(shim_name,
- link_speed=shim['speed']))
+ parsed_difs[shim_name] = (mod.ShimEthDIF(
+ shim_name,
+ link_quality=mod.LinkQuality(rate=shim['speed']))
+ )
for dif_name, dif in difs.items():
parsed_difs[dif_name] = (mod.NormalDIF(dif_name))
@@ -177,7 +179,7 @@ if __name__ == '__main__':
'--verbosity', metavar='VERBOSITY', type=str,
default='INFO',
choices=['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'],
- help='Path to the config file to parse')
+ help='Rumba output verbosity')
subparsers = parser.add_subparsers(dest='testbed')
emulab_p = subparsers.add_parser('emulab', help='Use emulab testbed')
@@ -188,16 +190,18 @@ if __name__ == '__main__':
for t in [emulab_p, jfed_p, qemu_p, fake_p]:
setup_testbed_common_args(t)
- qemu_p.add_argument('-B', '--bzimage', metavar='BZIMAGE', type=str,
+ qemu_p.add_argument('-B', '--bzimage-path', metavar='BZIMAGE', type=str,
required=True,
help='path to the bzImage file to use')
- qemu_p.add_argument('-I', '--initramfs', metavar='INITRAMFS', type=str,
+ qemu_p.add_argument('-I', '--initramfs-path', metavar='INITRAMFS', type=str,
required=True,
help='path to the initramfs file to use')
qemu_p.add_argument('-V', '--use_vhost', action='store_true',
default=False, help='Use vhost')
qemu_p.add_argument('-Q', '--qemu_logs_dir', metavar='QEMU_LOGS', type=str,
default=None, help='path to the folder for qemu logs')
+ qemu_p.add_argument('--public-key-path', metavar='PATH', type=str,
+ default=None, help='path to the user ssh public key.')
emulab_p.add_argument('-R', '--url', metavar='URL', type=str,
default="wall2.ilabt.iminds.be",
@@ -217,6 +221,15 @@ if __name__ == '__main__':
jfed_p.add_argument('-I', '--image', metavar='IMAGE', type=str,
default=None,
help='Image to be used')
+ jfed_p.add_argument('--image-custom', metavar='I_CUSTOM', type=bool,
+ default=False,
+ help='Is the image a custom one?')
+ jfed_p.add_argument('--image-owner', metavar='I_OWNER', type=str,
+ default=None,
+ help='Creator of the image')
+ jfed_p.add_argument('--use-physical-machines', metavar='USE_PM', type=bool,
+ default=None,
+ help='Try to allocate physical machines if True')
args = parser.parse_args()