From: Alina Quereilhac Date: Thu, 4 Aug 2011 15:58:02 +0000 (+0200) Subject: bugfix: ns3 connection metadata X-Git-Tag: nepi-3.0.0~314^2~3 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2201c5ca5968f6fc11cf52ee1f6dfc32b604d118;p=nepi.git bugfix: ns3 connection metadata --- diff --git a/src/nepi/testbeds/ns3/connection_metadata.py b/src/nepi/testbeds/ns3/connection_metadata.py index a76a3b3a..9c338c30 100644 --- a/src/nepi/testbeds/ns3/connection_metadata.py +++ b/src/nepi/testbeds/ns3/connection_metadata.py @@ -128,7 +128,7 @@ def connect_fd(testbed_instance, fdnd_guid, cross_data): testbed_instance.set(fdnd_guid, "tun_addr", address) testbed_instance.set(fdnd_guid, "tun_proto", "fd") testbed_instance.set(fdnd_guid, "tun_port", 0) - testbed_instance.set(fdnd_guid, "tun_key", ("\xfa"*32).encode("base64")) # unimportant, fds aren't encrypted + testbed_instance.set(fdnd_guid, "tun_key", ("\xfa"*32).encode("base64").strip()) # unimportant, fds aren't encrypted fdnd = testbed_instance._elements[fdnd_guid] t = threading.Thread(target=recvfd, args=(sock,fdnd)) t.start() diff --git a/src/nepi/testbeds/ns3/execute.py b/src/nepi/testbeds/ns3/execute.py index ce93a268..ed9a57fd 100644 --- a/src/nepi/testbeds/ns3/execute.py +++ b/src/nepi/testbeds/ns3/execute.py @@ -98,7 +98,6 @@ class TestbedController(testbed_impl.TestbedController): def stop(self, time = TIME_NOW): super(TestbedController, self).stop(time) - #self.ns3.Simulator.Stop() self._stop_simulation(time) def set(self, guid, name, value, time = TIME_NOW):