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

+ Added logging, migrated, default logging configuration is to stdout.
+ Minor PEP8 adjustments all-around

1 files changed, 22 insertions, 16 deletions

diff --git a/rumba/prototypes/rlite.py b/rumba/prototypes/rlite.py
index 9568d7e..feca5a4 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):
@@ -35,14 +39,15 @@ class Experiment(mod.Experiment):
     def init(self):
         cmds = []
 
-        if False: # ubuntu
+        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")
+            cmds.append("cd ~/rlite && ./configure && make "
+                        "&& sudo make install")
 
         # Load kernel modules
         cmds.append("modprobe rlite")
@@ -70,19 +75,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)
 
@@ -92,7 +98,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)
@@ -104,18 +110,18 @@ 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 run_prototype(self):
-        print("rlite: setting up")
+        logger.info("rlite: setting up")
         self.init()
-        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")