Merge branch 'master' of github.com:mininet/mininet

bocon13 · bocon13 · commit f5890cef1e20 · 2013-08-27T12:27:36.000-07:00
diff --git a/mininet/node.py b/mininet/node.py
@@ -1143,7 +1143,7 @@ def checkListening( self ):
                              "installed." )
         listening = self.cmd( "echo A | telnet -e A %s %d" %
                               ( self.ip, self.port ) )
-        if 'Unable' not in listening:
+        if 'Connected' in listening:
             servers = self.cmd( 'netstat -atp' ).split( '\n' )
             pstr = ':%d ' % self.port
             clist = servers[ 0:1 ] + [ s for s in servers if pstr in s ]
@@ -1238,7 +1238,7 @@ def checkListening( self ):
         "Warn if remote controller is not accessible"
         listening = self.cmd( "echo A | telnet -e A %s %d" %
                               ( self.ip, self.port ) )
-        if 'Unable' in listening:
+        if 'Connected' not in listening:
             warn( "Unable to contact the remote controller"
                   " at %s:%d\n" % ( self.ip, self.port ) )
 
diff --git a/util/vm/build.py b/util/vm/build.py
@@ -9,14 +9,14 @@
     -> create base install image if it's missing
         - download iso if it's missing
         - install from iso onto image
-    
+
     build
     -> create cow disk for new VM, based on base image
     -> boot it in qemu/kvm with text /serial console
     -> install Mininet
 
     test
-    -> make codecheck
+    -> sudo mn --test pingall
     -> make test
 
     release
@@ -51,10 +51,10 @@
     'precise64server':
     'http://mirrors.kernel.org/ubuntu-releases/12.04/'
     'ubuntu-12.04.3-server-amd64.iso',
-    'quetzal32server':
+    'quantal32server':
     'http://mirrors.kernel.org/ubuntu-releases/12.10/'
     'ubuntu-12.10-server-i386.iso',
-    'quetzal64server':
+    'quantal64server':
     'http://mirrors.kernel.org/ubuntu-releases/12.10/'
     'ubuntu-12.10-server-amd64.iso',
     'raring32server':
