X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=examples%2Flinux%2Fccn%2Fccncat_extended_ring_topo.py;h=a67075b3684518c5328ad97210da59b9c80deeba;hb=73e978235b69be253e7df98266637c69bbc7922e;hp=7accb3a5bfe4fe3d515794d0ad9e394b215a0be7;hpb=38cae419a35e2f1847dcb279a3e25597e79c80ee;p=nepi.git

diff --git a/examples/linux/ccn/ccncat_extended_ring_topo.py b/examples/linux/ccn/ccncat_extended_ring_topo.py
old mode 100755
new mode 100644
index 7accb3a5..a67075b3
--- a/examples/linux/ccn/ccncat_extended_ring_topo.py
+++ b/examples/linux/ccn/ccncat_extended_ring_topo.py
@@ -138,13 +138,21 @@ if __name__ == '__main__':
 
     ec = ExperimentController(exp_id = exp_id)
 
-    # host in the US
-    host1 = "planetlab4.wail.wisc.edu"
-    host2 = "planetlab2.cs.columbia.edu"
-    host3 = "ricepl-2.cs.rice.edu"
-    host4 = "node1.planetlab.albany.edu"
-    host5 = "earth.cs.brown.edu"
-    host6 = "planetlab2.engr.uconn.edu"
+    # hosts in the US
+    #host1 = "planetlab4.wail.wisc.edu"
+    #host2 = "planetlab2.cs.columbia.edu"
+    #host3 = "ricepl-2.cs.rice.edu"
+    #host4 = "node1.planetlab.albany.edu"
+    #host5 = "earth.cs.brown.edu"
+    #host6 = "planetlab2.engr.uconn.edu"
+
+    # hosts in EU
+    host1 = "planetlab2.fct.ualg.pt"
+    host2 = "planet2.unipr.it"
+    host3 = "planetlab1.aston.ac.uk"
+    host4 = "itchy.comlab.bth.se"
+    host5 = "rochefort.infonet.fundp.ac.be"
+    host6 = "planetlab1.u-strasbg.fr"
 
     # describe nodes in the central ring 
     ring_hosts = [host1, host2, host3, host4]
@@ -204,7 +212,7 @@ if __name__ == '__main__':
             app, ResourceState.STARTED, time = "10s")
     ec.register_condition(l5d, ResourceAction.STOP, 
             app, ResourceState.STARTED, time = "10s")
- 
+
     # Register a collector to automatically collect traces
     collector = add_collector(ec, "stderr", results_dir)
     for ccnd in ccnds.values():