From 92e114b4bd567593b43d6a065be52ca265bd13a4 Mon Sep 17 00:00:00 2001
From: Vincenzo Maffione <v.maffione@gmail.com>
Date: Fri, 21 Apr 2017 11:43:05 +0200
Subject: prototypes: rlite: minor naming change

---
 rumba/prototypes/rlite.py | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

(limited to 'rumba')

diff --git a/rumba/prototypes/rlite.py b/rumba/prototypes/rlite.py
index 4221f2a..faf2186 100644
--- a/rumba/prototypes/rlite.py
+++ b/rumba/prototypes/rlite.py
@@ -32,7 +32,7 @@ class Experiment(mod.Experiment):
         ssh.execute_commands(self.testbed, node.ssh_config,
                              cmds, time_out=None)
 
-    def init(self):
+    def init_nodes(self):
         cmds = []
 
         # Load kernel modules
@@ -48,20 +48,6 @@ class Experiment(mod.Experiment):
         for node in self.nodes:
             self.execute_commands(node, cmds)
 
-    def install(self):
-        cmds = []
-
-        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")
-
-        for node in self.nodes:
-            self.execute_commands(node, cmds)
-
     def create_ipcps(self):
         for node in self.nodes:
             cmds = []
@@ -116,12 +102,23 @@ class Experiment(mod.Experiment):
 
     def install_prototype(self):
         print("rlite: installing")
-        self.install()
+        cmds = []
+
+        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")
+
+        for node in self.nodes:
+            self.execute_commands(node, cmds)
         print("rlite: installed")
 
     def bootstrap_prototype(self):
         print("rlite: setting up")
-        self.init()
+        self.init_nodes()
         print("rlite: software initialized on all nodes")
         self.create_ipcps()
         print("rlite: IPCPs created on all nodes")
-- 
cgit v1.2.3