X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=examples%2Fccn_emu_live%2Fplanetlab.py;h=5ad3080aa868ad452b2e5466635386716c1164b7;hb=98f05568cf4474005a22f09f5377556c3974c71e;hp=766e96b236e84f0542a23061ce72acb5e5d508c1;hpb=cfc9d6fa368886787111f829ee54bc276aabc730;p=nepi.git

diff --git a/examples/ccn_emu_live/planetlab.py b/examples/ccn_emu_live/planetlab.py
index 766e96b2..5ad3080a 100644
--- a/examples/ccn_emu_live/planetlab.py
+++ b/examples/ccn_emu_live/planetlab.py
@@ -32,20 +32,19 @@ import os
 
 PL_NODES = dict({
     "0": "iraplab1.iralab.uni-karlsruhe.de",
-    "1": "planetlab1.informatik.uni-goettingen.de",
+    "1": "planetvs2.informatik.uni-stuttgart.de",
     "2": "dfn-ple1.x-win.dfn.de",
-    "3": "mars.planetlab.haw-hamburg.de",
-    "4": "planetlab2.unineuchatel.ch", 
+    "3": "planetlab2.extern.kuleuven.be",
+    "4": "mars.planetlab.haw-hamburg.de",
     "5": "planetlab-node3.it-sudparis.eu",
-    "6": "planetlab2.extern.kuleuven.be",
-    "7": "node2pl.planet-lab.telecom-lille1.eu",
-    "8": "planetvs2.informatik.uni-stuttgart.de",
-    "9": "planetlab1.informatik.uni-wuerzburg.de",
-    "10": "planet1.l3s.uni-hannover.de",
-    "11": "planetlab1.wiwi.hu-berlin.de",
-    "12": "pl2.uni-rostock.de", 
-    "13": "planetlab1.u-strasbg.fr",
-    "14": "peeramidion.irisa.fr"
+    "6": "node2pl.planet-lab.telecom-lille1.eu",
+    "7": "planetlab1.informatik.uni-wuerzburg.de",
+    "8": "planet1.l3s.uni-hannover.de",
+    "9": "planetlab1.wiwi.hu-berlin.de",
+    "10": "pl2.uni-rostock.de", 
+    "11": "planetlab1.u-strasbg.fr",
+    "12": "peeramidion.irisa.fr",
+    "13": "planetlab2.unineuchatel.ch", 
     })
 
 pl_slice = os.environ.get("PL_SLICE")
@@ -159,8 +158,9 @@ def avg_interests(ec, run):
         interest_dupnonce_count,
         interest_count,
         content_count) = ccn_parser.process_content_history_logs(
-                logs_dir, 
-                ec.netgraph.topology)
+                logs_dir,
+                ec.netgraph.topology,
+                parse_ping_logs = True)
 
     shortest_path = networkx.shortest_path(graph, 
             source = ec.netgraph.sources()[0], 
@@ -174,7 +174,7 @@ def avg_interests(ec, run):
 
     # TODO: DUMP RESULTS TO FILE
     # TODO: DUMP GRAPH DELAYS!
-    f = open("/tmp/metric", "w+")
+    f = open("/tmp/metric", "a+")
     f.write("%.2f\n" % metric)
     f.close()
     print " METRIC", metric