Fixed to be compatible with modified Mininet() class.

wborbaneto · Feb 27, 2010 · 78073e1 · 78073e1
1 parent d40b0a9
commit 78073e1
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/mininet/cli.py b/mininet/cli.py
@@ -48,13 +48,10 @@ class CLI( Cmd ):
  def __init__( self, mininet ):
  self.mn = mininet
  self.nodemap = {} # map names to Node objects
- for node in self.mn.nodes.values():
+ self.nodelist = self.mn.switches + self.mn.hosts + self.mn.controllers
+ for node in self.nodelist:
  self.nodemap[ node.name ] = node
- for cname, cnode in self.mn.controllers.iteritems():
- self.nodemap[ cname ] = cnode
- self.nodelist = self.nodemap.values()
  Cmd.__init__( self )
-
  warn( '*** Starting CLI:\n' )
  self.cmdloop()