aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorvmaffione <v.maffione@gmail.com>2017-04-21 09:38:20 +0000
committervmaffione <v.maffione@gmail.com>2017-04-21 09:38:20 +0000
commit778bd3a1c3f625767c00688faa37af388a054f94 (patch)
treecec1214e3f3226c717f8b94e67661f8fac7fe36c /tools
parentee2f6e5c21c0ba94048dbf1c86024e3181718fc2 (diff)
parent009c8ff7570105a79278559202fdd46616b83a92 (diff)
downloadrumba-778bd3a1c3f625767c00688faa37af388a054f94.tar.gz
rumba-778bd3a1c3f625767c00688faa37af388a054f94.zip
Merge branch 'split' into 'master'
model: Split experiment run() See merge request !37
Diffstat (limited to 'tools')
-rwxr-xr-xtools/democonf2rumba.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/democonf2rumba.py b/tools/democonf2rumba.py
index c708e8e..9d909c7 100755
--- a/tools/democonf2rumba.py
+++ b/tools/democonf2rumba.py
@@ -123,7 +123,12 @@ def make_experiment(filename, experiment_class, experiment_kwargs,
experiment_kwargs['testbed'] = testbed
experiment_kwargs['nodes'] = parsed_nodes
- return experiment_class(**experiment_kwargs).run()
+ exp = experiment_class(**experiment_kwargs)
+ try:
+ exp.swap_in()
+ exp.bootstrap_prototype()
+ finally:
+ exp.swap_out()
def setup_testbed_common_args(t_p):