X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=test%2Fresources%2Flinux%2Fns3%2Fns3dceapplication.py;h=c24d07dfa3070420c7d088da46317c06e7626245;hb=d50ba1a08e541ded7a8b322493ebb1d0cc59c6ff;hp=3f9443a4bb5c99445a1faa1998052882389cdb2a;hpb=4762aa96c7f41a86d919db6dac0feca2c6ca8e16;p=nepi.git

diff --git a/test/resources/linux/ns3/ns3dceapplication.py b/test/resources/linux/ns3/ns3dceapplication.py
index 3f9443a4..c24d07df 100755
--- a/test/resources/linux/ns3/ns3dceapplication.py
+++ b/test/resources/linux/ns3/ns3dceapplication.py
@@ -144,7 +144,7 @@ class LinuxNS3DceApplicationTest(unittest.TestCase):
     def t_dce_ping(self, host, user = None, identity = None):
         ec = ExperimentController(exp_id = "test-dce-ping")
 
-        node = ec.register_resource("LinuxNode")
+        node = ec.register_resource("linux::Node")
         if host == "localhost":
             ec.set(node, "hostname", host)
         else:
@@ -155,7 +155,7 @@ class LinuxNS3DceApplicationTest(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, "buildMode", "debug")
         ec.set(simu, "nsLog", "DceApplication")
@@ -177,7 +177,7 @@ class LinuxNS3DceApplicationTest(unittest.TestCase):
         ec.register_connection(chan, p2p2)
 
         ### create applications
-        ping = ec.register_resource("ns3::LinuxDceApplication")
+        ping = ec.register_resource("linux::ns3::dce::Application")
         ec.set (ping, "sources", "http://www.skbuff.net/iputils/iputils-s20101006.tar.bz2")
         ec.set (ping, "build", "tar xvjf ${SRC}/iputils-s20101006.tar.bz2 && "
                 "cd iputils-s20101006/ && "
@@ -217,7 +217,7 @@ class LinuxNS3DceApplicationTest(unittest.TestCase):
     def t_dce_ccn(self, host, user = None, identity = None):
         ec = ExperimentController(exp_id = "test-dce-ccn")
        
-        node = ec.register_resource("LinuxNode")
+        node = ec.register_resource("linux::Node")
         if host == "localhost":
             ec.set(node, "hostname", host)
         else:
@@ -228,7 +228,7 @@ class LinuxNS3DceApplicationTest(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, "buildMode", "debug")
         ec.set(simu, "nsLog", "DceApplication")
@@ -250,7 +250,7 @@ class LinuxNS3DceApplicationTest(unittest.TestCase):
         ec.register_connection(chan, p2p2)
 
         ### create applications
-        ccnd1 = ec.register_resource("ns3::LinuxCCNDceApplication")
+        ccnd1 = ec.register_resource("linux::ns3::dce::CCNApplication")
 
         if host == self.fedora_host:
             depends = ( " autoconf openssl-devel  expat-devel libpcap-devel "
@@ -282,7 +282,7 @@ class LinuxNS3DceApplicationTest(unittest.TestCase):
             os.path.dirname(os.path.realpath(__file__)), "ccn", 
             "repoFile1")
 
-        ccnr = ec.register_resource("ns3::LinuxCCNDceApplication")
+        ccnr = ec.register_resource("linux::ns3::dce::CCNApplication")
         ec.set (ccnr, "binary", "ccnr")
         ec.set (ccnr, "environment", "CCNR_DIRECTORY=/REPO/")
         ec.set (ccnr, "files", "%s=/REPO/repoFile1" % repofile) 
@@ -291,7 +291,7 @@ class LinuxNS3DceApplicationTest(unittest.TestCase):
         ec.set (ccnr, "StopTime", "120s")
         ec.register_connection(ccnr, nsnode1)
 
-        ccndc1 = ec.register_resource("ns3::LinuxCCNDceApplication")
+        ccndc1 = ec.register_resource("linux::ns3::dce::CCNApplication")
         ec.set (ccndc1, "binary", "ccndc")
         ec.set (ccndc1, "arguments", "-v;add;ccnx:/;udp;10.0.0.2")
         ec.set (ccndc1, "stackSize", 1<<20)
@@ -299,7 +299,7 @@ class LinuxNS3DceApplicationTest(unittest.TestCase):
         ec.set (ccndc1, "StopTime", "120s")
         ec.register_connection(ccndc1, nsnode1)
 
-        ccnd2 = ec.register_resource("ns3::LinuxCCNDceApplication")
+        ccnd2 = ec.register_resource("linux::ns3::dce::CCNApplication")
         ec.set (ccnd2, "binary", "ccnd")
         ec.set (ccnd2, "stackSize", 1<<20)
         ec.set (ccnd2, "environment", "CCND_CAP=50000; CCND_DEBUG=7")
@@ -307,7 +307,7 @@ class LinuxNS3DceApplicationTest(unittest.TestCase):
         ec.set (ccnd2, "StopTime", "120s")
         ec.register_connection(ccnd2, nsnode2)
 
-        ccndc2 = ec.register_resource("ns3::LinuxCCNDceApplication")
+        ccndc2 = ec.register_resource("linux::ns3::dce::CCNApplication")
         ec.set (ccndc2, "binary", "ccndc")
         ec.set (ccndc2, "arguments", "-v;add;ccnx:/;udp;10.0.0.1")
         ec.set (ccndc2, "stackSize", 1<<20)
@@ -315,7 +315,7 @@ class LinuxNS3DceApplicationTest(unittest.TestCase):
         ec.set (ccndc2, "StopTime", "120s")
         ec.register_connection(ccndc2, nsnode2)
 
-        ccnpeek = ec.register_resource("ns3::LinuxCCNDceApplication")
+        ccnpeek = ec.register_resource("linux::ns3::dce::CCNApplication")
         ec.set (ccnpeek, "binary", "ccnpeek")
         ec.set (ccnpeek, "arguments", "ccnx:/test/bunny.ts")
         ec.set (ccnpeek, "stdinFile", "")
@@ -324,7 +324,7 @@ class LinuxNS3DceApplicationTest(unittest.TestCase):
         ec.set (ccnpeek, "StopTime", "120s")
         ec.register_connection(ccnpeek, nsnode2)
 
-        ccncat = ec.register_resource("ns3::LinuxCCNDceApplication")
+        ccncat = ec.register_resource("linux::ns3::dce::CCNApplication")
         ec.set (ccncat, "binary", "ccncat")
         ec.set (ccncat, "arguments", "ccnx:/test/bunny.ts")
         ec.set (ccncat, "stdinFile", "")