X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Fns3%2Fns3dceapplication.py;h=956d9645dfe99e9f422fbd2c0979e2de15a7422d;hb=e55924b6886bd7382a28e1ae235c4810f852e163;hp=3f9443a4bb5c99445a1faa1998052882389cdb2a;hpb=999ef8574031b2e3facce8607b6e91f42af6dc66;p=nepi.git diff --git a/test/resources/linux/ns3/ns3dceapplication.py b/test/resources/linux/ns3/ns3dceapplication.py index 3f9443a4..956d9645 100755 --- a/test/resources/linux/ns3/ns3dceapplication.py +++ b/test/resources/linux/ns3/ns3dceapplication.py @@ -4,9 +4,8 @@ # Copyright (C) 2013 INRIA # # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation; # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -144,7 +143,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: @@ -153,9 +152,9 @@ class LinuxNS3DceApplicationTest(unittest.TestCase): ec.set(node, "identity", identity) ec.set(node, "cleanProcesses", True) - #ec.set(node, "cleanHome", True) + #ec.set(node, "cleanExperiment", 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 +176,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 +216,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 +227,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 +249,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 +281,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 +290,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 +298,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 +306,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 +314,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 +323,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", "")