From 009c8ff7570105a79278559202fdd46616b83a92 Mon Sep 17 00:00:00 2001
From: Sander Vrijders <sander.vrijders@ugent.be>
Date: Thu, 20 Apr 2017 17:12:34 +0200
Subject: model: Split experiment run()

This splits experiment.run() into 4 different operations: swap_in,
install_prototype, bootstrap_prototype and swap_out.
---
 tools/democonf2rumba.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'tools/democonf2rumba.py')

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):
-- 
cgit v1.2.3