still making both branches closer

[nepi.git] / examples / omf / testing / nepi_omf5_plexus_ccncat_linear.py

diff --git a/examples/omf/testing/nepi_omf5_plexus_ccncat_linear.py b/examples/omf/testing/nepi_omf5_plexus_ccncat_linear.py
index 7e37435..bb812ef 100644 (file)
--- a/examples/omf/testing/nepi_omf5_plexus_ccncat_linear.py
+++ b/examples/omf/testing/nepi_omf5_plexus_ccncat_linear.py
@@ -166,12 +166,12 @@ if __name__ == '__main__':
     nodes = dict()
 
     chann = add_channel(ec, channel, xmpp_slice, xmpp_host)
-    for i in xrange(len(all_hosts)):
-        node = add_node(ec,all_hosts[i], xmpp_slice, xmpp_host)
+    for i, host in enumerate(all_hosts):
+        node = add_node(ec,host, xmpp_slice, xmpp_host)
         iface = add_interface(ec, all_ip[i], xmpp_slice, xmpp_host)
         ec.register_connection(node, iface)
         ec.register_connection(iface, chann)
-        nodes[all_hosts[i]] = node
+        nodes[host] = node
 
 #### CCN setup for the node
 ###    ccnds = dict()
@@ -213,28 +213,28 @@ if __name__ == '__main__':
 # Do the iperf
     iperfserv = dict()
     iperfclient = dict()
-    for i in xrange(len(all_hosts)):
-        perfserv = add_app(ec, nodes[all_hosts[i]],  "#perfserv", "iperf -s > /opt/iperfserv.txt", 
+    for i, host in enumerate(all_hosts):
+        perfserv = add_app(ec, nodes[host],  "#perfserv", "iperf -s > /opt/iperfserv.txt", 
                               env, xmpp_slice, xmpp_host)
-        iperfclient[all_hosts[i]] = []
+        iperfclient[host] = []
         if i > 0:
             cmd = "iperf -c " + all_ip[i-1] + " > /opt/iperclient1.txt"
-            perfclient1 = add_app(ec, nodes[all_hosts[i]],  "#perfclient1", cmd, 
+            perfclient1 = add_app(ec, nodes[host],  "#perfclient1", cmd, 
                             env, xmpp_slice, xmpp_host)
-            iperfclient[all_hosts[i]].append(perfclient1)
+            iperfclient[host].append(perfclient1)
 
         if i < (len(all_hosts)-1):
             cmd = "iperf -c " + all_ip[i+1] + " > /opt/iperclient2.txt"
-            perfclient2 = add_app(ec, nodes[all_hosts[i]],  "#perfclient2", cmd, 
+            perfclient2 = add_app(ec, nodes[host],  "#perfclient2", cmd, 
                             env, xmpp_slice, xmpp_host)
-            iperfclient[all_hosts[i]].append(perfclient2)
+            iperfclient[host].append(perfclient2)
 
-        iperfserv[all_hosts[i]] = perfserv
+        iperfserv[host] = perfserv
 
-    for i in xrange(len(all_hosts)):
-         #ec.register_condition(iperfserv[all_hosts[i]], ResourceAction.START, link, ResourceState.STARTED, "2s")
-         for elt in iperfclient[all_hosts[i]]:
-             ec.register_condition(elt, ResourceAction.START, iperfserv[all_hosts[i]], ResourceState.STARTED, "3s")
+    for host in all_hosts:
+         #ec.register_condition(iperfserv[host], ResourceAction.START, link, ResourceState.STARTED, "2s")
+         for elt in iperfclient[host]:
+             ec.register_condition(elt, ResourceAction.START, iperfserv[host], ResourceState.STARTED, "3s")
 
 
 ## Streaming Server
@@ -257,18 +257,18 @@ if __name__ == '__main__':
 ##        ccndstop = add_app(ec, nodes[all_hosts[i]], "#ccndstop", "ccndstop", env, xmpp_slice, xmpp_host)
 ##        ccndstops.append(ccndstop)
     perfkill = dict()
-    for i in xrange(len(all_hosts)):
-        kill = add_app(ec, nodes[all_hosts[i]], "#kill", "killall iperf", "", xmpp_slice, xmpp_host)
-        perfkill[all_hosts[i]] = kill
+    for host in all_hosts:
+        kill = add_app(ec, nodes[host], "#kill", "killall iperf", "", xmpp_slice, xmpp_host)
+        perfkill[host] = kill
 
 
 # Condition to stop and clean the experiment
     apps = []
-    for i in xrange(len(all_hosts)):
-#        apps.append(ccnds[all_hosts[i]])
-#        apps.append(ccnrs[all_hosts[i]])
-        apps.append(iperfserv[all_hosts[i]])
-        for elt in iperfclient[all_hosts[i]]:
+    for host in all_hosts:
+#        apps.append(ccnds[host])
+#        apps.append(ccnrs[host])
+        apps.append(iperfserv[host])
+        for elt in iperfclient[host]:
             apps.append(elt)
 #    apps += link
     #apps.append(pub)
@@ -280,8 +280,8 @@ if __name__ == '__main__':
 #    ec.register_condition(ccndstops + [killall], ResourceAction.STOP, ccndstops, ResourceState.STARTED, "1s")
 
     killall = []
-    for i in xrange(len(all_hosts)):
-        killall.append(perfkill[all_hosts[i]])
+    for host in all_hosts:
+        killall.append(perfkill[host])
 
     ec.register_condition(killall, ResourceAction.START, apps, ResourceState.STOPPED, "1s")
     ec.register_condition(killall, ResourceAction.STOP, killall, ResourceState.STARTED, "1s")