Merge branch 'logging' into 'master'

rumba: log: Added logging support, migrated from print to logging.

See merge request !38

1 files changed, 34 insertions, 32 deletions

diff --git a/rumba/prototypes/rlite.py b/rumba/prototypes/rlite.py
index faf2186..77f59cb 100644
--- a/rumba/prototypes/rlite.py
+++ b/rumba/prototypes/rlite.py
@@ -20,7 +20,11 @@
 
 import rumba.ssh_support as ssh
 import rumba.model as mod
-import time
+import rumba.log as log
+
+
+logger = log.get_logger(__name__)
+
 
 # An experiment over the rlite implementation
 class Experiment(mod.Experiment):
@@ -33,17 +37,16 @@ class Experiment(mod.Experiment):
                              cmds, time_out=None)
 
     def init_nodes(self):
-        cmds = []
+        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)
@@ -61,19 +64,20 @@ class Experiment(mod.Experiment):
                 elif type(ipcp.dif) is mod.ShimUDPDIF:
                     ipcp_type = 'shim-udp4'
                 else:
-                    print("unknown type for DIF %s, default to loopback" \
-                            % ipcp.dif.name)
+                    logger.warning(
+                        "unknown type for DIF %s, default to loopback",
+                        ipcp.dif.name)
                     ipcp_type = 'shim-loopback'
 
-                cmds.append("rlite-ctl ipcp-create %s %s %s" % \
+                cmds.append("rlite-ctl ipcp-create %s %s %s" %
                             (ipcp.name, ipcp_type, ipcp.dif.name))
 
                 # Generate the command to configure the interface
                 # name for the shim-eth
                 if type(ipcp.dif) is mod.ShimEthDIF:
                     ipcp.ifname = 'eth1'
-                    cmds.append("rlite-ctl ipcp-config %s netdev %s" \
-                                    % (ipcp.name, ipcp.ifname))
+                    cmds.append("rlite-ctl ipcp-config %s netdev %s"
+                                % (ipcp.name, ipcp.ifname))
 
             self.execute_commands(node, cmds)
 
@@ -83,7 +87,7 @@ class Experiment(mod.Experiment):
 
             for ipcp in node.ipcps:
                 for lower in ipcp.registrations:
-                    cmds.append("rlite-ctl ipcp-register %s %s" \
+                    cmds.append("rlite-ctl ipcp-register %s %s"
                                 % (ipcp.name, lower.name))
 
             self.execute_commands(node, cmds)
@@ -95,34 +99,32 @@ class Experiment(mod.Experiment):
                      'dif': e['dif'].name,
                      'lower_dif': e['lower_dif'].name,
                      'enroller': e['enroller'].name
-                    }
+                     }
                 cmd = "rlite-ctl ipcp-enroll %(enrollee)s %(dif)s "\
-                        "%(lower_dif)s %(enroller)s" % d
+                      "%(lower_dif)s %(enroller)s" % d
                 self.execute_commands(e['enrollee'], [cmd])
 
     def install_prototype(self):
-        print("rlite: installing")
-        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")
+        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)
-        print("rlite: installed")
+        logger.info("rlite: installed")
 
     def bootstrap_prototype(self):
-        print("rlite: setting up")
+        logger.info("rlite: setting up")
         self.init_nodes()
-        print("rlite: software initialized on all nodes")
+        logger.info("rlite: software initialized on all nodes")
         self.create_ipcps()
-        print("rlite: IPCPs created on all nodes")
+        logger.info("rlite: IPCPs created on all nodes")
         self.register_ipcps()
-        print("rlite: IPCPs registered to their lower DIFs on all nodes")
+        logger.info("rlite: IPCPs registered to their lower DIFs on all nodes")
         self.enroll_ipcps()
-        print("rlite: enrollment completed in all DIFs")
+        logger.info("rlite: enrollment completed in all DIFs")