elements: Remove distinction between mgmt and dt flows

This will remove the distinction between mgmt and dt flows since Rumba
allows setting up connections between IPCP at a very high level
anyway.

1 files changed, 9 insertions, 12 deletions

diff --git a/rumba/prototypes/ouroboros.py b/rumba/prototypes/ouroboros.py
index 5556d42..03f94eb 100644
--- a/rumba/prototypes/ouroboros.py
+++ b/rumba/prototypes/ouroboros.py
@@ -94,7 +94,7 @@ class Experiment(mod.Experiment):
                  git_repo='git://ouroboros.ilabt.imec.be/ouroboros',
                  git_branch='master',
                  enrollment_strategy='minimal',
-                 dt_strategy='full-mesh'):
+                 flows_strategy='full-mesh'):
         """
         Initializes the experiment class.
 
@@ -103,7 +103,7 @@ class Experiment(mod.Experiment):
         :param git_repo: The git repository to use for installation.
         :param git_branch: The branch of the git repository to use.
         :param enrollment_strategy: Can be 'full-mesh', 'minimal' or 'manual'.
-        :param dt_strategy: For data flows, 'full-mesh', 'minimal' or 'manual'.
+        :param strategy: For flows, 'full-mesh', 'minimal' or 'manual'.
         """
         mod.Experiment.__init__(
             self,
@@ -112,7 +112,7 @@ class Experiment(mod.Experiment):
             git_repo,
             git_branch,
             enrollment_strategy=enrollment_strategy,
-            dt_strategy=dt_strategy,
+            flows_strategy=flows_strategy,
             server_decorator=OurServer
         )
         self.r_ipcps = dict()
@@ -263,11 +263,10 @@ class Experiment(mod.Experiment):
 
             e['enrollee'].node.execute_commands(cmds, time_out=None)
 
-    def setup_flows(self, el, comp):
+    def setup_flows(self, el):
         for e in el:
             ipcp = e['src']
-            cmd = "irm i conn n " + ipcp.name + " comp " + \
-                  comp + " dst " + e['dst'].name
+            cmd = "irm i conn n " + ipcp.name + " dst " + e['dst'].name
 
             ipcp.node.execute_command(cmd, time_out=None)
 
@@ -288,12 +287,10 @@ class Experiment(mod.Experiment):
         self.create_ipcps()
         logger.info("Enrolling IPCPs...")
 
-        for element, mgmt, dt in zip(self.enrollments,
-                                     self.mgmt_flows,
-                                     self.dt_flows):
-            self.enroll_dif(element)
-            self.setup_flows(mgmt, comp="mgmt")
-            self.setup_flows(dt, comp="dt")
+        for enrolls, flows in zip(self.enrollments,
+                                self.flows):
+            self.enroll_dif(enrolls)
+            self.setup_flows(flows)
 
         logger.info("All done, have fun!")