From 3a52ad2f530242cd368f5fb900ff254b7d4e8b00 Mon Sep 17 00:00:00 2001 From: Cody Burkard Date: Wed, 9 Jul 2014 19:24:22 -0700 Subject: [PATCH] fixed linearbandwidth and waitconnected --- examples/linearbandwidth.py | 4 ++-- mininet/net.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/linearbandwidth.py b/examples/linearbandwidth.py index 8e866a7..dee5490 100755 --- a/examples/linearbandwidth.py +++ b/examples/linearbandwidth.py @@ -24,7 +24,7 @@ of switches, this example demonstrates: """ from mininet.net import Mininet -from mininet.node import UserSwitch, OVSKernelSwitch +from mininet.node import UserSwitch, OVSKernelSwitch, Controller from mininet.topo import Topo from mininet.log import lg from mininet.util import irange @@ -76,7 +76,7 @@ def linearBandwidthTest( lengths ): print "*** testing", datapath, "datapath" Switch = switches[ datapath ] results[ datapath ] = [] - net = Mininet( topo=topo, switch=Switch, waitConnected=True ) + net = Mininet( topo=topo, switch=Switch, controller=Controller, waitConnected=True ) net.start() print "*** testing basic connectivity" for n in lengths: diff --git a/mininet/net.py b/mininet/net.py index 0a31c68..a5b9a34 100755 --- a/mininet/net.py +++ b/mininet/net.py @@ -432,7 +432,7 @@ class Mininet( object ): switch.start( self.controllers ) info( '\n' ) if self.waitConn: - self.waitConnected() + self.waitConnected( ) def stop( self ): "Stop the controller(s), switches and hosts"