From: Alina Quereilhac <alina.quereilhac@inria.fr>
Date: Fri, 30 May 2014 11:28:08 +0000 (+0200)
Subject: Fixing DCE installation
X-Git-Tag: nepi-3.1.0~57
X-Git-Url: http://git.onelab.eu/?p=nepi.git;a=commitdiff_plain;h=a31058106dd30dd38446381226477e02670b3d1b

Fixing DCE installation
---

diff --git a/src/nepi/resources/linux/ns3/ccn/ns3ccnpokedceapplication.py b/src/nepi/resources/linux/ns3/ccn/ns3ccnpokedceapplication.py
index 40a83a65..daac2b57 100644
--- a/src/nepi/resources/linux/ns3/ccn/ns3ccnpokedceapplication.py
+++ b/src/nepi/resources/linux/ns3/ccn/ns3ccnpokedceapplication.py
@@ -58,6 +58,7 @@ class LinuxNS3DceCCNPoke(LinuxNS3CCNDceApplication):
         localpath = f.name
         dcepath = os.path.join("/tmp", os.path.basename(localpath))
 
+        self.set("environment", "HOME=/root")
         self.set("files", "%s=%s" % (localpath, dcepath))
         self.set("stdinFile", dcepath)
 
diff --git a/src/nepi/resources/linux/ns3/ns3pingdceapplication.py b/src/nepi/resources/linux/ns3/ns3pingdceapplication.py
index b0640810..3086249f 100644
--- a/src/nepi/resources/linux/ns3/ns3pingdceapplication.py
+++ b/src/nepi/resources/linux/ns3/ns3pingdceapplication.py
@@ -192,7 +192,7 @@ class LinuxDcePing(LinuxNS3DceApplication):
     @property
     def _build(self):
         return  (" ( "
-                " test -f ${SRC}/iputils-s20101006.tar.bz2 && "
+                " test -f ${BIN_DCE}/ping && "
                 " echo 'binaries found, nothing to do' "
                 " ) || ( "
                 "tar xvjf ${SRC}/iputils-s20101006.tar.bz2 && "
diff --git a/test/resources/linux/ns3/ccn/ns3dceccnpeek.py b/test/resources/linux/ns3/ccn/ns3dceccnpeek.py
index 9e6a1552..0664f84b 100644
--- a/test/resources/linux/ns3/ccn/ns3dceccnpeek.py
+++ b/test/resources/linux/ns3/ccn/ns3dceccnpeek.py
@@ -49,28 +49,25 @@ 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 = "mimas.inria.fr"
-        self.fedora_user = "aquereil"
-        self.fedora_identity = "%s/.ssh/id_rsa" % (os.environ['HOME'])
-
-    def test_dce_ccnpeek(pself):
+        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'])
+
+    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, "cleanProcesses", True)
-        #ec.set(node, "cleanHome", 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, "pybindgenVersion", "868")
         ec.set(simu, "enableDCE", True)
         ec.set(simu, "buildMode", "debug")
         ec.set(simu, "nsLog", "DceApplication")
@@ -124,8 +121,8 @@ class LinuxNS3CCNPeekDceApplicationTest(unittest.TestCase):
 
         simu = ec.register_resource("LinuxNS3Simulation")
         ec.set(simu, "verbose", True)
-        #ec.set(simu, "ns3Version", "ns-3.19")
-        #ec.set(simu, "pybindgenVersion", "834")
+        ec.set(simu, "ns3Version", "ns-3.19")
+        ec.set(simu, "pybindgenVersion", "834")
         ec.set(simu, "enableDCE", True)
         ec.register_connection(simu, node)
 
diff --git a/test/resources/linux/ns3/ns3dceping.py b/test/resources/linux/ns3/ns3dceping.py
index 87a8da25..087546a7 100644
--- a/test/resources/linux/ns3/ns3dceping.py
+++ b/test/resources/linux/ns3/ns3dceping.py
@@ -69,6 +69,9 @@ class LinuxNS3PingDceApplicationTest(unittest.TestCase):
         self.fedora_host = "mimas.inria.fr"
         self.fedora_user = "aquereil"
         self.fedora_identity = "%s/.ssh/id_rsa" % (os.environ['HOME'])
+        self.fedora_host = "planetlab1.informatik.uni-goettingen.de"
+        self.fedora_user = "inria_nepi"
+        self.fedora_identity = "%s/.ssh/id_rsa_inria_twitter" % (os.environ['HOME'])
 
     def test_dce_ping(self):
         ec = ExperimentController(exp_id = "test-dceping")