Merge branch 'master' into logging (split merged)

1 files changed, 13 insertions, 4 deletions

diff --git a/rumba/prototypes/ouroboros.py b/rumba/prototypes/ouroboros.py
index 9776c5e..bbf8c75 100644
--- a/rumba/prototypes/ouroboros.py
+++ b/rumba/prototypes/ouroboros.py
@@ -33,18 +33,22 @@ class Experiment(mod.Experiment):
         mod.Experiment.__init__(self, testbed, nodes)
 
     def setup_ouroboros(self):
+        for node in self.nodes:
+            ssh.execute_command(self.testbed, node.ssh_config,
+                                "sudo nohup irmd > /dev/null &",
+                                time_out=None)
+
+    def install_ouroboros(self):
         cmds = list()
 
         cmds.append("sudo apt-get update")
         cmds.append("sudo apt-get install cmake protobuf-c-compiler git --yes")
         cmds.append("sudo rm -r ~/ouroboros/build")
         cmds.append("cd ~/ouroboros; sudo ./install_debug.sh /")
-        cmds.append("sudo nohup irmd > /dev/null &")
 
         for node in self.nodes:
             ssh.execute_commands(self.testbed, node.ssh_config,
                                  cmds, time_out=None)
-        return
 
     def bind_names(self):
         for node in self.nodes:
@@ -136,8 +140,13 @@ class Experiment(mod.Experiment):
                                              cmds, time_out=None)
                         time.sleep(2)
 
-    def run_prototype(self):
-        logger.info("Setting up Ouroboros...")
+    def install_prototype(self):
+        logger.info("Installing Ouroboros...")
+        self.install_ouroboros()
+        logger.info("Installed on all nodes...")
+
+    def bootstrap_prototype(self):
+        logger.info("Starting IRMd on all nodes...")
         self.setup_ouroboros()
         logger.info("Binding names...")
         self.bind_names()