From b08d952454bd1adc8d0ec6579335f004e24cafd0 Mon Sep 17 00:00:00 2001 From: Benjamin Hesmans Date: Wed, 7 Jan 2015 14:52:43 +0100 Subject: [PATCH] wip correct var names for mininet Signed-off-by: Benjamin Hesmans --- src/mpLinkCharacteristics.py | 6 +++--- src/mpTopo.py | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/mpLinkCharacteristics.py b/src/mpLinkCharacteristics.py index fe3d1e8..b57b1ac 100644 --- a/src/mpLinkCharacteristics.py +++ b/src/mpLinkCharacteristics.py @@ -10,9 +10,9 @@ class MpLinkCharacteristics: def asDict(self): d = {} - d['delay'] = self.delay - d['queueSize'] = self.queueSize - d['bandwidth'] = self.bandwidth + d['bw'] = int(self.bandwidth) + d['delay'] = self.delay + "ms" + d['max_queue_size'] = int(self.queueSize) return d def __str__(self): diff --git a/src/mpTopo.py b/src/mpTopo.py index 7069379..0e454e9 100644 --- a/src/mpTopo.py +++ b/src/mpTopo.py @@ -22,7 +22,6 @@ class MpTopo: return self.topoBuilder.addSwitch(switch) def addLink(self, fromA, toB, **kwargs): - print(kwargs) self.topoBuilder.addLink(fromA,toB,**kwargs) def getCLI(self):