Changing ResourceManager naming for platform::ResourceName

[nepi.git] / test / resources / linux / ns3 / ccn / ns3dceccnpeek.py

diff --git a/test/resources/linux/ns3/ccn/ns3dceccnpeek.py b/test/resources/linux/ns3/ccn/ns3dceccnpeek.py
index 6abfc5e..adfb2b4 100755 (executable)
--- a/test/resources/linux/ns3/ccn/ns3dceccnpeek.py
+++ b/test/resources/linux/ns3/ccn/ns3dceccnpeek.py
@@ -58,7 +58,7 @@ class LinuxNS3CCNPeekDceApplicationTest(unittest.TestCase):
     def t_dce_ccnpeek(self, host, user = None, identity = None):
         ec = ExperimentController(exp_id = "test-dce-ccnpeek")
 
-        node = ec.register_resource("LinuxNode")
+        node = ec.register_resource("linux::Node")
         if host == "localhost":
             ec.set(node, "hostname", host)
         else:
@@ -69,7 +69,7 @@ class LinuxNS3CCNPeekDceApplicationTest(unittest.TestCase):
         ec.set(node, "cleanProcesses", True)
         #ec.set(node, "cleanHome", True)
 
-        simu = ec.register_resource("LinuxNS3Simulation")
+        simu = ec.register_resource("linux::ns3::Simulation")
         ec.set(simu, "verbose", True)
         ec.set(simu, "nsLog", "DceApplication")
         ec.register_connection(simu, node)
@@ -77,19 +77,19 @@ class LinuxNS3CCNPeekDceApplicationTest(unittest.TestCase):
         nsnode = add_ns3_node(ec, simu)
 
         ### create applications
-        ccnd = ec.register_resource("ns3::LinuxDceCCND")
+        ccnd = ec.register_resource("linux::ns3::dce::CCND")
         ec.set (ccnd, "stackSize", 1<<20)
         ec.set (ccnd, "StartTime", "1s")
         ec.register_connection(ccnd, nsnode)
 
-        ccnpoke = ec.register_resource("ns3::LinuxDceCCNPoke")
+        ccnpoke = ec.register_resource("linux::ns3::dce::CCNPoke")
         ec.set (ccnpoke, "contentName", "ccnx:/chunk0")
         ec.set (ccnpoke, "content", "DATA")
         ec.set (ccnpoke, "stackSize", 1<<20)
         ec.set (ccnpoke, "StartTime", "2s")
         ec.register_connection(ccnpoke, nsnode)
 
-        ccnpeek = ec.register_resource("ns3::LinuxDceCCNPeek")
+        ccnpeek = ec.register_resource("linux::ns3::dce::CCNPeek")
         ec.set (ccnpeek, "contentName", "ccnx:/chunk0")
         ec.set (ccnpeek, "stackSize", 1<<20)
         ec.set (ccnpeek, "StartTime", "4s")
@@ -118,7 +118,7 @@ class LinuxNS3CCNPeekDceApplicationTest(unittest.TestCase):
     def t_dce_ccnpeek_with_stack(self, host, user = None, identity = None):
         ec = ExperimentController(exp_id = "test-dce-peek-lostack")
         
-        node = ec.register_resource("LinuxNode")
+        node = ec.register_resource("linux::Node")
         if host == "localhost":
             ec.set(node, "hostname", host)
         else:
@@ -129,7 +129,7 @@ class LinuxNS3CCNPeekDceApplicationTest(unittest.TestCase):
         ec.set(node, "cleanProcesses", True)
         #ec.set(node, "cleanHome", True)
 
-        simu = ec.register_resource("LinuxNS3Simulation")
+        simu = ec.register_resource("linux::ns3::Simulation")
         ec.set(simu, "verbose", True)
         ec.register_connection(simu, node)
 
@@ -138,19 +138,19 @@ class LinuxNS3CCNPeekDceApplicationTest(unittest.TestCase):
         ec.register_connection(nsnode, simu)
 
         ### create applications
-        ccnd = ec.register_resource("ns3::LinuxDceCCND")
+        ccnd = ec.register_resource("linux::ns3::dce::CCND")
         ec.set (ccnd, "stackSize", 1<<20)
         ec.set (ccnd, "StartTime", "1s")
         ec.register_connection(ccnd, nsnode)
 
-        ccnpoke = ec.register_resource("ns3::LinuxDceCCNPoke")
+        ccnpoke = ec.register_resource("linux::ns3::dce::CCNPoke")
         ec.set (ccnpoke, "contentName", "ccnx:/chunk0")
         ec.set (ccnpoke, "content", "DATA")
         ec.set (ccnpoke, "stackSize", 1<<20)
         ec.set (ccnpoke, "StartTime", "2s")
         ec.register_connection(ccnpoke, nsnode)
 
-        ccnpeek = ec.register_resource("ns3::LinuxDceCCNPeek")
+        ccnpeek = ec.register_resource("linux::ns3::dce::CCNPeek")
         ec.set (ccnpeek, "contentName", "ccnx:/chunk0")
         ec.set (ccnpeek, "stackSize", 1<<20)
         ec.set (ccnpeek, "StartTime", "4s")