From 00e97223db68c6677185e1a77fd1af9a0ff1246c Mon Sep 17 00:00:00 2001 From: Claudio-Daniel Freire Date: Wed, 7 Sep 2011 04:45:17 +0200 Subject: [PATCH] Fix NS3: --enable-threading no longer valid or needed --- src/nepi/testbeds/planetlab/application.py | 2 +- test/testbeds/planetlab/integration_ns3.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/nepi/testbeds/planetlab/application.py b/src/nepi/testbeds/planetlab/application.py index 32644c10..c3d65d43 100644 --- a/src/nepi/testbeds/planetlab/application.py +++ b/src/nepi/testbeds/planetlab/application.py @@ -883,7 +883,7 @@ class NS3Dependency(Dependency): "python setup.py install --install-lib ${BUILD}/target && " "python setup.py clean && " "cd ../ns3-src && " - "./waf configure --prefix=${BUILD}/target --with-pybindgen=../pybindgen-src -d release --disable-examples --disable-tests --enable-threading && " + "./waf configure --prefix=${BUILD}/target --with-pybindgen=../pybindgen-src -d release --disable-examples --disable-tests && " "./waf &&" "./waf install && " "rm -f ${BUILD}/target/lib/*.so && " diff --git a/test/testbeds/planetlab/integration_ns3.py b/test/testbeds/planetlab/integration_ns3.py index c79e98f0..13cc41c8 100755 --- a/test/testbeds/planetlab/integration_ns3.py +++ b/test/testbeds/planetlab/integration_ns3.py @@ -198,6 +198,7 @@ class PlanetLabCrossIntegrationTestCase(unittest.TestCase): ns1if.set_attribute_value("label", "ns1if") ns1.connector("devs").connect(ns1if.connector("node")) tap1.connector("fd->").connect(ns1if.connector("->fd")) + tap1.set_attribute_value("tun_cipher", "PLAIN") ip1 = ns1if.add_address() ip1.set_attribute_value("Address", "192.168.2.3") ip1.set_attribute_value("NetPrefix", 24) @@ -285,6 +286,7 @@ class PlanetLabCrossIntegrationTestCase(unittest.TestCase): ns1if.set_attribute_value("label", "ns1if") ns1.connector("devs").connect(ns1if.connector("node")) tap1.connector("fd->").connect(ns1if.connector("->fd")) + tap1.set_attribute_value("tun_cipher", "PLAIN") ip1 = ns1if.add_address() ip1.set_attribute_value("Address", "192.168.2.3") ip1.set_attribute_value("NetPrefix", 24) @@ -398,6 +400,7 @@ class PlanetLabCrossIntegrationTestCase(unittest.TestCase): ns1if.set_attribute_value("label", "ns1if") ns1.connector("devs").connect(ns1if.connector("node")) tap0.connector("fd->").connect(ns1if.connector("->fd")) + tap0.set_attribute_value("tun_cipher", "PLAIN") ip1 = ns1if.add_address() ip1.set_attribute_value("Address", "192.168.2.1") ip1.set_attribute_value("NetPrefix", 30) -- 2.45.2