still making both branches closer

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

diff --git a/examples/omf/testing/nepi_omf5_nitos_ccnring.py b/examples/omf/testing/nepi_omf5_nitos_ccnring.py
index 98a41a0..d38ba6b 100644 (file)
--- a/examples/omf/testing/nepi_omf5_nitos_ccnring.py
+++ b/examples/omf/testing/nepi_omf5_nitos_ccnring.py
@@ -176,23 +176,23 @@ 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()
     ccnrs = dict()
-    for i in xrange(len(all_hosts)):
-        ccndstart = add_app(ec, nodes[all_hosts[i]],  "#ccndstart", "ccndstart &", 
+    for i, host in enumerate(all_hosts):
+        ccndstart = add_app(ec, nodes[host],  "#ccndstart", "ccndstart &", 
                               env, xmpp_slice, xmpp_host)
-        ccnr = add_app(ec, nodes[all_hosts[i]],  "#ccnr", "ccnr &", 
+        ccnr = add_app(ec, nodes[host],  "#ccnr", "ccnr &", 
                              env, xmpp_slice, xmpp_host)
-        ccnds[all_hosts[i]] = ccndstart
-        ccnrs[all_hosts[i]] = ccnr
+        ccnds[host] = ccndstart
+        ccnrs[host] = ccnr
         ec.register_condition(ccnr, ResourceAction.START, ccndstart, ResourceState.STARTED, "1s")
 
 # CCNDC setup 
@@ -226,9 +226,9 @@ if __name__ == '__main__':
     link = [l1u, l1d, l2u, l2d, l3u, l3d, l4u, l4d, l5u, l5d, b1u, b1d, b2u, b2d]
 
 # List of condition
-    for i in xrange(len(all_hosts)):
-         ec.register_condition(ccnrs[all_hosts[i]], ResourceAction.START, ccnds[all_hosts[i]], ResourceState.STARTED, "1s")
-         ec.register_condition(link, ResourceAction.START, ccnrs[all_hosts[i]], ResourceState.STARTED, "1s")
+    for host in all_hosts:
+         ec.register_condition(ccnrs[host], ResourceAction.START, ccnds[host], ResourceState.STARTED, "1s")
+         ec.register_condition(link, ResourceAction.START, ccnrs[host], ResourceState.STARTED, "1s")
 
 # Streaming Server
     pub = add_publish(ec, nodes[host5], movie, xmpp_slice, xmpp_host)
@@ -255,17 +255,17 @@ if __name__ == '__main__':
 
 # Cleaning when the experiment stop
     ccndstops = []
-    for i in xrange(len(all_hosts)):
-        ccndstop = add_app(ec, nodes[all_hosts[i]], "#ccndstop", "ccndstop", env, xmpp_slice, xmpp_host)
+    for host all_hosts:
+        ccndstop = add_app(ec, nodes[host], "#ccndstop", "ccndstop", env, xmpp_slice, xmpp_host)
         ccndstops.append(ccndstop)
 
     killall = add_app(ec, nodes[host6], "#kill", "killall sh", "", xmpp_slice, xmpp_host)
 
 # 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]])
+    for host in all_hosts:
+        apps.append(ccnds[host])
+        apps.append(ccnrs[host])
     apps += link
     apps.append(pub)
     apps.append(stream)