Merge branch 'master' into testing

1 files changed, 21 insertions, 24 deletions

diff --git a/examples/converged-operator-network.py b/examples/converged-operator-network.py
index d0da907..b3d4a54 100755
--- a/examples/converged-operator-network.py
+++ b/examples/converged-operator-network.py
@@ -30,6 +30,7 @@ n1 = NormalDIF("overlay")
 
 f1e1 = ShimEthDIF("f1e1")
 f1e2 = ShimEthDIF("f1e2")
+f1e3 = ShimEthDIF("f1e3")
 
 l1e1 = ShimEthDIF("l1e1")
 
@@ -74,24 +75,20 @@ c1e3 = ShimEthDIF("c1e3")
 c1e4 = ShimEthDIF("c1e4")
 
 f1n1 = Node("f1n1",
-            difs = [f1, m1f1, n1],
-            dif_registrations = {f1 : [m1f1], n1: [f1]},
-            client = True)
+            difs = [n1, f1, f1e3],
+            dif_registrations = {f1 : [f1e3], n1: [f1]})
 
 f1n2 = Node("f1n2",
-            difs = [f1, m1f2, f1e1, f1e2],
-            dif_registrations = {f1: [m1f2, f1e1, f1e2]},
-            client = False)
+            difs = [f1, m1f2, f1e1, f1e2, f1e3],
+            dif_registrations = {f1: [m1f2, f1e1, f1e2, f1e3]})
 
 f1n3 = Node("f1n3",
-            difs = [f1, f1e1, n1],
-            dif_registrations = {f1: [f1e1], n1: [f1]},
-            client = True)
+            difs = [n1, f1, f1e1],
+            dif_registrations = {f1: [f1e1], n1: [f1]})
 
 f1n4 = Node("f1n4",
-            difs = [f1, f1e2, n1],
-            dif_registrations = {f1: [f1e2], n1: [f1]},
-            client = True)
+            difs = [n1, f1, f1e2],
+            dif_registrations = {f1: [f1e2], n1: [f1]})
 
 l1n1 = Node("l1n1",
             difs = [n1, l1, m2l1, l1e1],
@@ -99,8 +96,7 @@ l1n1 = Node("l1n1",
 
 l1n2 = Node("l1n2",
             difs = [n1, l1, l1e1],
-            dif_registrations = {l1: [l1e1], n1: [l1]},
-            client = True)
+            dif_registrations = {l1: [l1e1], n1: [l1]})
 
 m1n1 = Node("m1n1",
             difs = [m1, m1e1, m1e6],
@@ -119,9 +115,9 @@ m1n5 = Node("m1n5",
             difs = [m1, m1e4, m1e5],
             dif_registrations = {m1: [m1e4, m1e5]})
 m1n6 = Node("m1n6",
-            difs = [m1, f1, m1e5, m1e6, m1f2, m1f1, n1],
+            difs = [m1, f1, m1e5, m1e6, m1f2, n1],
             dif_registrations = {m1: [m1e5, m1e6],
-                                 f1: [m1f1, m1f2], n1: [f1, m1]})
+                                 f1: [m1f2], n1: [f1, m1]})
 
 m2n1 = Node("m2n1",
             difs = [m2, m2e1, m2e6],
@@ -139,7 +135,7 @@ m2n5 = Node("m2n5",
             difs = [m2, m2e4, m2e5],
             dif_registrations = {m2: [m2e4, m2e5]})
 m2n6 = Node("m2n6",
-            difs = [m2, l1, m2e5, m2e6, m2l1, n1],
+            difs = [n1, m2, l1, m2e5, m2e6, m2l1],
             dif_registrations = {m2: [m2e5, m2e6], l1: [m2l1], n1: [l1, m2]})
 
 m3n1 = Node("m3n1",
@@ -155,11 +151,11 @@ m3n4 = Node("m3n4",
             difs = [m3, m3e3, m3e4, m3c2],
             dif_registrations = {m3: [m3e3, m3e4, m3c2]})
 m3n5 = Node("m3n5",
-            difs = [n1, m3, m3e4, m3e5, m3c2],
-            dif_registrations = {m3: [m3e4, m3e5, m3c2], n1: [m3]})
+            difs = [n1, m3, m3e4, m3e5],
+            dif_registrations = {m3: [m3e4, m3e5], n1: [m3]})
 m3n6 = Node("m3n6",
-            difs = [m3, m3e5, m3e6, m3c1, n1],
-            dif_registrations = {m3: [m3e5, m3e6, m3c1], n1: [m3]})
+            difs = [m3, m3e5, m3e6, n1],
+            dif_registrations = {m3: [m3e5, m3e6], n1: [m3]})
 
 c1n1 = Node("c1n1",
             difs = [n1, c1, m1, m2, m1c1, m2c1, c1e1, c1e4],
@@ -167,7 +163,7 @@ c1n1 = Node("c1n1",
                                  m2: [m2c1, c1], n1: [m1, m2]})
 c1n2 = Node("c1n2",
             difs = [n1, c1, m2, m3, m2c2, m3c1, c1e1, c1e2],
-            dif_registrations = {c1: [c1e1, c1e2], m2: [m2c2], m3: [c1, m2c2],
+            dif_registrations = {c1: [c1e1, c1e2], m2: [m2c2, m3c1], m3: [c1, m2c2],
                                  n1: [m2, m3]})
 c1n3 = Node("c1n3",
             difs = [n1, c1, m3, m3c2, c1e2, c1e3],
@@ -191,11 +187,12 @@ exp = rl.Experiment(tb, nodes = [f1n1, f1n2, f1n3, f1n4,
 
 print(exp)
 
-with ExperimentManager(exp):
+with ExperimentManager(exp, do_swap_out=ExperimentManager.PROMPT):
     exp.swap_in()
     exp.install_prototype()
     exp.bootstrap_prototype()
-    c1 = Client("rinaperf", options ="-i 10000 -s 1000 -c 0 -d overlay")
+    c1 = Client("rinaperf", options ="-i 10000 -s 1000 -c 0 -d overlay",
+                nodes=[f1n1, f1n3, f1n4, l1n2])
     s1 = Server("rinaperf", arrival_rate=2, mean_duration=5,
                 options = "-l -d overlay", nodes = [c1n1], clients = [c1])
     sb = StoryBoard(experiment=exp, duration=3600, servers = [s1])