enable dce in simulation is now automatic

[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 ea296b3..d3beeec 100644 (file)
--- a/test/resources/linux/ns3/ccn/ns3dceccnpeek.py
+++ b/test/resources/linux/ns3/ccn/ns3dceccnpeek.py
@@ -57,7 +57,7 @@ class LinuxNS3CCNPeekDceApplicationTest(unittest.TestCase):
         self.fedora_identity = "%s/.ssh/id_rsa" % (os.environ['HOME'])
 
     def test_dce_ccnpeek(self):
-        ec = ExperimentController(exp_id = "test-dce-ccnpeek2")
+        ec = ExperimentController(exp_id = "test-dce-ccnpeek")
         
         node = ec.register_resource("LinuxNode")
         ec.set(node, "hostname", self.fedora_host)
@@ -71,7 +71,6 @@ class LinuxNS3CCNPeekDceApplicationTest(unittest.TestCase):
         ec.set(simu, "verbose", True)
         ec.set(simu, "ns3Version", "ns-3-dev")
         ec.set(simu, "pybindgenVersion", "868")
-        ec.set(simu, "enableDCE", True)
         ec.set(simu, "buildMode", "debug")
         ec.set(simu, "nsLog", "DceApplication")
         ec.register_connection(simu, node)
@@ -124,9 +123,9 @@ 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, "enableDCE", True)
+        #ec.set(simu, "ns3Version", "ns-3.19")
+        #ec.set(simu, "pybindgenVersion", "834")
+        ec.set(node, "cleanExperiment", True)
         ec.register_connection(simu, node)
 
         nsnode = add_ns3_node(ec, simu)