X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=examples%2Fomf%2Ftesting%2Fnepi_omf5_nitos_ccnring.py;h=7b9e09b6a5405dc9e67e0fe772c80a114cf256bb;hb=ceb8eff6fce7c6d83025f3894b63046aac0d9cff;hp=98a41a06033c203e5175408311ae92a85004f8cc;hpb=039fbd9629d7570d4c175a5448d24badcd0f3aba;p=nepi.git diff --git a/examples/omf/testing/nepi_omf5_nitos_ccnring.py b/examples/omf/testing/nepi_omf5_nitos_ccnring.py index 98a41a06..7b9e09b6 100644 --- a/examples/omf/testing/nepi_omf5_nitos_ccnring.py +++ b/examples/omf/testing/nepi_omf5_nitos_ccnring.py @@ -176,7 +176,7 @@ if __name__ == '__main__': nodes = dict() chann = add_channel(ec, channel, xmpp_slice, xmpp_host) - for i in xrange(len(all_hosts)): + for i in range(len(all_hosts)): node = add_node(ec,all_hosts[i], xmpp_slice, xmpp_host) iface = add_interface(ec, all_ip[i], xmpp_slice, xmpp_host) ec.register_connection(node, iface) @@ -186,7 +186,7 @@ if __name__ == '__main__': # CCN setup for the node ccnds = dict() ccnrs = dict() - for i in xrange(len(all_hosts)): + for i in range(len(all_hosts)): ccndstart = add_app(ec, nodes[all_hosts[i]], "#ccndstart", "ccndstart &", env, xmpp_slice, xmpp_host) ccnr = add_app(ec, nodes[all_hosts[i]], "#ccnr", "ccnr &", @@ -226,7 +226,7 @@ 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)): + for i in range(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") @@ -255,7 +255,7 @@ if __name__ == '__main__': # Cleaning when the experiment stop ccndstops = [] - for i in xrange(len(all_hosts)): + for i in range(len(all_hosts)): ccndstop = add_app(ec, nodes[all_hosts[i]], "#ccndstop", "ccndstop", env, xmpp_slice, xmpp_host) ccndstops.append(ccndstop) @@ -263,7 +263,7 @@ if __name__ == '__main__': # Condition to stop and clean the experiment apps = [] - for i in xrange(len(all_hosts)): + for i in range(len(all_hosts)): apps.append(ccnds[all_hosts[i]]) apps.append(ccnrs[all_hosts[i]]) apps += link