X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Fns3%2Fccn%2Fns3dceccn.py;h=39ac9ea31342616bdf28995a498976cd8c134068;hb=d50ba1a08e541ded7a8b322493ebb1d0cc59c6ff;hp=63b740032e2ead44fc47596f841dd9ddf1cacf3f;hpb=2636d5f8aedcc2935e37efbdc2276ec358dec3b7;p=nepi.git diff --git a/test/resources/linux/ns3/ccn/ns3dceccn.py b/test/resources/linux/ns3/ccn/ns3dceccn.py old mode 100644 new mode 100755 index 63b74003..39ac9ea3 --- a/test/resources/linux/ns3/ccn/ns3dceccn.py +++ b/test/resources/linux/ns3/ccn/ns3dceccn.py @@ -20,7 +20,8 @@ from nepi.execution.ec import ExperimentController -from nepi.execution.trace import TraceAttr + +from test_utils import skipIfNotAlive import os import time @@ -47,12 +48,10 @@ def add_ns3_node(ec, simu): return node -def add_point2point_device(ec, node, address = None, prefix = None): +def add_point2point_device(ec, node, ip, prefix): dev = ec.register_resource("ns3::PointToPointNetDevice") - if address: - ec.set(dev, "ip", address) - if prefix: - ec.set(dev, "prefix", prefix) + ec.set(dev, "ip", ip) + ec.set(dev, "prefix", prefix) ec.register_connection(node, dev) queue = ec.register_resource("ns3::DropTailQueue") @@ -60,31 +59,31 @@ def add_point2point_device(ec, node, address = None, prefix = None): return dev -class LinuxNS3PingDceApplicationTest(unittest.TestCase): +class LinuxNS3CCNDceApplicationTest(unittest.TestCase): def setUp(self): - #self.fedora_host = "nepi2.pl.sophia.inria.fr" - #self.fedora_host = "planetlabpc1.upf.edu" - #self.fedora_user = "inria_nepi" - #self.fedora_identity = "%s/.ssh/id_rsa_planetlab" % (os.environ['HOME']) - self.fedora_host = "mimas.inria.fr" - self.fedora_user = "aquereil" - self.fedora_identity = "%s/.ssh/id_rsa" % (os.environ['HOME']) - - def test_dce_ccn(self): - ec = ExperimentController(exp_id = "test-dceccn") + self.fedora_host = "nepi2.pl.sophia.inria.fr" + self.fedora_user = "inria_nepi" + self.fedora_identity = "%s/.ssh/id_rsa_planetlab" % (os.environ['HOME']) + + @skipIfNotAlive + def t_dce_ccn(self, host, user = None, identity = None): + ec = ExperimentController(exp_id = "test-dce-ccn-app") + + node = ec.register_resource("linux::Node") + if host == "localhost": + ec.set(node, "hostname", host) + else: + ec.set(node, "hostname", host) + ec.set(node, "username", user) + ec.set(node, "identity", identity) - node = ec.register_resource("LinuxNode") - ec.set(node, "hostname", self.fedora_host) - ec.set(node, "username", self.fedora_user) - ec.set(node, "identity", self.fedora_identity) - #ec.set(node, "cleanProcesses", True) + ec.set(node, "cleanProcesses", True) #ec.set(node, "cleanHome", True) - simu = ec.register_resource("LinuxNS3Simulation") - ec.set(simu, "verbose", True) - ec.set(simu, "enableDCE", 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) @@ -103,7 +102,7 @@ class LinuxNS3PingDceApplicationTest(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) @@ -115,14 +114,14 @@ class LinuxNS3PingDceApplicationTest(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") @@ -131,7 +130,7 @@ class LinuxNS3PingDceApplicationTest(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) @@ -139,7 +138,7 @@ class LinuxNS3PingDceApplicationTest(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") @@ -148,14 +147,14 @@ class LinuxNS3PingDceApplicationTest(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") @@ -180,5 +179,11 @@ class LinuxNS3PingDceApplicationTest(unittest.TestCase): ec.shutdown() + def test_dce_ccn_fedora(self): + self.t_dce_ccn(self.fedora_host, self.fedora_user, self.fedora_identity) + + def test_dce_ccn_local(self): + self.t_dce_ccn("localhost") + if __name__ == '__main__': unittest.main()