Adding DCE/ns-3 serialization tests

[nepi.git] / test / resources / linux / ns3 / ns3dceapplication.py

diff --git a/test/resources/linux/ns3/ns3dceapplication.py b/test/resources/linux/ns3/ns3dceapplication.py
old mode 100644 (file)
new mode 100755 (executable)
index 8528f69..3f9443a
--- a/test/resources/linux/ns3/ns3dceapplication.py
+++ b/test/resources/linux/ns3/ns3dceapplication.py
@@ -136,6 +136,10 @@ class LinuxNS3DceApplicationTest(unittest.TestCase):
         self.fedora_user = "inria_nepi"
         self.fedora_identity = "%s/.ssh/id_rsa_planetlab" % (os.environ['HOME'])
 
+        self.ubuntu_host = "roseval.pl.sophia.inria.fr"
+        self.ubuntu_user = "inria_nepi"
+        self.ubuntu_identity = "%s/.ssh/id_rsa" % (os.environ['HOME'])
+ 
     @skipIfNotAlive
     def t_dce_ping(self, host, user = None, identity = None):
         ec = ExperimentController(exp_id = "test-dce-ping")
@@ -248,10 +252,17 @@ class LinuxNS3DceApplicationTest(unittest.TestCase):
         ### create applications
         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")
+        if host == self.fedora_host:
+            depends = ( " autoconf openssl-devel  expat-devel libpcap-devel "
+                " ecryptfs-utils-devel libxml2-devel automake gawk " 
+                " gcc gcc-c++ git pcre-devel make ")
+        else: # UBUNTU
+            # NOTE THAT INSTALLATION MIGHT FAIL IF openjdk-6-jdk is not installed
+            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, "depends", depends)
         ec.set (ccnd1, "sources", "http://www.ccnx.org/releases/ccnx-0.7.2.tar.gz")
         ec.set (ccnd1, "build", "tar zxf ${SRC}/ccnx-0.7.2.tar.gz && "
                 "cd ccnx-0.7.2 && "
@@ -341,7 +352,10 @@ class LinuxNS3DceApplicationTest(unittest.TestCase):
         ec.shutdown()
 
     def test_dce_ping_fedora(self):
-        self.t_dce_ping(self.fedora_host, self.fedora_user, self.fedora_identity)
+        self.t_dce_ping(self.fedora_host, self.fedora_user, self.fedora_identity) 
+
+    def test_dce_ping_ubuntu(self):
+        self.t_dce_ping(self.ubuntu_host, self.ubuntu_user, self.ubuntu_identity)
 
     def test_dce_ping_local(self):
         self.t_dce_ping("localhost")
@@ -349,6 +363,9 @@ class LinuxNS3DceApplicationTest(unittest.TestCase):
     def test_dce_ccn_fedora(self):
         self.t_dce_ccn(self.fedora_host, self.fedora_user, self.fedora_identity)
 
+    def test_dce_ccn_ubuntu(self):
+        self.t_dce_ccn(self.ubuntu_host, self.ubuntu_user, self.ubuntu_identity)
+
     def test_dce_ccn_local(self):
         self.t_dce_ccn("localhost")