X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Fns3%2Fccn%2Fns3dceccn.py;h=39ac9ea31342616bdf28995a498976cd8c134068;hb=d50ba1a08e541ded7a8b322493ebb1d0cc59c6ff;hp=f215fa35711d75a1d23dda4fb659e26e21f1af68;hpb=6096716dbc88a1d9e6a1be8cac477006225d890e;p=nepi.git

diff --git a/test/resources/linux/ns3/ccn/ns3dceccn.py b/test/resources/linux/ns3/ccn/ns3dceccn.py
index f215fa35..39ac9ea3 100755
--- a/test/resources/linux/ns3/ccn/ns3dceccn.py
+++ b/test/resources/linux/ns3/ccn/ns3dceccn.py
@@ -69,7 +69,7 @@ class LinuxNS3CCNDceApplicationTest(unittest.TestCase):
     def t_dce_ccn(self, host, user = None, identity = None):
         ec = ExperimentController(exp_id = "test-dce-ccn-app")
 
-        node = ec.register_resource("LinuxNode")
+        node = ec.register_resource("linux::Node")
         if host == "localhost":
             ec.set(node, "hostname", host)
         else:
@@ -80,10 +80,10 @@ class LinuxNS3CCNDceApplicationTest(unittest.TestCase):
         ec.set(node, "cleanProcesses", True)
         #ec.set(node, "cleanHome", True)
 
-        simu = ec.register_resource("LinuxNS3Simulation")
-        ec.set(simu, "verbose", True)
-        ec.set(simu, "buildMode", "debug")
-        ec.set(simu, "nsLog", "DceApplication")
+        simu = ec.register_resource("linux::ns3::Simulation")
+        #ec.set(simu, "verbose", True)
+        #ec.set(simu, "buildMode", "debug")
+        #ec.set(simu, "nsLog", "DceApplication")
         ec.register_connection(simu, node)
 
         nsnode1 = add_ns3_node(ec, simu)
@@ -102,7 +102,7 @@ class LinuxNS3CCNDceApplicationTest(unittest.TestCase):
         ec.register_connection(chan, p2p2)
 
         ### create applications
-        ccnd1 = ec.register_resource("ns3::LinuxDceCCND")
+        ccnd1 = ec.register_resource("linux::ns3::dce::CCND")
         ec.set (ccnd1, "stackSize", 1<<20)
         ec.set (ccnd1, "debug", 7)
         ec.set (ccnd1, "capacity", 50000)
@@ -114,14 +114,14 @@ class LinuxNS3CCNDceApplicationTest(unittest.TestCase):
             os.path.dirname(os.path.realpath(__file__)),
             "repoFile1")
 
-        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")
         ec.set (ccnr, "StopTime", "120s")
         ec.register_connection(ccnr, nsnode1)
 
-        ccndc1 = ec.register_resource("ns3::LinuxDceFIBEntry")
+        ccndc1 = ec.register_resource("linux::ns3::dce::FIBEntry")
         ec.set (ccndc1, "protocol", "udp") 
         ec.set (ccndc1, "uri", "ccnx:/") 
         ec.set (ccndc1, "host", "10.0.0.2") 
@@ -130,7 +130,7 @@ class LinuxNS3CCNDceApplicationTest(unittest.TestCase):
         ec.set (ccndc1, "StopTime", "120s")
         ec.register_connection(ccndc1, nsnode1)
 
-        ccnd2 = ec.register_resource("ns3::LinuxDceCCND")
+        ccnd2 = ec.register_resource("linux::ns3::dce::CCND")
         ec.set (ccnd2, "stackSize", 1<<20)
         ec.set (ccnd2, "debug", 7)
         ec.set (ccnd2, "capacity", 50000)
@@ -138,7 +138,7 @@ class LinuxNS3CCNDceApplicationTest(unittest.TestCase):
         ec.set (ccnd2, "StopTime", "20s")
         ec.register_connection(ccnd2, nsnode2)
 
-        ccndc2 = ec.register_resource("ns3::LinuxDceFIBEntry")
+        ccndc2 = ec.register_resource("linux::ns3::dce::FIBEntry")
         ec.set (ccndc2, "protocol", "udp") 
         ec.set (ccndc2, "uri", "ccnx:/") 
         ec.set (ccndc2, "host", "10.0.0.1") 
@@ -147,14 +147,14 @@ class LinuxNS3CCNDceApplicationTest(unittest.TestCase):
         ec.set (ccndc2, "StopTime", "120s")
         ec.register_connection(ccndc2, nsnode2)
 
-        ccnpeek = ec.register_resource("ns3::LinuxDceCCNPeek")
+        ccnpeek = ec.register_resource("linux::ns3::dce::CCNPeek")
         ec.set (ccnpeek, "contentName", "ccnx:/test/bunny.ts")
         ec.set (ccnpeek, "stackSize", 1<<20)
         ec.set (ccnpeek, "StartTime", "4s")
         ec.set (ccnpeek, "StopTime", "120s")
         ec.register_connection(ccnpeek, nsnode2)
 
-        ccncat = ec.register_resource("ns3::LinuxDceCCNCat")
+        ccncat = ec.register_resource("linux::ns3::dce::CCNCat")
         ec.set (ccncat, "contentName", "ccnx:/test/bunny.ts")
         ec.set (ccncat, "stackSize", 1<<20)
         ec.set (ccncat, "StartTime", "4s")