From 78073e1b6f3cbbb88a97206b598d40c689bff05f Mon Sep 17 00:00:00 2001
From: Bob Lantz <rlantz@cs.stanford.edu>
Date: Sat, 27 Feb 2010 13:54:10 -0800
Subject: [PATCH] Fixed to be compatible with modified Mininet() class.

---
 mininet/cli.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/mininet/cli.py b/mininet/cli.py
index 46379281e..469f4b10b 100644
--- 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()