Fixing ns-3 DCE tests
[nepi.git] / test / resources / linux / ns3 / ns3dceapplication.py
index a4901ae..8528f69 100644 (file)
@@ -22,6 +22,8 @@
 from nepi.execution.ec import ExperimentController 
 from nepi.execution.trace import TraceAttr
 
+from test_utils import skipIfNotAlive
+
 import os
 import time
 import unittest
@@ -42,14 +44,15 @@ def add_ns3_node(ec, simu):
     udp = ec.register_resource("ns3::UdpL4Protocol")
     ec.register_connection(node, udp)
 
+    tcp = ec.register_resource("ns3::TcpL4Protocol")
+    ec.register_connection(node, tcp)
+
     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")
@@ -57,12 +60,10 @@ def add_point2point_device(ec, node, address = None,  prefix = None):
 
     return dev
 
-def add_csma_device(ec, node, address = None, prefix = None):
+def add_csma_device(ec, node, ip, prefix):
     dev = ec.register_resource("ns3::CsmaNetDevice")
-    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")
@@ -70,13 +71,11 @@ def add_csma_device(ec, node, address = None, prefix = None):
 
     return dev
 
-def add_wifi_device(ec, node, address = None, prefix = None
+def add_wifi_device(ec, node, ip, prefix
         access_point = False):
     dev = ec.register_resource("ns3::WifiNetDevice")
-    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)
 
     phy = ec.register_resource("ns3::YansWifiPhy")
@@ -133,35 +132,36 @@ def add_wifi_channel(ec):
 
 class LinuxNS3DceApplicationTest(unittest.TestCase):
     def setUp(self):
-        #self.fedora_host = "nepi2.pl.sophia.inria.fr"
-        self.fedora_host = "planetlabpc1.upf.edu"
+        self.fedora_host = "nepi2.pl.sophia.inria.fr"
         self.fedora_user = "inria_nepi"
         self.fedora_identity = "%s/.ssh/id_rsa_planetlab" % (os.environ['HOME'])
 
-    def test_dce_ping(self):
+    @skipIfNotAlive
+    def t_dce_ping(self, host, user = None, identity = None):
         ec = ExperimentController(exp_id = "test-dce-ping")
-        
+
         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)
+        if host == "localhost":
+            ec.set(node, "hostname", host)
+        else:
+            ec.set(node, "hostname", host)
+            ec.set(node, "username", user)
+            ec.set(node, "identity", identity)
+
         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")
         ec.register_connection(simu, node)
 
         nsnode1 = add_ns3_node(ec, simu)
-        ec.set(nsnode1, "enableDCE", True)
         p2p1 = add_point2point_device(ec, nsnode1, "10.0.0.1", "30")
         ec.set(p2p1, "DataRate", "5Mbps")
 
         nsnode2 = add_ns3_node(ec, simu)
-        ec.set(nsnode2, "enableDCE", True)
         p2p2 = add_point2point_device(ec, nsnode2, "10.0.0.2", "30")
         ec.set(p2p2, "DataRate", "5Mbps")
 
@@ -178,8 +178,8 @@ class LinuxNS3DceApplicationTest(unittest.TestCase):
         ec.set (ping, "build", "tar xvjf ${SRC}/iputils-s20101006.tar.bz2 && "
                 "cd iputils-s20101006/ && "
                 "sed -i 's/CFLAGS=/CFLAGS+=/g' Makefile && "
-                "make CFLAGS=-fPIC LDFLAGS=-pie ping && "
-                "cp ping ${BIN_DCE} ")
+                "make CFLAGS=-fPIC LDFLAGS='-pie -rdynamic' ping && "
+                "cp ping ${BIN_DCE} && cd - ")
         ec.set (ping, "binary", "ping")
         ec.set (ping, "stackSize", 1<<20)
         ec.set (ping, "arguments", "-c 10;-s 1000;10.0.0.2")
@@ -209,30 +209,32 @@ class LinuxNS3DceApplicationTest(unittest.TestCase):
 
         ec.shutdown()
 
-    def test_dce_ccn(self):
+    @skipIfNotAlive
+    def t_dce_ccn(self, host, user = None, identity = None):
         ec = ExperimentController(exp_id = "test-dce-ccn")
-        
+       
         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)
+        if host == "localhost":
+            ec.set(node, "hostname", host)
+        else:
+            ec.set(node, "hostname", host)
+            ec.set(node, "username", user)
+            ec.set(node, "identity", identity)
+
+        #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")
         ec.register_connection(simu, node)
 
         nsnode1 = add_ns3_node(ec, simu)
-        ec.set(nsnode1, "enableDCE", True)
         p2p1 = add_point2point_device(ec, nsnode1, "10.0.0.1", "30")
         ec.set(p2p1, "DataRate", "5Mbps")
 
         nsnode2 = add_ns3_node(ec, simu)
-        ec.set(nsnode2, "enableDCE", True)
         p2p2 = add_point2point_device(ec, nsnode2, "10.0.0.2", "30")
         ec.set(p2p2, "DataRate", "5Mbps")
 
@@ -244,37 +246,32 @@ class LinuxNS3DceApplicationTest(unittest.TestCase):
         ec.register_connection(chan, p2p2)
 
         ### create applications
-        ccnd1 = ec.register_resource("ns3::LinuxDceApplication")
+        ccnd1 = ec.register_resource("ns3::LinuxCCNDceApplication")
+
+        # NOTE THAT INSTALLATION MIGHT FAIL IF openjdk-6-jdk is not installed
         ec.set(ccnd1, "depends", "libpcap0.8-dev openjdk-6-jdk ant1.8 autoconf "
             "libssl-dev libexpat-dev libpcap-dev libecryptfs0 libxml2-utils auto"
             "make gawk gcc g++ git-core pkg-config libpcre3-dev openjdk-6-jre-lib")
         ec.set (ccnd1, "sources", "http://www.ccnx.org/releases/ccnx-0.7.2.tar.gz")
-        ec.set (ccnd1, "build", "tar xvjf ${SRC}/iputils-s20101006.tar.bz2 && "
-                "tar zxf ${SRC}/ccnx-0.7.2.tar.gz && "
+        ec.set (ccnd1, "build", "tar zxf ${SRC}/ccnx-0.7.2.tar.gz && "
                 "cd ccnx-0.7.2 && "
-                " INSTALL_BASE=${BIN_DCE} ./configure && "
-                " make MORE_LDLIBS=-pie && "
-                " make install ")
-        ec.set (ccnd1, "binary", "ccndstart")
+                " INSTALL_BASE=${BIN_DCE}/.. ./configure && "
+                " make MORE_LDLIBS='-pie -rdynamic' && "
+                " make install && "
+                " cp ${BIN_DCE}/../bin/ccn* ${BIN_DCE} && "
+                " cd -")
+        ec.set (ccnd1, "binary", "ccnd")
         ec.set (ccnd1, "stackSize", 1<<20)
+        ec.set (ccnd1, "environment", "CCND_CAP=50000; CCND_DEBUG=7")
         ec.set (ccnd1, "StartTime", "1s")
         ec.set (ccnd1, "StopTime", "20s")
         ec.register_connection(ccnd1, nsnode1)
 
-        ccnkill1 = ec.register_resource("ns3::LinuxDceApplication")
-        ec.set (ccnkill1, "binary", "ccnsmoketest")
-        ec.set (ccnkill1, "arguments", "kill")
-        ec.set (ccnkill1, "stdinFile", "")
-        ec.set (ccnkill1, "stackSize", 1<<20)
-        ec.set (ccnkill1, "StartTime", "110s")
-        ec.set (ccnkill1, "StopTime", "120s")
-        ec.register_connection(ccnkill1, nsnode1)
-
         repofile = os.path.join(
-            os.path.dirname(os.path.realpath(__file__)),
+            os.path.dirname(os.path.realpath(__file__)), "ccn", 
             "repoFile1")
 
-        ccnr = ec.register_resource("ns3::LinuxDceApplication")
+        ccnr = ec.register_resource("ns3::LinuxCCNDceApplication")
         ec.set (ccnr, "binary", "ccnr")
         ec.set (ccnr, "environment", "CCNR_DIRECTORY=/REPO/")
         ec.set (ccnr, "files", "%s=/REPO/repoFile1" % repofile) 
@@ -283,7 +280,7 @@ class LinuxNS3DceApplicationTest(unittest.TestCase):
         ec.set (ccnr, "StopTime", "120s")
         ec.register_connection(ccnr, nsnode1)
 
-        ccndc1 = ec.register_resource("ns3::LinuxDceApplication")
+        ccndc1 = ec.register_resource("ns3::LinuxCCNDceApplication")
         ec.set (ccndc1, "binary", "ccndc")
         ec.set (ccndc1, "arguments", "-v;add;ccnx:/;udp;10.0.0.2")
         ec.set (ccndc1, "stackSize", 1<<20)
@@ -291,14 +288,15 @@ class LinuxNS3DceApplicationTest(unittest.TestCase):
         ec.set (ccndc1, "StopTime", "120s")
         ec.register_connection(ccndc1, nsnode1)
 
-        ccnd2 = ec.register_resource("ns3::LinuxDceApplication")
-        ec.set (ccnd2, "binary", "ccndstart")
+        ccnd2 = ec.register_resource("ns3::LinuxCCNDceApplication")
+        ec.set (ccnd2, "binary", "ccnd")
         ec.set (ccnd2, "stackSize", 1<<20)
+        ec.set (ccnd2, "environment", "CCND_CAP=50000; CCND_DEBUG=7")
         ec.set (ccnd2, "StartTime", "1s")
         ec.set (ccnd2, "StopTime", "120s")
         ec.register_connection(ccnd2, nsnode2)
 
-        ccndc2 = ec.register_resource("ns3::LinuxDceApplication")
+        ccndc2 = ec.register_resource("ns3::LinuxCCNDceApplication")
         ec.set (ccndc2, "binary", "ccndc")
         ec.set (ccndc2, "arguments", "-v;add;ccnx:/;udp;10.0.0.1")
         ec.set (ccndc2, "stackSize", 1<<20)
@@ -306,7 +304,7 @@ class LinuxNS3DceApplicationTest(unittest.TestCase):
         ec.set (ccndc2, "StopTime", "120s")
         ec.register_connection(ccndc2, nsnode2)
 
-        ccnpeek = ec.register_resource("ns3::LinuxDceApplication")
+        ccnpeek = ec.register_resource("ns3::LinuxCCNDceApplication")
         ec.set (ccnpeek, "binary", "ccnpeek")
         ec.set (ccnpeek, "arguments", "ccnx:/test/bunny.ts")
         ec.set (ccnpeek, "stdinFile", "")
@@ -315,7 +313,7 @@ class LinuxNS3DceApplicationTest(unittest.TestCase):
         ec.set (ccnpeek, "StopTime", "120s")
         ec.register_connection(ccnpeek, nsnode2)
 
-        ccncat = ec.register_resource("ns3::LinuxDceApplication")
+        ccncat = ec.register_resource("ns3::LinuxCCNDceApplication")
         ec.set (ccncat, "binary", "ccncat")
         ec.set (ccncat, "arguments", "ccnx:/test/bunny.ts")
         ec.set (ccncat, "stdinFile", "")
@@ -324,47 +322,35 @@ class LinuxNS3DceApplicationTest(unittest.TestCase):
         ec.set (ccncat, "StopTime", "120s")
         ec.register_connection(ccncat, nsnode2)
 
-        ccnkill2 = ec.register_resource("ns3::LinuxDceApplication")
-        ec.set (ccnkill2, "binary", "ccnsmoketest")
-        ec.set (ccnkill2, "arguments", "kill")
-        ec.set (ccnkill2, "stdinFile", "")
-        ec.set (ccnkill2, "stackSize", 1<<20)
-        ec.set (ccnkill2, "StartTime", "110s")
-        ec.set (ccnkill2, "StopTime", "120s")
-        ec.register_connection(ccnkill2, nsnode2)
-
         ec.deploy()
 
-        ec.wait_finished([ping])
+        ec.wait_finished([ccncat])
 
-        print ec.trace(ccncat, "cmdline")
-        """
-        expected = "ping -c 10 -s 1000 10.0.0.2"
-        cmdline = ec.trace(ping, "cmdline")
+        expected = "ccncat ccnx:/test/bunny.ts"
+        cmdline = ec.trace(ccncat, "cmdline")
         self.assertTrue(cmdline.find(expected) > -1, cmdline)
-        """
 
-        print ec.trace(cccat, "status")
-        """
-        expected = "Start Time: NS3 Time:          1s ("
-        status = ec.trace(ping, "status")
+        expected = "Start Time: NS3 Time:          4s ("
+        status = ec.trace(ccncat, "status")
         self.assertTrue(status.find(expected) > -1, status)
-        """
-
-        print len(ec.trace(ccncat, "stdout"))
-        """
-        expected = "10 packets transmitted, 10 received, 0% packet loss, time 9002ms"
-        stdout = ec.trace(ping, "stdout")
-        self.assertTrue(stdout.find(expected) > -1, stdout)
-        """
 
-        stderr = ec.trace(simu, "stderr")
-        expected = "DceApplication:StartApplication"
-        self.assertTrue(stderr.find(expected) > -1, stderr)
+        expected = 2873956
+        stdout = ec.trace(ccncat, "stdout")
+        self.assertTrue(len(stdout) == expected , stdout)
 
         ec.shutdown()
 
+    def test_dce_ping_fedora(self):
+        self.t_dce_ping(self.fedora_host, self.fedora_user, self.fedora_identity)
+
+    def test_dce_ping_local(self):
+        self.t_dce_ping("localhost")
+
+    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()