From 891fa0065d9c9f2a931b5d47b059bb1bbccdb21a Mon Sep 17 00:00:00 2001 From: Ramon Fontes Date: Thu, 30 Nov 2017 14:13:29 -0300 Subject: [PATCH] enable mobility model without plotgraph --- mininet/wifiMobility.py | 3 +-- mininet/wifiNet.py | 8 ++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/mininet/wifiMobility.py b/mininet/wifiMobility.py index c499f15c0..7ed5b1030 100644 --- a/mininet/wifiMobility.py +++ b/mininet/wifiMobility.py @@ -563,7 +563,7 @@ def startMobilityModelNoGraph(cls, mob, nodes): if propagationModel.model == 'logNormalShadowing': sleep(0.0001) node.getRange(intf=node.params['wlan'][0]) - sleep(0.0001) + sleep(0.5) while cls.pause_simulation: pass @@ -581,7 +581,6 @@ def parameters_(cls, node=None): for node_ in cls.aps: if 'link' in node_.params and node_.params['link'] == 'mesh': nodes.append(node_) - cls.configureLinks(nodes) @classmethod diff --git a/mininet/wifiNet.py b/mininet/wifiNet.py index 5085170ae..69709f6f2 100644 --- a/mininet/wifiNet.py +++ b/mininet/wifiNet.py @@ -996,15 +996,23 @@ def setMobilityParams(cls, stations, aps, stationaryNodes=None, **kwargs): if 'model' in kwargs or cls.isVanet: if 'min_x' in kwargs: + if not cls.DRAW: + cls.MIN_X = int(kwargs['min_x']) for sta in stations: sta.min_x = int(kwargs['min_x']) if 'min_y' in kwargs: + if not cls.DRAW: + cls.MIN_Y = int(kwargs['min_y']) for sta in stations: sta.min_y = int(kwargs['min_y']) if 'max_x' in kwargs: + if not cls.DRAW: + cls.MAX_X = int(kwargs['max_x']) for sta in stations: sta.max_x = int(kwargs['max_x']) if 'max_y' in kwargs: + if not cls.DRAW: + cls.MAX_Y = int(kwargs['max_y']) for sta in stations: sta.max_y = int(kwargs['max_y']) if 'min_v' in kwargs: