diff options
| -rwxr-xr-x | tools/democonf2rumba.py | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/tools/democonf2rumba.py b/tools/democonf2rumba.py index dab7627..549c540 100755 --- a/tools/democonf2rumba.py +++ b/tools/democonf2rumba.py @@ -56,7 +56,7 @@ def make_experiment(filename, experiment_class, experiment_kwargs, if speed_unit == 'G': speed = speed * 1000 - shims[shim] = {'name':shim, + shims[shim] = {'name': shim, 'speed': speed, 'type': 'eth'} @@ -166,55 +166,55 @@ if __name__ == '__main__': setup_testbed_common_args(t) qemu_p.add_argument('-B', '--bzimage', metavar='BZIMAGE', type=str, - required=True, - help='path to the bzImage file to use') + required=True, + help='path to the bzImage file to use') qemu_p.add_argument('-I', '--initramfs', metavar='INITRAMFS', type=str, - required=True, - help='path to the initramfs file to use') + 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') + 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') + default=None, help='path to the folder for qemu logs') emulab_p.add_argument('-R', '--url', metavar='URL', type=str, - default="wall2.ilabt.iminds.be", - help='Url') + default="wall2.ilabt.iminds.be", + help='Url') emulab_p.add_argument('-I', '--image', metavar='IMG', type=str, - default="UBUNTU14-64-STD", - help='Ubuntu image') + default="UBUNTU14-64-STD", + help='Ubuntu image') jfed_p.add_argument('-C', '--cert_file', metavar='CERT', type=str, - required=True, - help='Certificate file') + required=True, + help='Certificate file') jfed_p.add_argument('-J', '--jar', metavar='JAR', type=str, - required=True, - help='Jfed jar') + required=True, + help='Jfed jar') jfed_p.add_argument('-H', '--exp_hours', metavar='HOURS', type=int, - default=2, help='Experiment hours') + default=2, help='Experiment hours') jfed_p.add_argument('-A', '--authority', metavar='AUTH', type=str, - default="wall2.ilabt.iminds.be", - help='Authority') + default="wall2.ilabt.iminds.be", + help='Authority') args = parser.parse_args() if args.testbed == 'emulab': import rumba.testbeds.emulab as emulab - testbed_class = emulab.Testbed + test_class = emulab.Testbed testbed_args = {a.dest: getattr(args, a.dest) for a in emulab_p._actions if a.dest != 'help'} elif args.testbed == 'jfed': import rumba.testbeds.jfed as jfed - testbed_class = jfed.Testbed + test_class = jfed.Testbed testbed_args = {a.dest: getattr(args, a.dest) for a in jfed_p._actions if a.dest != 'help'} elif args.testbed == 'qemu': import rumba.testbeds.qemu as qemu - testbed_class = qemu.Testbed + test_class = qemu.Testbed testbed_args = {a.dest: getattr(args, a.dest) for a in qemu_p._actions if a.dest != 'help'} elif args.testbed == 'fake': import rumba.testbeds.faketestbed as fake - testbed_class = fake.Testbed + test_class = fake.Testbed testbed_args = {a.dest: getattr(args, a.dest) for a in fake_p._actions if a.dest != 'help'} else: @@ -226,21 +226,21 @@ if __name__ == '__main__': if args.irati: import rumba.prototypes.irati as irati - experiment_class = irati.Experiment + exp_class = irati.Experiment elif args.ouroboros: import rumba.prototypes.ouroboros as ouroboros - experiment_class = ouroboros.Experiment + exp_class = ouroboros.Experiment elif args.rlite: import rumba.prototypes.rlite as rlite - experiment_class = rlite.Experiment + exp_class = rlite.Experiment else: raise ValueError('Unexpected prototype: %s.' % args.testbed) try: make_experiment(args.config, - experiment_class=experiment_class, + experiment_class=exp_class, experiment_kwargs={}, - testbed_class=testbed_class, + testbed_class=test_class, testbed_kwargs=testbed_args) except KeyboardInterrupt: |