X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=examples%2Fccn_emu_live%2Fplanetlab_4_nodes_linear.py;fp=examples%2Fccn_emu_live%2Fplanetlab_4_nodes_linear.py;h=21d7be650005b8a41d919e8d2cbc95c9113924c0;hb=d50ba1a08e541ded7a8b322493ebb1d0cc59c6ff;hp=d027a59f18992ddd9594e85ac974ade370d11722;hpb=4762aa96c7f41a86d919db6dac0feca2c6ca8e16;p=nepi.git

diff --git a/examples/ccn_emu_live/planetlab_4_nodes_linear.py b/examples/ccn_emu_live/planetlab_4_nodes_linear.py
index d027a59f..21d7be65 100644
--- a/examples/ccn_emu_live/planetlab_4_nodes_linear.py
+++ b/examples/ccn_emu_live/planetlab_4_nodes_linear.py
@@ -130,13 +130,13 @@ repofile = os.path.join(
         "repoFile1.0.8.2")
 
 def get_simulator(ec):
-    simulator = ec.filter_resources("LinuxNS3Simulation")
+    simulator = ec.filter_resources("linux::ns3::Simulation")
 
     if not simulator:
-        node = ec.register_resource("LinuxNode")
+        node = ec.register_resource("linux::Node")
         ec.set(node, "hostname", "localhost")
 
-        simu = ec.register_resource("LinuxNS3Simulation")
+        simu = ec.register_resource("linux::ns3::Simulation")
         ec.register_connection(simu, node)
         return simu
 
@@ -166,7 +166,7 @@ def add_dce_ccnd(ec, nid):
     host = ec.netgraph.node_annotation(nid, "host")
     
     # Add dce ccnd to the dce node
-    ccnd = ec.register_resource("ns3::LinuxDceCCND")
+    ccnd = ec.register_resource("linux::ns3::dce::CCND")
     ec.set (ccnd, "stackSize", 1<<20)
     ec.set (ccnd, "debug", 7)
     ec.set (ccnd, "capacity", 50000)
@@ -186,7 +186,7 @@ def add_dce_ccnr(ec, nid):
     host = ec.netgraph.node_annotation(nid, "host")
     
     # Add a CCN content repository to the dce node
-    ccnr = ec.register_resource("ns3::LinuxDceCCNR")
+    ccnr = ec.register_resource("linux::ns3::dce::CCNR")
     ec.set (ccnr, "repoFile1", repofile) 
     ec.set (ccnr, "stackSize", 1<<20)
     ec.set (ccnr, "StartTime", "2s")
@@ -198,7 +198,7 @@ def add_dce_ccncat(ec, nid):
     host = ec.netgraph.node_annotation(nid, "host")
    
     # Add a ccncat application to the dce host
-    ccncat = ec.register_resource("ns3::LinuxDceCCNCat")
+    ccncat = ec.register_resource("linux::ns3::dce::CCNCat")
     ec.set (ccncat, "contentName", content_name)
     ec.set (ccncat, "stackSize", 1<<20)
     ec.set (ccncat, "StartTime", "8s")
@@ -212,7 +212,7 @@ def add_dce_fib_entry(ec, nid1, nid2):
     ip2 = net[nid2]
 
     # Add FIB entry between peer hosts
-    ccndc = ec.register_resource("ns3::LinuxDceFIBEntry")
+    ccndc = ec.register_resource("linux::ns3::dce::FIBEntry")
     ec.set (ccndc, "protocol", "udp") 
     ec.set (ccndc, "uri", "ccnx:/") 
     ec.set (ccndc, "host", ip2)
@@ -243,7 +243,7 @@ def add_pl_host(ec, nid):
     hostname = NODES[nid]
 
     # Add a planetlab host to the experiment description
-    host = ec.register_resource("PlanetlabNode")
+    host = ec.register_resource("planetlab::Node")
     ec.set(host, "hostname", hostname)
     ec.set(host, "username", pl_slice)
     ec.set(host, "identity", pl_ssh_key)
@@ -263,7 +263,7 @@ def add_pl_ccnd(ec, nid):
     host = ec.netgraph.node_annotation(nid, "host")
     
     # Add a CCN daemon to the planetlab node
-    ccnd = ec.register_resource("LinuxCCND")
+    ccnd = ec.register_resource("linux::CCND")
     ec.set(ccnd, "debug", 7)
     ec.register_connection(ccnd, host)
     
@@ -279,7 +279,7 @@ def add_pl_ccnr(ec, nid):
     ccnd = ec.netgraph.node_annotation(nid, "ccnd")
     
     # Add a CCN content repository to the planetlab node
-    ccnr = ec.register_resource("LinuxCCNR")
+    ccnr = ec.register_resource("linux::CCNR")
 
     ec.set(ccnr, "repoFile1", repofile)
     ec.register_connection(ccnr, ccnd)
@@ -289,7 +289,7 @@ def add_pl_ccncat(ec, nid):
     ccnd = ec.netgraph.node_annotation(nid, "ccnd")
     
     # Add a CCN cat application to the planetlab node
-    ccncat = ec.register_resource("LinuxCCNCat")
+    ccncat = ec.register_resource("linux::CCNCat")
     ec.set(ccncat, "contentName", content_name)
     ec.register_connection(ccncat, ccnd)
 
@@ -299,7 +299,7 @@ def add_pl_fib_entry(ec, nid1, nid2):
     hostname2 = ec.netgraph.node_annotation(nid2, "hostname")
     
     # Add a FIB entry between one planetlab node and its peer
-    entry = ec.register_resource("LinuxFIBEntry")
+    entry = ec.register_resource("linux::FIBEntry")
     ec.set(entry, "host", hostname2)
     ec.register_connection(entry, ccnd1)
 
@@ -338,7 +338,7 @@ def add_node(ec, nid):
         add_pl_ccncat(ec, nid)
 
 def wait_guids(ec):
-    return ec.filter_resources("LinuxCCNCat")
+    return ec.filter_resources("linux::CCNCat")
 
 if __name__ == '__main__':