From: Alina Quereilhac <alina.quereilhac@inria.fr>
Date: Thu, 29 May 2014 13:29:50 +0000 (+0200)
Subject: Changing default ns-3 and pybindgen versions
X-Git-Tag: nepi-3.1.0~61
X-Git-Url: http://git.onelab.eu/?p=nepi.git;a=commitdiff_plain;h=06350b6b2c24f5154a51440df59c0b4035439c9a

Changing default ns-3 and pybindgen versions
---

diff --git a/src/nepi/resources/linux/ns3/ns3simulation.py b/src/nepi/resources/linux/ns3/ns3simulation.py
index bbfb918c..a52530fa 100644
--- a/src/nepi/resources/linux/ns3/ns3simulation.py
+++ b/src/nepi/resources/linux/ns3/ns3simulation.py
@@ -85,8 +85,8 @@ class LinuxNS3Simulation(LinuxApplication, NS3Simulation):
 
         ns3_version = Attribute("ns3Version",
             "Version of ns-3 to install from nsam repo",
-            default = "ns-3.19", 
-            #default = "ns-3-dev", 
+            #default = "ns-3.19", 
+            default = "ns-3-dev", 
             flags = Flags.Design)
 
         enable_dce = Attribute("enableDCE",
@@ -97,8 +97,8 @@ class LinuxNS3Simulation(LinuxApplication, NS3Simulation):
 
         pybindgen_version = Attribute("pybindgenVersion",
             "Version of pybindgen to install from bazar repo",
-            default = "864", 
-            #default = "868", 
+            #default = "864", 
+            default = "868", 
             flags = Flags.Design)
 
         populate_routing_tables = Attribute("populateRoutingTables",
diff --git a/test/resources/linux/ns3/ccn/ns3dceccnpeek.py b/test/resources/linux/ns3/ccn/ns3dceccnpeek.py
index f0a9c7de..9e6a1552 100644
--- a/test/resources/linux/ns3/ccn/ns3dceccnpeek.py
+++ b/test/resources/linux/ns3/ccn/ns3dceccnpeek.py
@@ -116,8 +116,7 @@ class LinuxNS3CCNPeekDceApplicationTest(unittest.TestCase):
 
         ec.shutdown()
 
-    ## TODO: Not working because ns-3-dev is broken
-    def ztest_dce_ccnpeek_local(self):
+    def test_dce_ccnpeek_local(self):
         ec = ExperimentController(exp_id = "test-dce-ccnpeek-local")
         
         node = ec.register_resource("LinuxNode")
@@ -125,8 +124,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)