From c26875cb553d14e44f8a5145808d87325b64d2a4 Mon Sep 17 00:00:00 2001 From: Bob Lantz Date: Fri, 7 May 2010 01:15:41 -0700 Subject: [PATCH] Fixed minor breakage due to code cleanup. --- examples/miniedit.py | 1 + mininet/cli.py | 1 - mininet/net.py | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/miniedit.py b/examples/miniedit.py index 7cfe833..172a1f4 100755 --- a/examples/miniedit.py +++ b/examples/miniedit.py @@ -592,6 +592,7 @@ class MiniEdit( Frame ): def start( self ): "Start network." if self.net is None: + self.net = self.build() self.net.start() def stop( self ): diff --git a/mininet/cli.py b/mininet/cli.py index a10363d..8bfa424 100644 --- a/mininet/cli.py +++ b/mininet/cli.py @@ -239,7 +239,6 @@ class CLI( Cmd ): rest = ' '.join( rest ) # Run cmd on node: builtin = isShellBuiltin( first ) - print "builtin =", builtin node.sendCmd( rest, printPid=( not builtin ) ) self.waitForNode( node ) else: diff --git a/mininet/net.py b/mininet/net.py index 41efb6a..9c1b057 100755 --- a/mininet/net.py +++ b/mininet/net.py @@ -274,7 +274,7 @@ class Mininet( object ): pass info( '*** Adding controller\n' ) - self.addController( self.controller ) + self.addController( 'c0' ) info( '*** Creating network\n' ) info( '*** Adding hosts:\n' ) for hostId in sorted( topo.hosts() ):