Improving test test/resources/linux/ns3/ccn/ns3dceccn.py

diff --git a/test/resources/linux/ns3/ccn/ns3dceccn.py b/test/resources/linux/ns3/ccn/ns3dceccn.py
index 89f0b9f..f215fa3 100644 (file)
--- a/test/resources/linux/ns3/ccn/ns3dceccn.py
+++ b/test/resources/linux/ns3/ccn/ns3dceccn.py
@@ -20,7 +20,8 @@
 
 
 from nepi.execution.ec import ExperimentController 
 
 
 from nepi.execution.ec import ExperimentController 

-from nepi.execution.trace import TraceAttr
+
+from test_utils import skipIfNotAlive

 
 import os
 import time
 
 import os
 import time


@@ -47,12 +48,10 @@ def add_ns3_node(ec, simu):
 
     return node
 
 
     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")
     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")
     ec.register_connection(node, dev)
 
     queue = ec.register_resource("ns3::DropTailQueue")


@@ -62,22 +61,23 @@ def add_point2point_device(ec, node, address = None,  prefix = None):
 
 class LinuxNS3CCNDceApplicationTest(unittest.TestCase):
     def setUp(self):
 
 class LinuxNS3CCNDceApplicationTest(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_ccn(self):
-        ec = ExperimentController(exp_id = "test-dce-ccn")
-        
+        self.fedora_host = "nepi2.pl.sophia.inria.fr"
+        self.fedora_user = "inria_nepi"
+        self.fedora_identity = "%s/.ssh/id_rsa_planetlab" % (os.environ['HOME'])
+
+    @skipIfNotAlive
+    def t_dce_ccn(self, host, user = None, identity = None):
+        ec = ExperimentController(exp_id = "test-dce-ccn-app")
+

         node = ec.register_resource("LinuxNode")
         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(node, "cleanHome", True)
 
         simu = ec.register_resource("LinuxNS3Simulation")


@@ -179,5 +179,11 @@ class LinuxNS3CCNDceApplicationTest(unittest.TestCase):
 
         ec.shutdown()
 
 
         ec.shutdown()
 

+    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()
 if __name__ == '__main__':
     unittest.main()