From e427d269b6853aa820a95ac9f842fd6721252148 Mon Sep 17 00:00:00 2001 From: Varun Patil Date: Wed, 30 Oct 2024 12:37:04 -0700 Subject: [PATCH] fix: do not convert jitter to int Mininet now requires it to be specified with time units, e.g. 10ms Change-Id: Ic80d1a71120f77904b77ea4e34bc57a6e994b25c --- minindn/minindn.py | 4 ++-- minindn/wifi/minindnwifi.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/minindn/minindn.py b/minindn/minindn.py index 1ba1251..ded6dbc 100644 --- a/minindn/minindn.py +++ b/minindn/minindn.py @@ -195,7 +195,7 @@ def processTopo(topoFile): for param in item[1].split(' '): key = param.split('=')[0] value = param.split('=')[1] - if key in ['jitter', 'max_queue_size']: + if key in ['max_queue_size']: value = int(value) if key == 'loss' or key == 'bw': value = float(value) @@ -313,7 +313,7 @@ def nfdcBatchProcessing(self, station, faces): def setupFaces(self, faces_to_create=None): """ Method to create unicast faces between connected nodes; - Returns dict- {node: (other node name, other node IP, other node's delay as int)}. + Returns dict- {node: (other node name, other node IP, other node's delay as int)}. This is intended to pass to the NLSR helper via the faceDict param """ if not faces_to_create: faces_to_create = self.faces_to_create diff --git a/minindn/wifi/minindnwifi.py b/minindn/wifi/minindnwifi.py index b9e3865..2e3b9ea 100644 --- a/minindn/wifi/minindnwifi.py +++ b/minindn/wifi/minindnwifi.py @@ -203,7 +203,7 @@ def processTopo(topoFile): continue key = param.split('=')[0] value = param.split('=')[1] - if key in ['jitter', 'max_queue_size']: + if key in ['max_queue_size']: value = int(value) if key in ['loss', 'bw']: value = float(value)