From 069889bb1c4183f5edac6ba135e1b4eb898569a2 Mon Sep 17 00:00:00 2001 From: Alina Quereilhac Date: Wed, 8 Jun 2011 11:56:45 +0200 Subject: [PATCH] minor bugfix in construction of ns3 waypoint mobility model. --- src/nepi/testbeds/ns3/factories_metadata_v3_9.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/nepi/testbeds/ns3/factories_metadata_v3_9.py b/src/nepi/testbeds/ns3/factories_metadata_v3_9.py index df829098..0d8a6bc7 100644 --- a/src/nepi/testbeds/ns3/factories_metadata_v3_9.py +++ b/src/nepi/testbeds/ns3/factories_metadata_v3_9.py @@ -7,6 +7,7 @@ from nepi.util.constants import AF_INET, STATUS_NOT_STARTED, STATUS_RUNNING, \ from nepi.util.tunchannel_impl import \ preconfigure_tunchannel, postconfigure_tunchannel, \ wait_tunchannel, create_tunchannel +import re wifi_standards = dict({ "WIFI_PHY_STANDARD_holland": 5, @@ -215,7 +216,7 @@ def create_waypoint_mobility(testbed_instance, guid): parameters = testbed_instance._get_parameters(guid) ns3 = testbed_instance.ns3 waypoints = parameters.get("WaypointList", "") - waypoints = waypoints.replace(" ","") + waypoints = re.sub(" |\(|\)", "", waypoints) for swp in waypoints.split(","): dwp = swp.split(":") t = str(dwp[0]) -- 2.47.0