Merge branch 'master-marco' into 'master'

IRATI config file generation (and other)

See merge request !22

1 files changed, 31 insertions, 22 deletions

diff --git a/rumba/model.py b/rumba/model.py
index 9e6b40d..0d93fcd 100644
--- a/rumba/model.py
+++ b/rumba/model.py
@@ -20,7 +20,7 @@
 # MA  02110-1301  USA
 
 import abc
-import re
+
 
 # Represents generic testbed info
 #
@@ -65,7 +65,7 @@ class DIF:
         return hash(self.name)
 
     def __eq__(self, other):
-        return other != None and self.name == other.name
+        return other is not None and self.name == other.name
 
     def __neq__(self, other):
         return not self == other
@@ -79,6 +79,7 @@ class DIF:
     def get_ipcp_class(self):
         return IPCP
 
+
 # Shim over UDP
 #
 class ShimUDPDIF(DIF):
@@ -88,6 +89,7 @@ class ShimUDPDIF(DIF):
     def get_ipcp_class(self):
         return ShimUDPIPCP
 
+
 # Shim over Ethernet
 #
 # @link_speed [int] Speed of the Ethernet network, in Mbps
@@ -102,6 +104,7 @@ class ShimEthDIF(DIF):
     def get_ipcp_class(self):
         return ShimEthIPCP
 
+
 # Normal DIF
 #
 # @policies [dict] Policies of the normal DIF
@@ -125,6 +128,7 @@ class NormalDIF(DIF):
             s += "\n       Component %s has policy %s" % (comp, pol)
         return s
 
+
 # SSH Configuration
 #
 class SSHConfig:
@@ -133,6 +137,7 @@ class SSHConfig:
         self.port = port
         self.proxycommand = proxycommand
 
+
 # A node in the experiment
 #
 # @difs: DIFs the node will have an IPCP in
@@ -165,7 +170,7 @@ class Node:
 
     def _undeclared_dif(self, dif):
         if dif not in self.difs:
-            raise Exception("Invalid registration: node %s is not declared "\
+            raise Exception("Invalid registration: node %s is not declared "
                             "to be part of DIF %s" % (self.name, dif.name))
 
     def _validate(self):
@@ -207,8 +212,8 @@ class Node:
         s += " ]\n"
 
         s += "  Bindings: [ "
-        s += ", ".join(["'%s' => '%s'"  % (ap, self.bindings[ap]) \
-                                            for ap in self.bindings])
+        s += ", ".join(["'%s' => '%s'" % (ap, self.bindings[ap])
+                       for ap in self.bindings])
         s += " ]\n"
 
         return s
@@ -217,7 +222,7 @@ class Node:
         return hash(self.name)
 
     def __eq__(self, other):
-        return other != None and self.name == other.name
+        return other is not None and self.name == other.name
 
     def __neq__(self, other):
         return not self == other
@@ -256,6 +261,7 @@ class Node:
         del self.bindings[name]
         self._validate()
 
+
 # Base class representing an IPC Process to be created in the experiment
 #
 # @name [string]: IPCP name
@@ -278,28 +284,31 @@ class IPCP:
                 (self.name, self.dif.name,
                  ' '.join([dif.name for dif in self.registrations]),
                  ',bootstrapper' if self.dif_bootstrapper else ''
-                )
+                 )
 
     def __hash__(self):
         return hash((self.name, self.dif.name))
 
     def __eq__(self, other):
-        return other != None and self.name == other.name \
+        return other is not None and self.name == other.name \
                                 and self.dif == other.dif
 
     def __neq__(self, other):
         return not self == other
 
+
 class ShimEthIPCP(IPCP):
     def __init__(self, name, node, dif, ifname=None):
         IPCP.__init__(self, name, node, dif)
         self.ifname = ifname
 
+
 class ShimUDPIPCP(IPCP):
     def __init__(self, name, node, dif):
         IPCP.__init__(self, name, node, dif)
         # TODO: add IP and port
 
+
 # Base class for ARCFIRE experiments
 #
 # @name [string] Name of the experiment
@@ -313,7 +322,7 @@ class Experiment:
         self.testbed = testbed
         self.enrollment_strategy = 'minimal'  # 'full-mesh', 'manual'
         self.dif_ordering = []
-        self.enrollments = [] # a list of per-DIF lists of enrollments
+        self.enrollments = []  # a list of per-DIF lists of enrollments
 
         # Generate missing information
         self.generate()
@@ -361,8 +370,8 @@ class Experiment:
             difsdeps_inc_cnt[dif] = len(difsdeps_inc[dif])
         del difsdeps_inc
 
-        #print(difsdeps_adj)
-        #print(difsdeps_inc_cnt)
+        # print(difsdeps_adj)
+        # print(difsdeps_inc_cnt)
 
         # Run Kahn's algorithm to compute topological
         # ordering on the DIFs graph.
@@ -381,12 +390,12 @@ class Experiment:
                     frontier.add(nxt)
             difsdeps_adj[cur] = set()
 
-        circular_set = [dif for dif in difsdeps_inc_cnt \
+        circular_set = [dif for dif in difsdeps_inc_cnt
                         if difsdeps_inc_cnt[dif] != 0]
         if len(circular_set):
-            raise Exception("Fatal error: The specified DIFs topology" \
-                            "has one or more" \
-                            "circular dependencies, involving the following" \
+            raise Exception("Fatal error: The specified DIFs topology"
+                            "has one or more"
+                            "circular dependencies, involving the following"
                             " DIFs: %s" % circular_set)
 
         print("DIF topological ordering: %s" % self.dif_ordering)
@@ -407,8 +416,8 @@ class Experiment:
 
             for node in self.nodes:
                 if dif in node.dif_registrations:
-                    dif_graphs[dif][node] = [] # init for later use
-                    if first is None: # pick any node for later use
+                    dif_graphs[dif][node] = []  # init for later use
+                    if first is None:  # pick any node for later use
                         first = node
                     for lower_dif in node.dif_registrations[dif]:
                         if lower_dif not in neighsets:
@@ -469,11 +478,11 @@ class Experiment:
         print("Enrollments:")
         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']))
+                print("    [%s] %s --> %s through N-1-DIF %s" %
+                      (e['dif'],
+                       e['enrollee'].name,
+                       e['enroller'].name,
+                       e['lower_dif']))
 
     def compute_ipcps(self):
         # For each node, compute the required IPCP instances, and associated