diff options
author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2017-04-28 11:38:42 +0000 |
---|---|---|
committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2017-04-28 11:38:42 +0000 |
commit | 2e17296fb9db66b9832655137b1942fcc0c2b2a7 (patch) | |
tree | 8858172b52793a3fdfce0a46f864cefb28683ae8 /tools | |
parent | dac375cda283ed0efe3a151022f45f5e723273db (diff) | |
parent | da965f80da37c2b775e1e62e469589a3be05da30 (diff) | |
download | rumba-2e17296fb9db66b9832655137b1942fcc0c2b2a7.tar.gz rumba-2e17296fb9db66b9832655137b1942fcc0c2b2a7.zip |
Merge branch 'jfed-irati-fixes' into 'master'
Small fixes for jfed-irati compatibility
See merge request !43
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/democonf2rumba.py | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/tools/democonf2rumba.py b/tools/democonf2rumba.py index a73d6b7..9c6d64f 100755 --- a/tools/democonf2rumba.py +++ b/tools/democonf2rumba.py @@ -24,6 +24,8 @@ def make_experiment(filename, experiment_class, experiment_kwargs, difs = {} print('Reading file %s.' % (filename,)) + print('+++++++++++++++++++') + print() with open(filename, 'r') as conf: @@ -120,6 +122,12 @@ def make_experiment(filename, experiment_class, experiment_kwargs, parsed_nodes.append(mod.Node(name, difs, dif_registrations)) log.set_logging_level(verbosity) + print() + print('++++++++++++++++++++') + print('Calling constructor of testbed %s with args %s.' + % (testbed_class, testbed_kwargs)) + print('++++++++++++++++++++') + print() testbed = testbed_class(**testbed_kwargs) @@ -130,6 +138,7 @@ def make_experiment(filename, experiment_class, experiment_kwargs, try: exp.swap_in() exp.bootstrap_prototype() + input("Press ENTER to quit") finally: exp.swap_out() @@ -200,14 +209,14 @@ if __name__ == '__main__': jfed_p.add_argument('-C', '--cert_file', metavar='CERT', type=str, required=True, help='Certificate file') - jfed_p.add_argument('-J', '--jar', metavar='JAR', type=str, - required=True, - help='Jfed jar') - jfed_p.add_argument('-H', '--exp_hours', metavar='HOURS', type=int, + jfed_p.add_argument('-H', '--exp_hours', metavar='HOURS', type=str, default=2, help='Experiment hours') jfed_p.add_argument('-A', '--authority', metavar='AUTH', type=str, default="wall2.ilabt.iminds.be", help='Authority') + jfed_p.add_argument('-I', '--image', metavar='IMAGE', type=str, + default=None, + help='Image to be used') args = parser.parse_args() |