Merge branch 'master' into logging (split merged)

1 files changed, 23 insertions, 20 deletions

diff --git a/rumba/prototypes/rlite.py b/rumba/prototypes/rlite.py
index feca5a4..77f59cb 100644
--- a/rumba/prototypes/rlite.py
+++ b/rumba/prototypes/rlite.py
@@ -36,28 +36,17 @@ class Experiment(mod.Experiment):
         ssh.execute_commands(self.testbed, node.ssh_config,
                              cmds, time_out=None)
 
-    def init(self):
-        cmds = []
-
-        if False:  # ubuntu
-            cmds.append("apt-get update")
-            cmds.append("apt-get install g++ gcc cmake "
-                        "linux-headers-$(uname -r) "
-                        "protobuf-compiler libprotobuf-dev git --yes")
-            cmds.append("rm -rf ~/rlite")
-            cmds.append("cd ~; git clone https://github.com/vmaffione/rlite")
-            cmds.append("cd ~/rlite && ./configure && make "
-                        "&& sudo make install")
+    def init_nodes(self):
+        cmds = ["modprobe rlite",
+                "modprobe rlite-normal",
+                "modprobe rlite-shim-eth",
+                "modprobe rlite-shim-udp4",
+                "modprobe rlite-shim-loopback",
+                "rlite-uipcps -v DBG -k 0 &> uipcp.log &"]
 
         # Load kernel modules
-        cmds.append("modprobe rlite")
-        cmds.append("modprobe rlite-normal")
-        cmds.append("modprobe rlite-shim-eth")
-        cmds.append("modprobe rlite-shim-udp4")
-        cmds.append("modprobe rlite-shim-loopback")
 
         # Start the uipcps daemon
-        cmds.append("rlite-uipcps -v DBG -k 0 &> uipcp.log &")
 
         for node in self.nodes:
             self.execute_commands(node, cmds)
@@ -115,9 +104,23 @@ class Experiment(mod.Experiment):
                       "%(lower_dif)s %(enroller)s" % d
                 self.execute_commands(e['enrollee'], [cmd])
 
-    def run_prototype(self):
+    def install_prototype(self):
+        logger.info("rlite: installing")
+        cmds = ["apt-get update",
+                "apt-get install g++ gcc cmake "
+                "linux-headers-$(uname -r) "
+                "protobuf-compiler libprotobuf-dev git --yes",
+                "rm -rf ~/rlite",
+                "cd ~; git clone https://github.com/vmaffione/rlite",
+                "cd ~/rlite && ./configure && make && sudo make install"]
+
+        for node in self.nodes:
+            self.execute_commands(node, cmds)
+        logger.info("rlite: installed")
+
+    def bootstrap_prototype(self):
         logger.info("rlite: setting up")
-        self.init()
+        self.init_nodes()
         logger.info("rlite: software initialized on all nodes")
         self.create_ipcps()
         logger.info("rlite: IPCPs created on all nodes")