Adding PingCCN test

diff --git a/src/nepi/resources/linux/ns3/ns3pingdceapplication.py b/src/nepi/resources/linux/ns3/ns3pingdceapplication.py
index 6534b1e..b064081 100644 (file)
--- a/src/nepi/resources/linux/ns3/ns3pingdceapplication.py
+++ b/src/nepi/resources/linux/ns3/ns3pingdceapplication.py
@@ -191,11 +191,17 @@ class LinuxDcePing(LinuxNS3DceApplication):
 
     @property
     def _build(self):
 
     @property
     def _build(self):

-        return ("tar xvjf ${SRC}/iputils-s20101006.tar.bz2 && "
+        return  (" ( "
+                " test -f ${SRC}/iputils-s20101006.tar.bz2 && "
+                " echo 'binaries found, nothing to do' "
+                " ) || ( "
+                "tar xvjf ${SRC}/iputils-s20101006.tar.bz2 && "

                 "cd iputils-s20101006/ && "
                 "sed -i 's/CFLAGS=/CFLAGS+=/g' Makefile && "
                 "make CFLAGS=-fPIC LDFLAGS=-pie ping && "
                 "cd iputils-s20101006/ && "
                 "sed -i 's/CFLAGS=/CFLAGS+=/g' Makefile && "
                 "make CFLAGS=-fPIC LDFLAGS=-pie ping && "

-                "cp ping ${BIN_DCE} && cd - ")
+                "cp ping ${BIN_DCE} && cd - "
+                " )"   
+                )

 
     @property
     def _arguments(self):
 
     @property
     def _arguments(self):

diff --git a/test/resources/linux/ns3/ns3pingdce.py b/test/resources/linux/ns3/ns3dceping.py
similarity index 98%
rename from test/resources/linux/ns3/ns3pingdce.py
rename to test/resources/linux/ns3/ns3dceping.py
index ffa19bb..87a8da2 100644 (file)
--- a/test/resources/linux/ns3/ns3pingdce.py
+++ b/test/resources/linux/ns3/ns3dceping.py
@@ -71,7 +71,7 @@ class LinuxNS3PingDceApplicationTest(unittest.TestCase):
         self.fedora_identity = "%s/.ssh/id_rsa" % (os.environ['HOME'])
 
     def test_dce_ping(self):
         self.fedora_identity = "%s/.ssh/id_rsa" % (os.environ['HOME'])
 
     def test_dce_ping(self):

-        ec = ExperimentController(exp_id = "test-dce-ping")
+        ec = ExperimentController(exp_id = "test-dceping")

         
         node = ec.register_resource("LinuxNode")
         ec.set(node, "hostname", self.fedora_host)
         
         node = ec.register_resource("LinuxNode")
         ec.set(node, "hostname", self.fedora_host)