git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improving test test/resources/linux/ns3/ccn/ns3dceccnpeek.py
[nepi.git]
/
test
/
resources
/
linux
/
ns3
/
ccn
/
ns3dceccnpeek.py
diff --git
a/test/resources/linux/ns3/ccn/ns3dceccnpeek.py
b/test/resources/linux/ns3/ccn/ns3dceccnpeek.py
index
70b5f64
..
6abfc5e
100644
(file)
--- a/
test/resources/linux/ns3/ccn/ns3dceccnpeek.py
+++ b/
test/resources/linux/ns3/ccn/ns3dceccnpeek.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
@@
-49,28
+50,27
@@
def add_ns3_node(ec, simu):
class LinuxNS3CCNPeekDceApplicationTest(unittest.TestCase):
def setUp(self):
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_user = "inria_nepi"
+ self.fedora_identity = "%s/.ssh/id_rsa_planetlab" % (os.environ['HOME'])
+
+ @skipIfNotAlive
+ def t_dce_ccnpeek(self, host, user = None, identity = None):
ec = ExperimentController(exp_id = "test-dce-ccnpeek")
ec = ExperimentController(exp_id = "test-dce-ccnpeek")
-
+
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(simu, "verbose", 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)
ec.set(simu, "nsLog", "DceApplication")
ec.register_connection(simu, node)
@@
-114,18
+114,28
@@
class LinuxNS3CCNPeekDceApplicationTest(unittest.TestCase):
ec.shutdown()
ec.shutdown()
- def test_dce_ccnpeek_local(self):
- ec = ExperimentController(exp_id = "test-dce-ccnpeek-local")
+ @skipIfNotAlive
+ def t_dce_ccnpeek_with_stack(self, host, user = None, identity = None):
+ ec = ExperimentController(exp_id = "test-dce-peek-lostack")
node = ec.register_resource("LinuxNode")
node = ec.register_resource("LinuxNode")
- ec.set(node, "hostname", "localhost")
+ 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)
simu = ec.register_resource("LinuxNS3Simulation")
ec.set(simu, "verbose", True)
- ec.set(simu, "enableDCE", True)
ec.register_connection(simu, node)
ec.register_connection(simu, node)
- nsnode = add_ns3_node(ec, simu)
+ nsnode = ec.register_resource("ns3::Node")
+ ec.set(nsnode, "enableStack", True)
+ ec.register_connection(nsnode, simu)
### create applications
ccnd = ec.register_resource("ns3::LinuxDceCCND")
### create applications
ccnd = ec.register_resource("ns3::LinuxDceCCND")
@@
-165,5
+175,19
@@
class LinuxNS3CCNPeekDceApplicationTest(unittest.TestCase):
ec.shutdown()
ec.shutdown()
+ def test_dce_ccnpeek_fedora(self):
+ self.t_dce_ccnpeek(self.fedora_host, self.fedora_user, self.fedora_identity)
+
+ def test_dce_ccnpeek_local(self):
+ self.t_dce_ccnpeek("localhost")
+
+ def test_dce_ccnpeek_with_stack_fedora(self):
+ self.t_dce_ccnpeek_with_stack(self.fedora_host,
+ self.fedora_user, self.fedora_identity)
+
+ def test_dce_ccnpeek_with_stack_local(self):
+ self.t_dce_ccnpeek_with_stack("localhost")
+
+
if __name__ == '__main__':
unittest.main()
if __name__ == '__main__':
unittest.main()