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, 18 insertions, 15 deletions

diff --git a/rumba/model.py b/rumba/model.py
index 0d93fcd..4c3985d 100644
--- a/rumba/model.py
+++ b/rumba/model.py
@@ -21,6 +21,11 @@
 
 import abc
 
+import rumba.log as log
+
+
+logger = log.get_logger(__name__)
+
 
 # Represents generic testbed info
 #
@@ -42,7 +47,7 @@ class Testbed:
 
     @abc.abstractmethod
     def swap_out(self, experiment):
-        print("swap_out(): nothing to do")
+        logger.info("swap_out(): nothing to do")
 
 
 # Base class for DIFs
@@ -370,9 +375,6 @@ class Experiment:
             difsdeps_inc_cnt[dif] = len(difsdeps_inc[dif])
         del difsdeps_inc
 
-        # print(difsdeps_adj)
-        # print(difsdeps_inc_cnt)
-
         # Run Kahn's algorithm to compute topological
         # ordering on the DIFs graph.
         frontier = set()
@@ -398,7 +400,7 @@ class Experiment:
                             "circular dependencies, involving the following"
                             " DIFs: %s" % circular_set)
 
-        print("DIF topological ordering: %s" % self.dif_ordering)
+        logger.debug("DIF topological ordering: %s", self.dif_ordering)
 
     # Compute all the enrollments, to be called after compute_dif_ordering()
     def compute_enrollments(self):
@@ -444,13 +446,13 @@ class Experiment:
                     er.append("%s --[%s]--> %s" % (node.name,
                                                    edge[1].name,
                                                    edge[0].name))
-            print("DIF graph for %s: %s" % (dif, ', '.join(er)))
+            logger.debug("DIF graph for %s: %s", dif, ', '.join(er))
 
             if self.enrollment_strategy == 'minimal':
                 # To generate the list of enrollments, we simulate one,
                 # using breadth-first trasversal.
-                enrolled = set([first])
-                frontier = set([first])
+                enrolled = {first}
+                frontier = {first}
                 while len(frontier):
                     cur = frontier.pop()
                     for edge in dif_graphs[dif][cur]:
@@ -475,14 +477,15 @@ class Experiment:
                 # This is a bug
                 assert False
 
-        print("Enrollments:")
+        log_string = "Enrollments:\n"
         for el in self.enrollments:
             for e in el:
-                print("    [%s] %s --> %s through N-1-DIF %s" %
-                      (e['dif'],
-                       e['enrollee'].name,
-                       e['enroller'].name,
-                       e['lower_dif']))
+                log_string += ("    [%s] %s --> %s through N-1-DIF %s\n"
+                               % (e['dif'],
+                                  e['enrollee'].name,
+                                  e['enroller'].name,
+                                  e['lower_dif']))
+        logger.debug(log_string)
 
     def compute_ipcps(self):
         # For each node, compute the required IPCP instances, and associated
@@ -519,7 +522,7 @@ class Experiment:
                 node.ipcps.append(ipcp)
                 dif.ipcps.append(ipcp)
 
-            print("IPCP for node %s: %s" % (node.name, node.ipcps))
+            logger.info("IPCP for node %s: %s", node.name, node.ipcps)
 
     # Examine the nodes and DIFs, compute the registration and enrollment
     # order, the list of IPCPs to create, registrations, ...