X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Fns3%2Fccn%2Fns3dceccnpeek.py;h=a795bad93cc4ccb480a4094a72708850c7beaf32;hb=cee8178a861109caa681cf383e12677ade027056;hp=9e6a15522c85e55343bc78a4974b96c3f0cc0b3b;hpb=06350b6b2c24f5154a51440df59c0b4035439c9a;p=nepi.git

diff --git a/test/resources/linux/ns3/ccn/ns3dceccnpeek.py b/test/resources/linux/ns3/ccn/ns3dceccnpeek.py
index 9e6a1552..a795bad9 100644
--- a/test/resources/linux/ns3/ccn/ns3dceccnpeek.py
+++ b/test/resources/linux/ns3/ccn/ns3dceccnpeek.py
@@ -49,29 +49,28 @@ def add_ns3_node(ec, simu):
 
 class LinuxNS3CCNPeekDceApplicationTest(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 = "nepi2.pl.sophia.inria.fr"
+        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_ccnpeek(pself):
+    def test_dce_ccnpeek(self):
         ec = ExperimentController(exp_id = "test-dce-ccnpeek")
         
         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, "cleanExperiment", True)
         #ec.set(node, "cleanProcesses", True)
         #ec.set(node, "cleanHome", True)
 
         simu = ec.register_resource("LinuxNS3Simulation")
         ec.set(simu, "verbose", True)
         ec.set(simu, "ns3Version", "ns-3-dev")
-        ec.set(simu, "pybindgenVersion", "838")
-        ec.set(simu, "enableDCE", True)
+        ec.set(simu, "pybindgenVersion", "868")
         ec.set(simu, "buildMode", "debug")
         ec.set(simu, "nsLog", "DceApplication")
         ec.register_connection(simu, node)
@@ -126,7 +125,7 @@ class LinuxNS3CCNPeekDceApplicationTest(unittest.TestCase):
         ec.set(simu, "verbose", True)
         #ec.set(simu, "ns3Version", "ns-3.19")
         #ec.set(simu, "pybindgenVersion", "834")
-        ec.set(simu, "enableDCE", True)
+        ec.set(node, "cleanExperiment", True)
         ec.register_connection(simu, node)
 
         nsnode = add_ns3_node(ec, simu)
@@ -169,5 +168,61 @@ class LinuxNS3CCNPeekDceApplicationTest(unittest.TestCase):
 
         ec.shutdown()
 
+    def test_dce_ccnpeek_local_with_stack(self):
+        ec = ExperimentController(exp_id = "test-dce-ccnpeek-lostack")
+        
+        node = ec.register_resource("LinuxNode")
+        ec.set(node, "hostname", "localhost")
+
+        simu = ec.register_resource("LinuxNS3Simulation")
+        ec.set(simu, "verbose", True)
+        #ec.set(simu, "ns3Version", "ns-3.19")
+        #ec.set(simu, "pybindgenVersion", "834")
+        ec.set(node, "cleanExperiment", True)
+        ec.register_connection(simu, node)
+
+        nsnode = ec.register_resource("ns3::Node")
+        ec.set(nsnode, "enableStack", True)
+        ec.register_connection(nsnode, simu)
+
+        ### create applications
+        ccnd = ec.register_resource("ns3::LinuxDceCCND")
+        ec.set (ccnd, "stackSize", 1<<20)
+        ec.set (ccnd, "StartTime", "1s")
+        ec.register_connection(ccnd, nsnode)
+
+        ccnpoke = ec.register_resource("ns3::LinuxDceCCNPoke")
+        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")
+        ec.set (ccnpeek, "contentName", "ccnx:/chunk0")
+        ec.set (ccnpeek, "stackSize", 1<<20)
+        ec.set (ccnpeek, "StartTime", "4s")
+        ec.set (ccnpeek, "StopTime", "20s")
+        ec.register_connection(ccnpeek, nsnode)
+
+        ec.deploy()
+
+        ec.wait_finished([ccnpeek])
+
+        expected = "ccnpeek ccnx:/chunk0"
+        cmdline = ec.trace(ccnpeek, "cmdline")
+        self.assertTrue(cmdline.find(expected) > -1, cmdline)
+
+        expected = "Start Time: NS3 Time:          4s ("
+        status = ec.trace(ccnpeek, "status")
+        self.assertTrue(status.find(expected) > -1, status)
+
+        expected = "DATA"
+        stdout = ec.trace(ccnpeek, "stdout")
+        self.assertTrue(stdout.find(expected) > -1, stdout)
+
+        ec.shutdown()
+
+
 if __name__ == '__main__':
     unittest.main()