use isinstance( intf, OVSIntf )

Unfortunately disabling IPv6 via sysctl doesn't actually
disable it on all of the interfaces by default. Disabling
it via grub disables it entirely in the VM.

Helps with #454

.pylint

@@ -41,16 +41,19 @@ load-plugins=
 # can either give multiple identifier separated by comma (,) or put this option
 # multiple time (only on the command line, not in the configuration file where
 # it should appear only once).
-disable=W0704,C0103,W0231,E1102,W0511,W0142,R0902,R0903,R0904,R0913,R0914,R0801,I0011
-
+disable=pointless-except, invalid-name, super-init-not-called, fixme, star-args,
+        too-many-instance-attributes, too-few-public-methods, too-many-arguments,
+        too-many-locals, too-many-public-methods, duplicate-code, bad-whitespace,
+        locally-disabled
 
 [REPORTS]
 
 # Set the output format. Available formats are text, parseable, colorized, msvs
 # (visual studio) and html
 output-format=colorized
+msg-template='{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}'
 
-# Include message's id in outpu
+# Include message's id in output
 include-ids=yes
 
 # Put messages in a separate file for each module / package specified on the
@@ -191,7 +194,7 @@ additional-builtins=
 ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by
 
 # List of method names used to declare (i.e. assign) instance attributes.
-defining-attr-methods=__init__,__new__,setUp
+defining-attr-methods=__init__,__new__,setUp,build
 
 
 # checks for sign of poor/misdesign:
@@ -264,7 +267,8 @@ int-import-graph=
 max-line-length=80
 
 # Maximum number of lines in a module
-max-module-lines=1500
+# XXX 1500 -> 4000 for miniedit.py
+max-module-lines=4000
 
 # String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
 # tab).

INSTALL

@@ -2,7 +2,7 @@
 Mininet Installation/Configuration Notes
 ----------------------------------------
 
-Mininet 2.2.0b1
+Mininet 2.2.0
 ---
 
 The supported installation methods for Mininet are 1) using a

LICENSE

@@ -1,6 +1,6 @@
-Mininet 2.2.0b1 License
+Mininet 2.2.0 License
 
-Copyright (c) 2013 Open Networking Laboratory
+Copyright (c) 2013-2014 Open Networking Laboratory
 Copyright (c) 2009-2012 Bob Lantz and The Board of Trustees of
 The Leland Stanford Junior University
 

Makefile

@@ -6,7 +6,7 @@ BIN = $(MN)
 PYSRC = $(MININET) $(TEST) $(EXAMPLES) $(BIN)
 MNEXEC = mnexec
 MANPAGES = mn.1 mnexec.1
-P8IGN = E251,E201,E302,E202
+P8IGN = E251,E201,E302,E202,E126,E127,E203,E226
 BINDIR = /usr/bin
 MANDIR = /usr/share/man/man1
 DOCDIRS = doc/html doc/latex
@@ -24,7 +24,8 @@ codecheck: $(PYSRC)
 	util/versioncheck.py
 	pyflakes $(PYSRC)
 	pylint --rcfile=.pylint $(PYSRC)
-	pep8 --repeat --ignore=$(P8IGN) $(PYSRC)
+#	Exclude miniedit from pep8 checking for now
+	pep8 --repeat --ignore=$(P8IGN) `ls $(PYSRC) | grep -v miniedit.py`
 
 errcheck: $(PYSRC)
 	-echo "Running check for errors only"
@@ -36,6 +37,11 @@ test: $(MININET) $(TEST)
 	mininet/test/test_nets.py
 	mininet/test/test_hifi.py
 
+slowtest: $(MININET)
+	-echo "Running slower tests (walkthrough, examples)"
+	mininet/test/test_walkthrough.py -v
+	mininet/examples/test/runner.py -v
+
 mnexec: mnexec.c $(MN) mininet/net.py
 	cc $(CFLAGS) $(LDFLAGS) -DVERSION=\"`PYTHONPATH=. $(MN) --version`\" $< -o $@
 
@@ -45,7 +51,7 @@ install: $(MNEXEC) $(MANPAGES)
 	python setup.py install
 
 develop: $(MNEXEC) $(MANPAGES)
-	# Perhaps we should link these as well
+# 	Perhaps we should link these as well
 	install $(MNEXEC) $(BINDIR)
 	install $(MANPAGES) $(MANDIR)
 	python setup.py develop
@@ -58,7 +64,7 @@ mn.1: $(MN)
 
 mnexec.1: mnexec
 	help2man -N -n "execution utility for Mininet." \
-	-h "-h" -v "-v" --no-discard-stderr ./$< -o $@ 
+	-h "-h" -v "-v" --no-discard-stderr ./$< -o $@
 
 .PHONY: doc
 

README.md

@@ -3,7 +3,7 @@ Mininet: Rapid Prototyping for Software Defined Networks
 
 *The best way to emulate almost any network on your laptop!*
 
-Mininet 2.2.0b1
+Mininet 2.2.0
 
 ### What is Mininet?
 
@@ -74,12 +74,17 @@ several new features, including:
 * Improved OpenFlow 1.3 support
 
 	- `mn --switch ovs,protocols=openflow13` starts OVS in 1.3 mode
-	- `install.sh -w` installs 1.3-compatible Wireshark dissector using
+	- `install.sh -w` installs a 1.3-compatible Wireshark dissector using
 	  Loxigen
-	- `install.sh -y` installs Ryu 1.3-compatible controller
+	- `install.sh -y` installs the Ryu 1.3-compatible controller
 
 * A new `nodelib.py` node library, and new `Node` types including
-  `LinuxBridge`, `OVSBridge`, `LinuxRouter` and `NAT`
+  `LinuxBridge`, `OVSBridge`, `LinuxRouter` (see `examples/`)
+  and `NAT`
+
+* A `--nat` option which connects a Mininet network to your LAN using NAT
+  (For this to work correctly, Mininet's `--ipbase` subnet should not 
+  overlap with any external or internet IP addresses you wish to use)
 
 * An improved MiniEdit GUI (`examples/miniedit.py`) - thanks to
   Gregory Gee
@@ -98,6 +103,10 @@ Note that examples contain experimental features which might
 "graduate" into mainline Mininet in the future, but they should 
 not be considered a stable part of the Mininet API!
 
+A number of bugs have also been fixed, most notably multiple link
+support in `Topo()`. See github issues and the release notes on
+the Mininet wiki for additional information.
+
 ### Installation
 
 See `INSTALL` for installation instructions and details.

bin/mn

@@ -25,11 +25,12 @@ from mininet.cli import CLI
 from mininet.log import lg, LEVELS, info, debug, warn, error
 from mininet.net import Mininet, MininetWithControlNet, VERSION
 from mininet.node import ( Host, CPULimitedHost, Controller, OVSController,
-                           RYU, NOX, RemoteController, findController, DefaultController,
+                           RYU, NOX, RemoteController, findController,
+                           DefaultController,
                            UserSwitch, OVSSwitch, OVSBridge,
                            OVSLegacyKernelSwitch, IVSSwitch )
 from mininet.nodelib import LinuxBridge
-from mininet.link import Link, TCLink
+from mininet.link import Link, TCLink, OVSLink
 from mininet.topo import SingleSwitchTopo, LinearTopo, SingleSwitchReversedTopo
 from mininet.topolib import TreeTopo, TorusTopo
 from mininet.util import customConstructor, splitArgs
@@ -56,7 +57,7 @@ TOPOS = { 'minimal': lambda: SingleSwitchTopo( k=2 ),
 
 SWITCHDEF = 'default'
 SWITCHES = { 'user': UserSwitch,
-             'ovs':  OVSSwitch,
+             'ovs': OVSSwitch,
              'ovsbr' : OVSBridge,
              # Keep ovsk for compatibility with 2.0
              'ovsk': OVSSwitch,
@@ -81,7 +82,8 @@ CONTROLLERS = { 'ref': Controller,
 
 LINKDEF = 'default'
 LINKS = { 'default': Link,
-          'tc': TCLink }
+          'tc': TCLink,
+          'ovs': OVSLink }
 
 
 # optional tests to run
@@ -132,7 +134,7 @@ class MininetRunner( object ):
         self.setup()
         self.begin()
 
-    def custom( self, option, opt_str, value, parser ):
+    def custom( self, _option, _opt_str, value, _parser ):
         """Parse custom file and add params.
            option: option e.g. --custom
            opt_str: option string e.g. --custom
@@ -145,7 +147,7 @@ class MininetRunner( object ):
         else:
             # Accept a comma-separated list of filenames
             files += value.split(',')
-        
+
         for fileName in files:
             customs = {}
             if os.path.isfile( fileName ):
@@ -168,9 +170,12 @@ class MininetRunner( object ):
             # Add or modify global variable or class
             globals()[ name ] = value
 
-    def setNat( self, option, opt_str, value, parser ):
+    def setNat( self, _option, opt_str, value, parser ):
+        "Set NAT option(s)"
+        assert self  # satisfy pylint
         parser.values.nat = True
-        if parser.rargs and parser.rargs[ 0 ][ 0 ] != '-': #first arg, first char != '-'
+        # first arg, first char != '-'
+        if parser.rargs and parser.rargs[ 0 ][ 0 ] != '-':
             value = parser.rargs.pop( 0 )
             _, args, kwargs = splitArgs( opt_str + ',' + value )
             parser.values.nat_args = args
@@ -201,7 +206,10 @@ class MininetRunner( object ):
                          default=False, help='clean and exit' )
         opts.add_option( '--custom', action='callback',
                          callback=self.custom,
-                         type='string', help='read custom classes or params from .py file(s)' )
+                         type='string',
+                         help='read custom classes or params from .py file(s)'
+                         )
+
         opts.add_option( '--test', type='choice', choices=TESTS,
                          default=TESTS[ 0 ],
                          help='|'.join( TESTS ) )
@@ -231,10 +239,12 @@ class MininetRunner( object ):
                          default=False, help="pin hosts to CPU cores "
                          "(requires --host cfs or --host rt)" )
         opts.add_option( '--nat', action='callback', callback=self.setNat,
-                         help="adds a NAT to the topology that connects Mininet hosts"
-                         " to the physical network."
-                         " Warning: This may route any traffic on the machine that uses Mininet's"
-                         " IP subnet into the Mininet network. If you need to change"
+                         help="adds a NAT to the topology that"
+                         " connects Mininet hosts to the physical network."
+                         " Warning: This may route any traffic on the machine"
+                         " that uses Mininet's"
+                         " IP subnet into the Mininet network."
+                         " If you need to change"
                          " Mininet's IP subnet, see the --ipbase option." )
         opts.add_option( '--version', action='callback', callback=version,
                          help='prints the version and exits' )
@@ -265,6 +275,9 @@ class MininetRunner( object ):
                     % self.options.verbosity )
         lg.setLogLevel( self.options.verbosity )
 
+    # Maybe we'll reorganize this someday...
+    # pylint: disable=too-many-branches,too-many-statements
+
     def begin( self ):
         "Create and run mininet."
 
@@ -279,17 +292,18 @@ class MininetRunner( object ):
             CONTROLLERS[ 'default' ] = findController()
             if CONTROLLERS[ 'default' ] is None:
                 if self.options.switch == 'default':
-                    # Fall back to OVS Bridge, which does not use an OF controller
-                    info( '*** No default OpenFlow controller found for default switch!\n' )
+                    info( '*** No default OpenFlow controller found '
+                          'for default switch!\n' )
                     info( '*** Falling back to OVS Bridge\n' )
                     self.options.switch = 'ovsbr'
                     self.options.controller = 'none'
                 elif self.options.switch in ( 'ovsbr', 'lxbr' ):
                     self.options.controller = 'none'
                 else:
-                    raise Exception( "Could not find a default controller for switch %s" %
+                    raise Exception( "Could not find a default controller "
+                                     "for switch %s" %
                                      self.options.switch )
-        
+
         topo = buildTopo( TOPOS, self.options.topo )
         switch = customConstructor( SWITCHES, self.options.switch )
         host = customConstructor( HOSTS, self.options.host )
@@ -318,7 +332,7 @@ class MininetRunner( object ):
         cli = ClusterCLI if cluster else CLI
         if cluster:
             warn( '*** WARNING: Experimental cluster mode!\n'
-              '*** Using RemoteHost, RemoteOVSSwitch, RemoteLink\n' )
+                  '*** Using RemoteHost, RemoteOVSSwitch, RemoteLink\n' )
             host, switch, link = RemoteHost, RemoteOVSSwitch, RemoteLink
             Net = partial( MininetCluster, servers=cluster.split( ',' ),
                            placement=PLACEMENT[ self.options.placement ] )
@@ -333,7 +347,8 @@ class MininetRunner( object ):
                   listenPort=listenPort )
 
         if self.options.ensure_value( 'nat', False ):
-            nat = mn.addNAT( *self.options.nat_args, **self.options.nat_kwargs )
+            nat = mn.addNAT( *self.options.nat_args,
+                             **self.options.nat_kwargs )
             nat.configDefault()
 
         if self.options.pre:

examples/README.md

@@ -11,6 +11,31 @@ Mininet's Python API.
 This example uses Mininet's medium-level API to create an sshd
 process running in a namespace. Doesn't use OpenFlow.
 
+#### bind.py:
+
+This example shows how you can create private directories for each
+node in a Mininet topology.
+
+#### cluster.py:
+
+This example contains all of the code for experimental cluster
+edition. Remote classes and MininetCluster can be imported from
+here to create a topology with nodes on remote machines.
+
+#### clusterSanity.py:
+
+This example runs cluster edition locally as a sanity check to test
+basic functionality.
+
+#### clustercli.py:
+
+This example contains a CLI for experimental cluster edition.
+
+#### clusterdemo.py:
+
+This example is a basic demo of cluster edition on 3 servers with
+a tree topology of depth 3 and fanout 3.
+
 #### consoles.py:
 
 This example creates a grid of console windows, one for each node,
@@ -47,6 +72,11 @@ topology object) and adding nodes to it.
 This example shows how to add an interface (for example a real
 hardware interface) to a network after the network is created.
 
+#### intfoptions.py:
+
+This example reconfigures a TCIntf during runtime with different
+traffic control commands to test bandwidth, loss, and delay.
+
 #### limit.py:
 
 This example shows how to use link and CPU limits.
@@ -56,7 +86,7 @@ This example shows how to use link and CPU limits.
 This example shows how to create a custom topology programatically
 by subclassing Topo, and how to run a series of tests on it.
 
-### linuxrouter.py:
+#### linuxrouter.py:
 
 This example shows how to create and configure a router in Mininet
 that uses Linux IP forwarding.
@@ -65,11 +95,16 @@ that uses Linux IP forwarding.
 
 This example demonstrates creating a network via a graphical editor.
 
-#### mobility.py
+#### mobility.py:
 
 This example demonstrates detaching an interface from one switch and
 attaching it another as a basic way to move a host around a network.
 
+#### multiLink.py:
+
+This example demonstrates the creation of multiple links between
+nodes using a custom Topology class.
+
 #### multiping.py:
 
 This example demonstrates one method for
@@ -89,7 +124,12 @@ This example shows how to connect a Mininet network to the Internet
 using NAT. It also answers the eternal question "why can't I ping
 `google.com`?"
 
-#### numberedports.py
+#### natnet.py:
+
+This example demonstrates how to create a network using a NAT node
+to connect hosts to the internet.
+
+#### numberedports.py:
 
 This example verifies the mininet ofport numbers match up to the ovs port numbers.
 It also verifies that the port numbers match up to the interface numbers

examples/bind.py

@@ -22,7 +22,7 @@ to temporary private directories. To do this, simply create a list of
 directories to be made private. A tmpfs will then be mounted on them.
 
 You may use both temporary and persistent directories at the same
-time. In the following privateDirs string, each host will have a 
+time. In the following privateDirs string, each host will have a
 persistent directory in the root filesystem at
 "/tmp/(hostname)/var/run" mounted on "/var/run". Each host will also
 have a temporary private directory mounted on "/var/log".
@@ -48,8 +48,8 @@ from functools import partial
 def testHostWithPrivateDirs():
     "Test bind mounts"
     topo = SingleSwitchTopo( 10 )
-    privateDirs = [ ( '/var/log', '/tmp/%(name)s/var/log' ), 
-                    ( '/var/run', '/tmp/%(name)s/var/run' ), 
+    privateDirs = [ ( '/var/log', '/tmp/%(name)s/var/log' ),
+                    ( '/var/run', '/tmp/%(name)s/var/run' ),
                       '/var/mn' ]
     host = partial( Host,
                     privateDirs=privateDirs )
@@ -57,7 +57,7 @@ def testHostWithPrivateDirs():
     net.start()
     directories = [ directory[ 0 ] if isinstance( directory, tuple )
                     else directory for directory in privateDirs ]
-    info( 'Private Directories:',  directories, '\n' )
+    info( 'Private Directories:', directories, '\n' )
     CLI( net )
     net.stop()
 
@@ -65,5 +65,3 @@ if __name__ == '__main__':
     setLogLevel( 'info' )
     testHostWithPrivateDirs()
     info( 'Done.\n')
-
-

examples/cluster.py

@@ -87,7 +87,7 @@ from signal import signal, SIGINT, SIG_IGN
 from subprocess import Popen, PIPE, STDOUT
 import os
 from random import randrange
-from sys import exit
+import sys
 import re
 
 from distutils.version import StrictVersion
@@ -123,7 +123,8 @@ class RemoteMixin( object ):
            **kwargs: see Node()"""
         # We connect to servers by IP address
         self.server = server if server else 'localhost'
-        self.serverIP = serverIP if serverIP else self.findServerIP( self.server )
+        self.serverIP = ( serverIP if serverIP
+                          else self.findServerIP( self.server ) )
         self.user = user if user else self.findUser()
         if controlPath is True:
             # Set a default control path for shared SSH connections
@@ -143,21 +144,20 @@ class RemoteMixin( object ):
             self.dest = None
             self.sshcmd = []
             self.isRemote = False
+        # Satisfy pylint
+        self.shell, self.pid = None, None
         super( RemoteMixin, self ).__init__( name, **kwargs )
 
     @staticmethod
     def findUser():
         "Try to return logged-in (usually non-root) user"
-        try:
+        return (
             # If we're running sudo
-            return os.environ[ 'SUDO_USER' ]
-        except:
-            try:
-                # Logged-in user (if we have a tty)
-                return quietRun( 'who am i' ).split()[ 0 ]
-            except:
-                # Give up and return effective user
-                return quietRun( 'whoami' )
+            os.environ.get( 'SUDO_USER', False ) or
+            # Logged-in user (if we have a tty)
+            ( quietRun( 'who am i' ).split() or [ False ] )[ 0 ] or
+            # Give up and return effective user
+            quietRun( 'whoami' ) )
 
     # Determine IP address of local host
     _ipMatchRegex = re.compile( r'\d+\.\d+\.\d+\.\d+' )
@@ -181,12 +181,13 @@ class RemoteMixin( object ):
         if self.isRemote:
             kwargs.update( mnopts='-c' )
         super( RemoteMixin, self ).startShell( *args, **kwargs )
-        if self.splitInit:
-            self.sendCmd( 'echo $$' )
-        else:
-            self.pid = int( self.cmd( 'echo $$' ) )
+        # Optional split initialization
+        self.sendCmd( 'echo $$' )
+        if not self.splitInit:
+            self.finishInit()
 
     def finishInit( self ):
+        "Wait for split initialization to complete"
         self.pid = int( self.waitOutput() )
 
     def rpopen( self, *cmd, **opts ):
@@ -253,8 +254,10 @@ class RemoteMixin( object ):
 
     def addIntf( self, *args, **kwargs ):
         "Override: use RemoteLink.moveIntf"
-        return super( RemoteMixin, self).addIntf( *args,
-                        moveIntfFn=RemoteLink.moveIntf, **kwargs )
+        return super( RemoteMixin,
+                      self).addIntf( *args,
+                                     moveIntfFn=RemoteLink.moveIntf,
+                                     **kwargs )
 
     def cleanup( self ):
         "Help python collect its garbage."
@@ -276,20 +279,23 @@ class RemoteHost( RemoteNode ):
 
 class RemoteOVSSwitch( RemoteMixin, OVSSwitch ):
     "Remote instance of Open vSwitch"
+
     OVSVersions = {}
+
     def isOldOVS( self ):
         "Is remote switch using an old OVS version?"
         cls = type( self )
         if self.server not in cls.OVSVersions:
+            # pylint: disable=not-callable
             vers = self.cmd( 'ovs-vsctl --version' )
-            cls.OVSVersions[ self.server ] = re.findall( '\d+\.\d+', vers )[ 0 ]
+            # pylint: enable=not-callable
+            cls.OVSVersions[ self.server ] = re.findall(
+                r'\d+\.\d+', vers )[ 0 ]
         return ( StrictVersion( cls.OVSVersions[ self.server ] ) <
-                StrictVersion( '1.10' ) )
-
+                 StrictVersion( '1.10' ) )
 
 
 class RemoteLink( Link ):
-
     "A RemoteLink is a link between nodes which may be on different servers"
 
     def __init__( self, node1, node2, **kwargs ):
@@ -301,6 +307,7 @@ class RemoteLink( Link ):
         self.tunnel = None
         kwargs.setdefault( 'params1', {} )
         kwargs.setdefault( 'params2', {} )
+        self.cmd = None  # satisfy pylint
         Link.__init__( self, node1, node2, **kwargs )
 
     def stop( self ):
@@ -324,9 +331,10 @@ class RemoteLink( Link ):
         elif server1 == server2:
             # Remote link on same remote server
             return makeIntfPair( intfname1, intfname2, addr1, addr2,
-                                 run=node1.rcmd )
+                                 runCmd=node1.rcmd )
         # Otherwise, make a tunnel
-        self.tunnel = self.makeTunnel( node1, node2, intfname1, intfname2, addr1, addr2 )
+        self.tunnel = self.makeTunnel( node1, node2, intfname1, intfname2,
+                                       addr1, addr2 )
         return self.tunnel
 
     @staticmethod
@@ -340,13 +348,13 @@ class RemoteLink( Link ):
         cmd = 'ip link set %s netns %s' % ( intf, node.pid )
         node.rcmd( cmd )
         links = node.cmd( 'ip link show' )
-        if not ( ' %s:' % intf ) in links:
+        if not ' %s:' % intf in links:
             if printError:
                 error( '*** Error: RemoteLink.moveIntf: ' + intf +
-                      ' not successfully moved to ' + node.name + '\n' )
+                       ' not successfully moved to ' + node.name + '\n' )
             return False
         return True
-    
+
     def makeTunnel( self, node1, node2, intfname1, intfname2,
                     addr1=None, addr2=None ):
         "Make a tunnel across switches on different servers"
@@ -380,21 +388,21 @@ class RemoteLink( Link ):
         if ch != '@':
             error( 'makeTunnel:\n',
                    'Tunnel setup failed for',
-                   '%s:%s' % ( node1, node1.dest ), 'to', 
+                   '%s:%s' % ( node1, node1.dest ), 'to',
                    '%s:%s\n' % ( node2, node2.dest ),
-                  'command was:', cmd, '\n' )
+                   'command was:', cmd, '\n' )
             tunnel.terminate()
             tunnel.wait()
             error( ch + tunnel.stdout.read() )
             error( tunnel.stderr.read() )
-            exit( 1 )
+            sys.exit( 1 )
         # 3. Move interfaces if necessary
         for node in node1, node2:
             if node.inNamespace:
                 retry( 3, .01, RemoteLink.moveIntf, 'tap9', node )
         # 4. Rename tap interfaces to desired names
         for node, intf, addr in ( ( node1, intfname1, addr1 ),
-                            ( node2, intfname2, addr2 ) ):
+                                  ( node2, intfname2, addr2 ) ):
             if not addr:
                 node.cmd( 'ip link set tap9 name', intf )
             else:
@@ -421,9 +429,9 @@ class RemoteLink( Link ):
 
 class Placer( object ):
     "Node placement algorithm for MininetCluster"
-    
+
     def __init__( self, servers=None, nodes=None, hosts=None,
-                 switches=None, controllers=None, links=None ):
+                  switches=None, controllers=None, links=None ):
         """Initialize placement object
            servers: list of servers
            nodes: list of all nodes
@@ -442,8 +450,9 @@ class Placer( object ):
 
     def place( self, node ):
         "Return server for a given node"
+        assert self, node  # satisfy pylint
         # Default placement: run locally
-        return None
+        return 'localhost'
 
 
 class RandomPlacer( Placer ):
@@ -451,6 +460,7 @@ class RandomPlacer( Placer ):
     def place( self, nodename ):
         """Random placement function
             nodename: node name"""
+        assert nodename  # please pylint
         # This may be slow with lots of servers
         return self.servers[ randrange( 0, len( self.servers ) ) ]
 
@@ -459,7 +469,7 @@ class RoundRobinPlacer( Placer ):
     """Round-robin placement
        Note this will usually result in cross-server links between
        hosts and switches"""
-    
+
     def __init__( self, *args, **kwargs ):
         Placer.__init__( self, *args, **kwargs )
         self.next = 0
@@ -467,6 +477,7 @@ class RoundRobinPlacer( Placer ):
     def place( self, nodename ):
         """Round-robin placement function
             nodename: node name"""
+        assert nodename  # please pylint
         # This may be slow with lots of servers
         server = self.servers[ self.next ]
         self.next = ( self.next + 1 ) % len( self.servers )
@@ -485,7 +496,7 @@ class SwitchBinPlacer( Placer ):
         self.sset = frozenset( self.switches )
         self.cset = frozenset( self.controllers )
         # Server and switch placement indices
-        self.placement =  self.calculatePlacement()
+        self.placement = self.calculatePlacement()
 
     @staticmethod
     def bin( nodes, servers ):
@@ -552,7 +563,7 @@ class HostSwitchBinPlacer( Placer ):
         scount = len( self.servers )
         self.hbin = max( int( len( self.hosts ) / scount ), 1 )
         self.sbin = max( int( len( self.switches ) / scount ), 1 )
-        self.cbin = max( int( len( self.controllers ) / scount ) , 1 )
+        self.cbin = max( int( len( self.controllers ) / scount ), 1 )
         info( 'scount:', scount )
         info( 'bins:', self.hbin, self.sbin, self.cbin, '\n' )
         self.servdict = dict( enumerate( self.servers ) )
@@ -560,7 +571,7 @@ class HostSwitchBinPlacer( Placer ):
         self.sset = frozenset( self.switches )
         self.cset = frozenset( self.controllers )
         self.hind, self.sind, self.cind = 0, 0, 0
-    
+
     def place( self, nodename ):
         """Simple placement algorithm:
             place nodes into evenly sized bins"""
@@ -580,7 +591,6 @@ class HostSwitchBinPlacer( Placer ):
         return server
 
 
-
 # The MininetCluster class is not strictly necessary.
 # However, it has several purposes:
 # 1. To set up ssh connection sharing/multiplexing
@@ -626,6 +636,7 @@ class MininetCluster( Mininet ):
 
     def popen( self, cmd ):
         "Popen() for server connections"
+        assert self  # please pylint
         old = signal( SIGINT, SIG_IGN )
         conn = Popen( cmd, stdin=PIPE, stdout=PIPE, close_fds=True )
         signal( SIGINT, old )
@@ -643,13 +654,13 @@ class MininetCluster( Mininet ):
         for server in self.servers:
             ip = self.serverIP[ server ]
             if not server or server == 'localhost':
-                 continue
+                continue
             info( server, '' )
             dest = '%s@%s' % ( self.user, ip )
             cmd = [ 'sudo', '-E', '-u', self.user ]
             cmd += self.sshcmd + [ '-n', dest, 'sudo true' ]
             debug( ' '.join( cmd ), '\n' )
-            out, err, code = errRun( cmd )
+            _out, _err, code = errRun( cmd )
             if code != 0:
                 error( '\nstartConnection: server connection check failed '
                        'to %s using command:\n%s\n'
@@ -657,18 +668,19 @@ class MininetCluster( Mininet ):
             result |= code
         if result:
             error( '*** Server precheck failed.\n'
-                   '*** Make sure that the above ssh command works correctly.\n'
+                   '*** Make sure that the above ssh command works'
+                   ' correctly.\n'
                    '*** You may also need to run mn -c on all nodes, and/or\n'
                    '*** use sudo -E.\n' )
-            exit( 1 )
+            sys.exit( 1 )
         info( '\n' )
 
     def modifiedaddHost( self, *args, **kwargs ):
         "Slightly modify addHost"
+        assert self  # please pylint
         kwargs[ 'splitInit' ] = True
         return Mininet.addHost( *args, **kwargs )
 
-
     def placeNodes( self ):
         """Place nodes on servers (if they don't have a server), and
            start shell processes"""
@@ -684,7 +696,7 @@ class MininetCluster( Mininet ):
         for node in nodes:
             config = self.topo.nodeInfo( node )
             # keep local server name consistent accross nodes
-            if 'server' in config.keys() and config[ 'server' ] == None:
+            if 'server' in config.keys() and config[ 'server' ] is None:
                 config[ 'server' ] = 'localhost'
             server = config.setdefault( 'server', placer.place( node ) )
             if server:
@@ -703,7 +715,7 @@ class MininetCluster( Mininet ):
         if ( isinstance( controller, Controller)
              and controller.IP() == '127.0.0.1'
              and ' eth0:' in controller.cmd( 'ip link show' ) ):
-             Intf( 'eth0', node=controller ).updateIP()
+            Intf( 'eth0', node=controller ).updateIP()
         return controller
 
     def buildFromTopo( self, *args, **kwargs ):
@@ -794,7 +806,7 @@ def testRemoteTopo():
     "Test remote Node classes using Mininet()/Topo() API"
     topo = LinearTopo( 2 )
     net = Mininet( topo=topo, host=HostPlacer, switch=SwitchPlacer,
-                  link=RemoteLink, controller=ClusterController )
+                   link=RemoteLink, controller=ClusterController )
     net.start()
     net.pingAll()
     net.stop()

examples/clusterSanity.py

@@ -12,11 +12,11 @@ from mininet.topo import SingleSwitchTopo
 def clusterSanity():
     "Sanity check for cluster mode"
     topo = SingleSwitchTopo()
-    net = MininetCluster( topo=topo ) 
+    net = MininetCluster( topo=topo )
     net.start()
     CLI( net )
     net.stop()
 
-if __name__  == '__main__':
+if __name__ == '__main__':
     setLogLevel( 'info' )
     clusterSanity()

examples/clustercli.py

@@ -5,6 +5,7 @@
 from mininet.cli import CLI
 from mininet.log import output, error
 
+# pylint: disable=global-statement
 nx, graphviz_layout, plt = None, None, None  # Will be imported on demand
 
 
@@ -15,25 +16,29 @@ class ClusterCLI( CLI ):
     def colorsFor( seq ):
         "Return a list of background colors for a sequence"
         colors = [ 'red', 'lightgreen', 'cyan', 'yellow', 'orange',
-                  'magenta', 'pink', 'grey', 'brown',
-                  'white' ]
+                   'magenta', 'pink', 'grey', 'brown',
+                   'white' ]
         slen, clen = len( seq ), len( colors )
         reps = max( 1, slen / clen )
         colors = colors * reps
         colors = colors[ 0 : slen ]
         return colors
-    
-    def do_plot( self, line ):
+
+    def do_plot( self, _line ):
         "Plot topology colored by node placement"
         # Import networkx if needed
         global nx, plt
         if not nx:
             try:
-                import networkx as nx
-                import matplotlib.pyplot as plt
+                # pylint: disable=import-error
+                import networkx
+                nx = networkx  # satisfy pylint
+                from matplotlib import pyplot
+                plt = pyplot   # satisfiy pylint
                 import pygraphviz
                 assert pygraphviz  # silence pyflakes
-            except:
+                # pylint: enable=import-error
+            except ImportError:
                 error( 'plot requires networkx, matplotlib and pygraphviz - '
                        'please install them and try again\n' )
                 return
@@ -52,11 +57,14 @@ class ClusterCLI( CLI ):
         # Plot it!
         pos = nx.graphviz_layout( g )
         opts = { 'ax': None, 'font_weight': 'bold',
-		 'width': 2, 'edge_color': 'darkblue' }
-        hcolors = [ color[ getattr( h, 'server', 'localhost' ) ] for h in hosts ]
-        scolors = [ color[ getattr( s, 'server', 'localhost' ) ] for s in switches ]
-        nx.draw_networkx( g, pos=pos, nodelist=hosts, node_size=800, label='host',
-                          node_color=hcolors, node_shape='s', **opts )
+                 'width': 2, 'edge_color': 'darkblue' }
+        hcolors = [ color[ getattr( h, 'server', 'localhost' ) ]
+                    for h in hosts ]
+        scolors = [ color[ getattr( s, 'server', 'localhost' ) ]
+                    for s in switches ]
+        nx.draw_networkx( g, pos=pos, nodelist=hosts, node_size=800,
+                          label='host', node_color=hcolors, node_shape='s',
+                          **opts )
         nx.draw_networkx( g, pos=pos, nodelist=switches, node_size=1000,
                           node_color=scolors, node_shape='o', **opts )
         # Get rid of axes, add title, and show
@@ -68,7 +76,7 @@ class ClusterCLI( CLI ):
         plt.title( 'Node Placement', fontweight='bold' )
         plt.show()
 
-    def do_status( self, line ):
+    def do_status( self, _line ):
         "Report on node shell status"
         nodes = self.mn.hosts + self.mn.switches
         for node in nodes:
@@ -82,8 +90,7 @@ class ClusterCLI( CLI ):
         else:
             output( 'All nodes are still running.\n' )
 
-
-    def do_placement( self, line ):
+    def do_placement( self, _line ):
         "Describe node placement"
         mn = self.mn
         nodes = mn.hosts + mn.switches + mn.controllers

examples/clusterdemo.py

@@ -20,4 +20,3 @@ def demo():
 if __name__ == '__main__':
     setLogLevel( 'info' )
     demo()
-

examples/consoles.py

@@ -327,7 +327,7 @@ class ConsoleApp( Frame ):
         elif units[0] == 'b':
             val *= 10 ** -9
         self.updates += 1
-        self.bw +=  val
+        self.bw += val
         if self.updates >= self.hostCount:
             self.graph.addBar( self.bw )
             self.bw = 0

examples/controlnet.py

@@ -35,7 +35,7 @@ class DataController( Controller ):
 class MininetFacade( object ):
     """Mininet object facade that allows a single CLI to
        talk to one or more networks"""
-    
+
     def __init__( self, net, *args, **kwargs ):
         """Create MininetFacade object.
            net: Primary Mininet object
@@ -114,7 +114,7 @@ class ControlNetwork( Topo ):
 
 def run():
     "Create control and data networks, and invoke the CLI"
-    
+
     info( '* Creating Control Network\n' )
     ctopo = ControlNetwork( n=4, dataController=DataController )
     cnet = Mininet( topo=ctopo, ipBase='192.168.123.0/24', controller=None )

examples/cpu.py

@@ -27,6 +27,7 @@ def bwtest( cpuLimits, period_us=100000, seconds=5 ):
                            cpu=cpu )
             try:
                 net = Mininet( topo=topo, host=host )
+            # pylint: disable=bare-except
             except:
                 info( '*** Skipping host %s\n' % sched )
                 break

examples/hwintf.py

@@ -5,7 +5,8 @@ This example shows how to add an interface (for example a real
 hardware interface) to a network after the network is created.
 """
 
-import re, sys
+import re
+import sys
 
 from mininet.cli import CLI
 from mininet.log import setLogLevel, info, error

examples/intfoptions.py

@@ -21,7 +21,7 @@ def intfOptions():
     link1 = net.addLink( h1, s1, cls=TCLink )
     net.addLink( h2, s1 )
     net.start()
-    
+
     # flush out latency from reactive forwarding delay
     net.pingAll()
 
@@ -34,12 +34,12 @@ def intfOptions():
     link1.intf1.config( loss=50 )
     info( '\n' )
     net.iperf( ( h1, h2 ), l4Type='UDP' )
-    
+
     info( '\n*** Configuring one intf with delay of 15ms\n' )
     link1.intf1.config( delay='15ms' )
     info( '\n*** Run a ping to confirm delay\n' )
     net.pingPairFull()
-    
+
     info( '\n*** Done testing\n' )
     net.stop()
 

examples/limit.py

@@ -27,9 +27,11 @@ def limit( bw=10, cpu=.1 ):
         info( '*** Testing with', sched, 'bandwidth limiting\n' )
         if sched == 'rt':
             release = quietRun( 'uname -r' ).strip('\r\n')
-            output = quietRun( 'grep CONFIG_RT_GROUP_SCHED /boot/config-%s' % release )
+            output = quietRun( 'grep CONFIG_RT_GROUP_SCHED /boot/config-%s'
+                               % release )
             if output == '# CONFIG_RT_GROUP_SCHED is not set\n':
-                info( '*** RT Scheduler is not enabled in your kernel. Skipping this test\n' )
+                info( '*** RT Scheduler is not enabled in your kernel. '
+                      'Skipping this test\n' )
                 continue
         host = custom( CPULimitedHost, sched=sched, cpu=cpu )
         net = Mininet( topo=myTopo, intf=intf, host=host )

examples/linuxrouter.py

@@ -2,7 +2,7 @@
 
 """
 linuxrouter.py: Example network with Linux IP router
- 
+
 This example converts a Node into a router using IP forwarding
 already built into Linux.
 
@@ -16,7 +16,7 @@ The topology contains a router with three IP subnets:
  - h2 (IP: 172.16.0.100)
  - h3 (IP: 10.0.0.100)
 
- Routing entries can be added to the routing tables of the 
+ Routing entries can be added to the routing tables of the
  hosts or router using the "ip route add" or "route add" command.
  See the man pages for more details.
 
@@ -44,18 +44,25 @@ class LinuxRouter( Node ):
 class NetworkTopo( Topo ):
     "A simple topology of a router with three subnets (one host in each)."
 
-    def build( self, n=2, h=1, **opts ):
+    def build( self, **_opts ):
         router = self.addNode( 'r0', cls=LinuxRouter, ip='192.168.1.1/24' )
-        h1 = self.addHost( 'h1', ip='192.168.1.100/24', defaultRoute='via 192.168.1.1' )
-        h2 = self.addHost( 'h2', ip='172.16.0.100/12', defaultRoute='via 172.16.0.1' )
-        h3 = self.addHost( 'h3', ip='10.0.0.100/8', defaultRoute='via 10.0.0.1' )
-        self.addLink( h1, router, intfName2='r0-eth1', params2={ 'ip' : '192.168.1.1/24' } )
-        self.addLink( h2, router, intfName2='r0-eth2', params2={ 'ip' : '172.16.0.1/12' } )
-        self.addLink( h3, router, intfName2='r0-eth3', params2={ 'ip' : '10.0.0.1/8' } )
+        h1 = self.addHost( 'h1', ip='192.168.1.100/24',
+                           defaultRoute='via 192.168.1.1' )
+        h2 = self.addHost( 'h2', ip='172.16.0.100/12',
+                           defaultRoute='via 172.16.0.1' )
+        h3 = self.addHost( 'h3', ip='10.0.0.100/8',
+                           defaultRoute='via 10.0.0.1' )
+        self.addLink( h1, router, intfName2='r0-eth1',
+                      params2={ 'ip' : '192.168.1.1/24' } )
+        self.addLink( h2, router, intfName2='r0-eth2',
+                      params2={ 'ip' : '172.16.0.1/12' } )
+        self.addLink( h3, router, intfName2='r0-eth3',
+                      params2={ 'ip' : '10.0.0.1/8' } )
 
 def run():
+    "Test linux router"
     topo = NetworkTopo()
-    net = Mininet( topo=topo, controller=None ) # no controller needed
+    net = Mininet( topo=topo, controller=None )  # no controller needed
     net.start()
     info( '*** Routing Table on Router\n' )
     print net[ 'r0' ].cmd( 'route' )

examples/mobility.py

@@ -59,7 +59,7 @@ class MobilitySwitch( OVSSwitch ):
     def validatePort( self, intf ):
         "Validate intf's OF port number"
         ofport = int( self.cmd( 'ovs-vsctl get Interface', intf,
-                              'ofport' ) )
+                                'ofport' ) )
         if ofport != self.ports[ intf ]:
             warn( 'WARNING: ofport for', intf, 'is actually', ofport,
                   '\n' )

examples/multilink.py

@@ -9,9 +9,9 @@ from mininet.cli import CLI
 from mininet.log import setLogLevel
 from mininet.net import Mininet
 from mininet.topo import Topo
-    
+
 def runMultiLink():
-    
+    "Create and run multiple link network"
     topo = simpleMultiLinkTopo( n=2 )
     net = Mininet( topo=topo )
     net.start()
@@ -19,13 +19,14 @@ def runMultiLink():
     net.stop()
 
 class simpleMultiLinkTopo( Topo ):
+    "Simple topology with multiple links"
 
     def __init__( self, n, **kwargs ):
         Topo.__init__( self, **kwargs )
 
         h1, h2 = self.addHost( 'h1' ), self.addHost( 'h2' )
         s1 = self.addSwitch( 's1' )
-        
+
         for _ in range( n ):
             self.addLink( s1, h1 )
             self.addLink( s1, h2 )

examples/nat.py

@@ -22,7 +22,7 @@ def startNAT( root, inetIntf='eth0', subnet='10.0/8' ):
     subnet: Mininet subnet (default 10.0/8)="""
 
     # Identify the interface connecting to the mininet network
-    localIntf =  root.defaultIntf()
+    localIntf = root.defaultIntf()
 
     # Flush any currently active rules
     root.cmd( 'iptables -F' )

examples/natnet.py

@@ -14,7 +14,7 @@ natnet.py: Example network with NATs
     |              |
    s1              s2
     |              |
-   h1              h2 
+   h1              h2
 
 """
 
@@ -27,7 +27,7 @@ from mininet.util import irange
 
 class InternetTopo(Topo):
     "Single switch connected to n hosts."
-    def __init__(self, n=2, h=1, **opts):
+    def __init__(self, n=2, **opts):
         Topo.__init__(self, **opts)
 
         # set up inet switch
@@ -44,15 +44,15 @@ class InternetTopo(Topo):
             localSubnet = '192.168.%d.0/24' % i
             natParams = { 'ip' : '%s/24' % localIP }
             # add NAT to topology
-            nat = self.addNode('nat%d' % i, cls=NAT, subnet=localSubnet, 
+            nat = self.addNode('nat%d' % i, cls=NAT, subnet=localSubnet,
                                inetIntf=inetIntf, localIntf=localIntf)
             switch = self.addSwitch('s%d' % i)
             # connect NAT to inet and local switches
             self.addLink(nat, inetSwitch, intfName1=inetIntf)
             self.addLink(nat, switch, intfName1=localIntf, params1=natParams)
             # add host and connect to local switch
-            host = self.addHost('h%d' % i, 
-                                ip='192.168.%d.100/24' % i, 
+            host = self.addHost('h%d' % i,
+                                ip='192.168.%d.100/24' % i,
                                 defaultRoute='via %s' % localIP)
             self.addLink(host, switch)
 
@@ -67,4 +67,3 @@ def run():
 if __name__ == '__main__':
     setLogLevel('info')
     run()
-    

examples/numberedports.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 """
-Create a network with 5 hosts, numbered 1-4 and 9. 
+Create a network with 5 hosts, numbered 1-4 and 9.
 Validate that the port numbers match to the interface name,
 and that the ovs ports match the mininet ports.
 """
@@ -13,16 +13,19 @@ from mininet.log import setLogLevel, info, warn
 def validatePort( switch, intf ):
     "Validate intf's OF port number"
     ofport = int( switch.cmd( 'ovs-vsctl get Interface', intf,
-                          'ofport' ) )
+                              'ofport' ) )
     if ofport != switch.ports[ intf ]:
         warn( 'WARNING: ofport for', intf, 'is actually', ofport, '\n' )
         return 0
     else:
         return 1
 
-def net():
+def testPortNumbering():
 
-    "Create a network with 5 hosts."
+    """Test port numbering:
+       Create a network with 5 hosts (using Mininet's
+       mid-level API) and check that implicit and
+       explicit port numbering works as expected."""
 
     net = Mininet( controller=Controller )
 
@@ -45,22 +48,25 @@ def net():
     net.addLink( h2, s1 )
     net.addLink( h3, s1 )
     net.addLink( h4, s1 )
-    net.addLink( h5, s1, port1 = 1, port2 = 9 ) # specify a different port to connect host 5 to on the switch.
+    # specify a different port to connect host 5 to on the switch.
+    net.addLink( h5, s1, port1=1, port2= 9)
 
     info( '*** Starting network\n' )
     net.start()
 
     # print the interfaces and their port numbers
-    info( '\n*** printing and validating the ports running on each interface\n' )
+    info( '\n*** printing and validating the ports '
+          'running on each interface\n' )
     for intfs in s1.intfList():
         if not intfs.name == "lo":
-            info( intfs, ': ', s1.ports[intfs], 
-            '\n' )
-            info ( 'Validating that', intfs, 'is actually on port', s1.ports[intfs], '... ' )
+            info( intfs, ': ', s1.ports[intfs],
+                  '\n' )
+            info( 'Validating that', intfs,
+                   'is actually on port', s1.ports[intfs], '... ' )
             if validatePort( s1, intfs ):
                 info( 'Validated.\n' )
     print '\n'
-        
+
     # test the network with pingall
     net.pingAll()
     print '\n'
@@ -70,5 +76,4 @@ def net():
 
 if __name__ == '__main__':
     setLogLevel( 'info' )
-    net()
-
+    testPortNumbering()

examples/simpleperf.py

@@ -33,8 +33,8 @@ def perfTest():
     "Create network and run simple performance test"
     topo = SingleSwitchTopo( n=4 )
     net = Mininet( topo=topo,
-                  host=CPULimitedHost, link=TCLink,
-                  autoStaticArp=True )
+                   host=CPULimitedHost, link=TCLink,
+                   autoStaticArp=True )
     net.start()
     print "Dumping host connections"
     dumpNodeConnections(net.hosts)

examples/sshd.py

@@ -81,6 +81,6 @@ if __name__ == '__main__':
     net = TreeNet( depth=1, fanout=4 )
     # get sshd args from the command line or use default args
     # useDNS=no -u0 to avoid reverse DNS lookup timeout
-    opts = ' '.join( sys.argv[ 1: ] ) if len( sys.argv ) > 1 else (
+    argvopts = ' '.join( sys.argv[ 1: ] ) if len( sys.argv ) > 1 else (
         '-D -o UseDNS=no -u0' )
-    sshd( net, opts=opts )
+    sshd( net, opts=argvopts )

examples/test/test_baresshd.py

@@ -36,7 +36,7 @@ class testBareSSHD( unittest.TestCase ):
                 '-o StrictModes=no' )
         p = pexpect.spawn( cmd )
         runOpts = [ 'You may now ssh into h1 at 10.0.0.1',
-                    'after 5 seconds, h1 is not listening on port 22', 
+                    'after 5 seconds, h1 is not listening on port 22',
                     pexpect.EOF, pexpect.TIMEOUT ]
         while True:
             index = p.expect( runOpts )

examples/test/test_cpu.py

@@ -6,7 +6,7 @@ Test for cpu.py
 results format:
 
     sched   cpu client MB/s
-    
+
     cfs 45.00%  13254.669841
     cfs 40.00%  11822.441399
     cfs 30.00%  5112.963009
@@ -28,13 +28,13 @@ class testCPU( unittest.TestCase ):
         "Verify that CPU utilization is monotonically decreasing for each scheduler"
         p = pexpect.spawn( 'python -m mininet.examples.cpu' )
         # matches each line from results( shown above )
-        opts = [ '([a-z]+)\t([\d\.]+)%\t([\d\.]+)', 
+        opts = [ '([a-z]+)\t([\d\.]+)%\t([\d\.]+)',
                  pexpect.EOF ]
         scheds = []
         while True:
             index = p.expect( opts, timeout=600 )
             if index == 0:
-                sched = p.match.group( 1 ) 
+                sched = p.match.group( 1 )
                 cpu = float( p.match.group( 2 ) )
                 bw = float( p.match.group( 3 ) )
                 if sched not in scheds:

examples/test/test_emptynet.py

@@ -19,7 +19,7 @@ class testEmptyNet( unittest.TestCase ):
         p.sendline( 'pingall' )
         p.expect ( '(\d+)% dropped' )
         percent = int( p.match.group( 1 ) ) if p.match else -1
-        self.assertEqual( percent, 0 ) 
+        self.assertEqual( percent, 0 )
         p.expect( self.prompt )
         # iperf test
         p.sendline( 'iperf' )

examples/test/test_limit.py

@@ -14,8 +14,8 @@ class testLimit( unittest.TestCase ):
     def testLimit( self ):
         "Verify that CPU limits are within a 2% tolerance of limit for each scheduler"
         p = pexpect.spawn( 'python -m mininet.examples.limit' )
-        opts = [ '\*\*\* Testing network ([\d\.]+) Mbps', 
-                 '\*\*\* Results: \[([\d\., ]+)\]', 
+        opts = [ '\*\*\* Testing network ([\d\.]+) Mbps',
+                 '\*\*\* Results: \[([\d\., ]+)\]',
                  pexpect.EOF ]
         count = 0
         bw = 0

examples/test/test_linearbandwidth.py

@@ -15,8 +15,8 @@ class testLinearBandwidth( unittest.TestCase ):
         "Verify that bandwidth is monotonically decreasing as # of hops increases"
         p = pexpect.spawn( 'python -m mininet.examples.linearbandwidth' )
         count = 0
-        opts = [ '\*\*\* Linear network results', 
-                 '(\d+)\s+([\d\.]+) (.bits)', 
+        opts = [ '\*\*\* Linear network results',
+                 '(\d+)\s+([\d\.]+) (.bits)',
                  pexpect.EOF ]
         while True:
             index = p.expect( opts, timeout=600 )

examples/test/test_multilink.py

@@ -22,14 +22,14 @@ class testMultiLink( unittest.TestCase ):
         hostToIntfs = intfsOutput.split( '\r\n' )[ 1:3 ]
         intfList = []
         for hostToIntf in hostToIntfs:
-            intfList += [ intf for intf in 
+            intfList += [ intf for intf in
                           hostToIntf.split()[1].split(',') ]
 
         # get interfaces from system by running ifconfig on every host
         sysIntfList = []
         opts = [ 'h(\d)-eth(\d)', self.prompt ]
         p.expect( self.prompt )
-        
+
         p.sendline( 'h1 ifconfig' )
         while True:
             p.expect( opts )

examples/test/test_multiping.py

@@ -11,7 +11,7 @@ from collections import defaultdict
 class testMultiPing( unittest.TestCase ):
 
     def testMultiPing( self ):
-        """Verify that each target is pinged at least once, and 
+        """Verify that each target is pinged at least once, and
            that pings to 'real' targets are successful and unknown targets fail"""
         p = pexpect.spawn( 'python -m mininet.examples.multiping' )
         opts = [ "Host (h\d+) \(([\d.]+)\) will be pinging ips: ([\d\. ]+)",

examples/test/test_nat.py

@@ -14,7 +14,7 @@ class testNAT( unittest.TestCase ):
 
     prompt = 'mininet>'
 
-    @unittest.skipIf( '0 received' in quietRun( 'ping -c 1 %s' % destIP ), 
+    @unittest.skipIf( '0 received' in quietRun( 'ping -c 1 %s' % destIP ),
                       'Destination IP is not reachable' )
     def testNAT( self ):
         "Attempt to ping an IP on the Internet and verify 0% packet loss"

examples/test/test_numberedports.py

@@ -15,8 +15,8 @@ class testNumberedports( unittest.TestCase ):
     def testConsistency( self ):
         """verify consistency between mininet and ovs ports"""
         p = pexpect.spawn( 'python -m mininet.examples.numberedports' )
-        opts = [ 'Validating that s1-eth\d is actually on port \d ... Validated.', 
-                 'Validating that s1-eth\d is actually on port \d ... WARNING', 
+        opts = [ 'Validating that s1-eth\d is actually on port \d ... Validated.',
+                 'Validating that s1-eth\d is actually on port \d ... WARNING',
                  pexpect.EOF ]
         correct_ports = True
         count = 0
@@ -34,7 +34,7 @@ class testNumberedports( unittest.TestCase ):
     def testNumbering( self ):
         """verify that all of the port numbers are printed correctly and consistent with their interface"""
         p = pexpect.spawn( 'python -m mininet.examples.numberedports' )
-        opts = [ 's1-eth(\d+) :  (\d+)', 
+        opts = [ 's1-eth(\d+) :  (\d+)',
                  pexpect.EOF ]
         count_intfs = 0
         while True:

examples/test/test_sshd.py

@@ -14,7 +14,7 @@ class testSSHD( unittest.TestCase ):
 
     def connected( self, ip ):
         "Log into ssh server, check banner, then exit"
-        # Note: this test will fail if "Welcome" is not in the sshd banner 
+        # Note: this test will fail if "Welcome" is not in the sshd banner
         # and '#'' or '$'' are not in the prompt
         p = pexpect.spawn( 'ssh -i /tmp/ssh/test_rsa %s' % ip, timeout=10 )
         while True:
@@ -26,7 +26,7 @@ class testSSHD( unittest.TestCase ):
                 return False
             elif index == 2:
                 p.sendline( 'exit' )
-                p.wait()    
+                p.wait()
                 return True
             else:
                 return False

examples/test/test_vlanhost.py

@@ -47,4 +47,4 @@ class testVLANHost( unittest.TestCase ):
         self.assertEqual( i, 0 ) # check vlan intf is present
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()

examples/vlanhost.py

@@ -30,17 +30,18 @@ from mininet.util import quietRun
 from mininet.log import error
 
 class VLANHost( Host ):
+    "Host connected to VLAN interface"
 
-   def config( self, vlan=100, **params ):
+    def config( self, vlan=100, **params ):
         """Configure VLANHost according to (optional) parameters:
            vlan: VLAN ID for default interface"""
 
-        r = super( Host, self ).config( **params )
+        r = super( VLANHost, self ).config( **params )
 
         intf = self.defaultIntf()
         # remove IP from default, "physical" interface
         self.cmd( 'ifconfig %s inet 0' % intf )
-        # create VLAN interface 
+        # create VLAN interface
         self.cmd( 'vconfig add %s %d' % ( intf, vlan ) )
         # assign the host's IP to the VLAN interface
         self.cmd( 'ifconfig %s.%d inet %s' % ( intf, vlan, params['ip'] ) )
@@ -69,6 +70,8 @@ def exampleAllHosts( vlan ):
     CLI( net )
     net.stop()
 
+# pylint: disable=arguments-differ
+
 class VLANStarTopo( Topo ):
     """Example topology that uses host in multiple VLANs
 
@@ -90,7 +93,7 @@ class VLANStarTopo( Topo ):
             self.addLink( h, s1 )
 
 
-def exampleCustomTags( vlan ):
+def exampleCustomTags():
     """Simple example that exercises VLANStarTopo"""
 
     net = Mininet( topo=VLANStarTopo() )
@@ -110,16 +113,12 @@ if __name__ == '__main__':
     setLogLevel( 'info' )
 
     if not quietRun( 'which vconfig' ):
-        error( "Cannot find command 'vconfig'\nThe packge",
+        error( "Cannot find command 'vconfig'\nThe package",
                "'vlan' is required in Ubuntu or Debian,",
                "or 'vconfig' in Fedora\n" )
         exit()
-    try:
-        vlan = int( sys.argv[ 1 ] )
-    except Exception:
-        vlan = None
 
-    if vlan:
-        exampleAllHosts( vlan )
+    if len( sys.argv ) >= 2:
+        exampleAllHosts( vlan=int( sys.argv[ 1 ] ) )
     else:
-        exampleCustomTags( vlan )
+        exampleCustomTags()

mininet/clean.py

@@ -10,7 +10,8 @@ It may also get rid of 'false positives', but hopefully
 nothing irreplaceable!
 """
 
-from subprocess import Popen, PIPE, check_output as co
+from subprocess import ( Popen, PIPE, check_output as co,
+                         CalledProcessError )
 import time
 
 from mininet.log import info
@@ -28,11 +29,11 @@ def killprocs( pattern ):
     # Make sure they are gone
     while True:
         try:
-            pids = co( 'pgrep -f %s' % pattern )
-        except:
+            pids = co( [ 'pgrep', '-f', pattern ] )
+        except CalledProcessError:
             pids = ''
         if pids:
-            sh( 'pkill -f 9 mininet:' )
+            sh( 'pkill -9 -f %s' % pattern )
             time.sleep( .5 )
         else:
             break
@@ -72,7 +73,7 @@ def cleanup():
     dps = sh("ovs-vsctl --timeout=1 list-br").strip().splitlines()
     if dps:
         sh( "ovs-vsctl " + " -- ".join( "--if-exists del-br " + dp
-                                       for dp in dps if dp ) )
+                                        for dp in dps if dp ) )
     # And in case the above didn't work...
     dps = sh("ovs-vsctl --timeout=1 list-br").strip().splitlines()
     for dp in dps:
@@ -88,9 +89,9 @@ def cleanup():
     info( "*** Killing stale mininet node processes\n" )
     killprocs( 'mininet:' )
 
-    info ( "*** Shutting down stale tunnels\n" )
+    info( "*** Shutting down stale tunnels\n" )
     killprocs( 'Tunnel=Ethernet' )
     killprocs( '.ssh/mn')
     sh( 'rm -f ~/.ssh/mn/*' )
-    
+
     info( "*** Cleanup complete.\n" )

mininet/cli.py

@@ -37,7 +37,7 @@ import atexit
 from mininet.log import info, output, error
 from mininet.term import makeTerms, runX11
 from mininet.util import ( quietRun, dumpNodeConnections,
-                         dumpPorts )
+                           dumpPorts )
 
 class CLI( Cmd ):
     "Simple command-line interface to talk to nodes."
@@ -93,11 +93,6 @@ class CLI( Cmd ):
         self.locals.update( self.mn )
         return self.locals
 
-    # Disable pylint "Unused argument: 'arg's'" messages, as well as
-    # "method could be a function" warning, since each CLI function
-    # must have the same interface
-    # pylint: disable-msg=R0201
-
     helpStr = (
         'You may also send a command to a node using:\n'
         '  <node> command {args}\n'
@@ -128,7 +123,7 @@ class CLI( Cmd ):
         nodes = ' '.join( sorted( self.mn ) )
         output( 'available nodes are: \n%s\n' % nodes )
 
-    def do_ports( self, line ):
+    def do_ports( self, _line ):
         "display ports and interfaces for each switch"
         dumpPorts( self.mn.switches )
 
@@ -139,10 +134,11 @@ class CLI( Cmd ):
     def do_sh( self, line ):
         """Run an external shell command
            Usage: sh [cmd args]"""
+        assert self  # satisfy pylint and allow override
         call( line, shell=True )
 
     # do_py() and do_px() need to catch any exception during eval()/exec()
-    # pylint: disable-msg=W0703
+    # pylint: disable=broad-except
 
     def do_py( self, line ):
         """Evaluate a Python expression.
@@ -159,7 +155,7 @@ class CLI( Cmd ):
             output( str( e ) + '\n' )
 
     # We are in fact using the exec() pseudo-function
-    # pylint: disable-msg=W0122
+    # pylint: disable=exec-used
 
     def do_px( self, line ):
         """Execute a Python statement.
@@ -169,7 +165,7 @@ class CLI( Cmd ):
         except Exception, e:
             output( str( e ) + '\n' )
 
-    # pylint: enable-msg=W0703,W0122
+    # pylint: enable=broad-except,exec-used
 
     def do_pingall( self, line ):
         "Ping between all hosts."
@@ -284,6 +280,7 @@ class CLI( Cmd ):
 
     def do_exit( self, _line ):
         "Exit"
+        assert self  # satisfy pylint and allow override
         return 'exited by user command'
 
     def do_quit( self, line ):
@@ -346,7 +343,7 @@ class CLI( Cmd ):
         elapsed = time.time() - start
         self.stdout.write("*** Elapsed time: %0.6f secs\n" % elapsed)
 
-    def do_links( self, line ):
+    def do_links( self, _line ):
         "Report on links"
         for link in self.mn.links:
             print link, link.status()
@@ -355,11 +352,12 @@ class CLI( Cmd ):
         "Starts or stops a switch"
         args = line.split()
         if len(args) != 2:
-            error( 'invalid number of args: switch <switch name> {start, stop}\n' )
+            error( 'invalid number of args: switch <switch name>'
+                   '{start, stop}\n' )
             return
         sw = args[ 0 ]
         command = args[ 1 ]
-        if sw not in self.mn or self.mn.get( sw ) not in self.mn.switches :
+        if sw not in self.mn or self.mn.get( sw ) not in self.mn.switches:
             error( 'invalid switch: %s\n' % args[ 1 ] )
         else:
             sw = args[ 0 ]
@@ -369,7 +367,8 @@ class CLI( Cmd ):
             elif command == 'stop':
                 self.mn.get( sw ).stop( deleteIntfs=False )
             else:
-                error( 'invalid command: switch <switch name> {start, stop}\n' )
+                error( 'invalid command: '
+                       'switch <switch name> {start, stop}\n' )
 
     def default( self, line ):
         """Called on an input line when the command prefix is not recognized.
@@ -397,8 +396,6 @@ class CLI( Cmd ):
         else:
             error( '*** Unknown command: %s\n' % line )
 
-    # pylint: enable-msg=R0201
-
     def waitForNode( self, node ):
         "Wait for a node to finish, and print its output."
         # Pollers

mininet/link.py

@@ -26,6 +26,7 @@ Link: basic link class for creating veth pairs
 
 from mininet.log import info, error, debug
 from mininet.util import makeIntfPair, quietRun
+import mininet.node
 import re
 
 class Intf( object ):
@@ -33,7 +34,7 @@ class Intf( object ):
     "Basic interface object that can configure itself."
 
     def __init__( self, name, node=None, port=None, link=None,
-                  mac=None, srcNode=None, **params ):
+                  mac=None, **params ):
         """name: interface name (e.g. h1-eth0)
            node: owning node (where this intf most likely lives)
            link: parent link if we're part of a link
@@ -43,7 +44,7 @@ class Intf( object ):
         self.link = link
         self.mac = mac
         self.ip, self.prefixLen = None, None
-        
+
         # if interface is lo, we know the ip is 127.0.0.1.
         # This saves an ifconfig command per node
         if self.name == 'lo':
@@ -71,7 +72,8 @@ class Intf( object ):
             return self.ifconfig( ipstr, 'up' )
         else:
             if prefixLen is None:
-                raise Exception( 'No prefix length set for IP address %s' % ( ipstr, ) )
+                raise Exception( 'No prefix length set for IP address %s'
+                                 % ( ipstr, ) )
             self.ip, self.prefixLen = ipstr, prefixLen
             return self.ifconfig( '%s/%s' % ( ipstr, prefixLen ) )
 
@@ -90,7 +92,8 @@ class Intf( object ):
         "Return updated IP address based on ifconfig"
         # use pexec instead of node.cmd so that we dont read
         # backgrounded output from the cli.
-        ifconfig, _err, _exitCode = self.node.pexec( 'ifconfig %s' % self.name )
+        ifconfig, _err, _exitCode = self.node.pexec(
+            'ifconfig %s' % self.name )
         ips = self._ipMatchRegex.findall( ifconfig )
         self.ip = ips[ 0 ] if ips else None
         return self.ip
@@ -196,7 +199,7 @@ class Intf( object ):
 
     def status( self ):
         "Return intf status as a string"
-        links, err_, result_ = self.node.pexec( 'ip link show' )
+        links, _err, _result = self.node.pexec( 'ip link show' )
         if self.name in links:
             return "OK"
         else:
@@ -332,8 +335,9 @@ class TCIntf( Intf ):
 
         # Delay/jitter/loss/max_queue_size using netem
         delaycmds, parent = self.delayCmds( delay=delay, jitter=jitter,
-                                loss=loss, max_queue_size=max_queue_size,
-                                parent=parent )
+                                            loss=loss,
+                                            max_queue_size=max_queue_size,
+                                            parent=parent )
         cmds += delaycmds
 
         # Ugly but functional: display configuration info
@@ -419,15 +423,19 @@ class Link( object ):
 
     def intfName( self, node, n ):
         "Construct a canonical interface name node-ethN for interface n."
+        # Leave this as an instance method for now
+        assert self
         return node.name + '-eth' + repr( n )
 
     @classmethod
-    def makeIntfPair( _cls, intfname1, intfname2, addr1=None, addr2=None ):
+    def makeIntfPair( cls, intfname1, intfname2, addr1=None, addr2=None ):
         """Create pair of interfaces
            intfname1: name of interface 1
            intfname2: name of interface 2
            (override this method [and possibly delete()]
            to change link type)"""
+        # Leave this as a class method for now
+        assert cls
         return makeIntfPair( intfname1, intfname2, addr1, addr2 )
 
     def delete( self ):
@@ -446,6 +454,38 @@ class Link( object ):
     def __str__( self ):
         return '%s<->%s' % ( self.intf1, self.intf2 )
 
+
+class OVSIntf( Intf ):
+    "Patch interface on an OVSSwitch"
+
+    def ifconfig( self, cmd ):
+        if cmd == 'up':
+            "OVSIntf is always up"
+            return
+        else:
+            raise Exception( 'OVSIntf cannot do ifconfig ' + cmd )
+
+
+class OVSLink( Link ):
+    "Link that makes patch links between OVSSwitches"
+
+    def __init__( self, node1, node2, **kwargs ):
+        "See Link.__init__() for options"
+        self.isPatchLink = False
+        if ( type( node1 ) is mininet.node.OVSSwitch and
+             type( node2 ) is mininet.node.OVSSwitch ):
+             self.isPatchLink = True
+             kwargs.update( cls1=OVSIntf, cls2=OVSIntf )
+        Link.__init__( self, node1, node2, **kwargs )
+
+    def makeIntfPair( self, *args, **kwargs ):
+        "Usually delegated to OVSSwitch"
+        if self.isPatchLink:
+            return None, None
+        else:
+            return Link.makeIntfPair( *args, **kwargs )
+
+
 class TCLink( Link ):
     "Link with symmetric TC interfaces configured via opts"
     def __init__( self, node1, node2, port1=None, port2=None,

mininet/log.py

@@ -124,8 +124,8 @@ class MininetLogger( Logger, object ):
         self.setLevel( level )
         self.handlers[ 0 ].setLevel( level )
 
-    # pylint: disable-msg=E0202
-    # "An attribute inherited from mininet.log hide this method"
+    # pylint: disable=method-hidden
+    # "An attribute inherited from mininet.log hide this method" (sic)
     # Not sure why this is occurring - this function definitely gets called.
 
     # See /usr/lib/python2.5/logging/__init__.py; modified from warning()
@@ -142,7 +142,7 @@ class MininetLogger( Logger, object ):
         if self.isEnabledFor( OUTPUT ):
             self._log( OUTPUT, msg, args, kwargs )
 
-    # pylint: enable-msg=E0202
+    # pylint: enable=method-hidden
 
 lg = MininetLogger()
 

mininet/net.py

@@ -98,7 +98,8 @@ from math import ceil
 
 from mininet.cli import CLI
 from mininet.log import info, error, debug, output, warn
-from mininet.node import Host, OVSKernelSwitch, DefaultController, Controller
+from mininet.node import ( Node, Host, OVSKernelSwitch, DefaultController,
+                           Controller )
 from mininet.nodelib import NAT
 from mininet.link import Link, Intf
 from mininet.util import quietRun, fixLimits, numCores, ensureRoot
@@ -106,7 +107,7 @@ from mininet.util import macColonHex, ipStr, ipParse, netParse, ipAdd
 from mininet.term import cleanUpScreens, makeTerms
 
 # Mininet version: should be consistent with README and LICENSE
-VERSION = "2.2.0b1"
+VERSION = "2.2.0"
 
 class Mininet( object ):
     "Network emulation with hosts spawned in network namespaces."
@@ -169,7 +170,6 @@ class Mininet( object ):
         if topo and build:
             self.build()
 
-
     def waitConnected( self, timeout=None, delay=.5 ):
         """wait for each switch to connect to a controller,
            up to 5 seconds
@@ -253,25 +253,35 @@ class Mininet( object ):
         if isinstance( name, Controller ):
             controller_new = name
             # Pylint thinks controller is a str()
-            # pylint: disable=E1103
+            # pylint: disable=maybe-no-member
             name = controller_new.name
-            # pylint: enable=E1103
+            # pylint: enable=maybe-no-member
         else:
             controller_new = controller( name, **params )
         # Add new controller to net
-        if controller_new: # allow controller-less setups
+        if controller_new:  # allow controller-less setups
             self.controllers.append( controller_new )
             self.nameToNode[ name ] = controller_new
         return controller_new
 
-    def addNAT( self, name='nat0', connect=True, inNamespace=False, **params ):
+    def addNAT( self, name='nat0', connect=True, inNamespace=False,
+                **params):
+        """Add a NAT to the Mininet network
+           name: name of NAT node
+           connect: switch to connect to | True (s1) | None
+           inNamespace: create in a network namespace
+           params: other NAT node params, notably:
+               ip: used as default gateway address"""
         nat = self.addHost( name, cls=NAT, inNamespace=inNamespace,
                             subnet=self.ipBase, **params )
         # find first switch and create link
         if connect:
-            # connect the nat to the first switch
+            if not isinstance( connect, Node ):
+                # Use first switch if not specified
+                connect = self.switches[ 0 ]
+            # Connect the nat to the switch
             self.addLink( nat, self.switches[ 0 ] )
-            # set the default route on hosts
+            # Set the default route on hosts
             natIP = nat.params[ 'ip' ].split('/')[ 0 ]
             for host in self.hosts:
                 if host.inNamespace:
@@ -324,7 +334,7 @@ class Mininet( object ):
     @staticmethod
     def randMac():
         "Return a random, non-multicast MAC address"
-        return macColonHex( random.randint(1, 2**48 - 1) & 0xfeffffffffff  |
+        return macColonHex( random.randint(1, 2**48 - 1) & 0xfeffffffffff |
                             0x020000000000 )
 
     def addLink( self, node1, node2, port1=None, port2=None,
@@ -486,7 +496,8 @@ class Mininet( object ):
             info( '*** Stopping %i terms\n' % len( self.terms ) )
             self.stopXterms()
         info( '*** Stopping %i switches\n' % len( self.switches ) )
-        for swclass, switches in groupby( sorted( self.switches, key=type ), type ):
+        for swclass, switches in groupby(
+                sorted( self.switches, key=type ), type ):
             if hasattr( swclass, 'batchShutdown' ):
                 swclass.batchShutdown( switches )
         for switch in self.switches:
@@ -521,13 +532,13 @@ class Mininet( object ):
         if hosts is None:
             hosts = self.hosts
         poller = select.poll()
-        Node = hosts[ 0 ]  # so we can call class method fdToNode
+        h1 = hosts[ 0 ]  # so we can call class method fdToNode
         for host in hosts:
             poller.register( host.stdout )
         while True:
             ready = poller.poll( timeoutms )
             for fd, event in ready:
-                host = Node.fdToNode( fd )
+                host = h1.fdToNode( fd )
                 if event & select.POLLIN:
                     line = host.readline()
                     if line is not None:
@@ -574,7 +585,8 @@ class Mininet( object ):
                     if timeout:
                         opts = '-W %s' % timeout
                     if dest.intfs:
-                        result = node.cmd( 'ping -c1 %s %s' % (opts, dest.IP()) )
+                        result = node.cmd( 'ping -c1 %s %s' %
+                                           (opts, dest.IP()) )
                         sent, received = self._parsePing( result )
                     else:
                         sent, received = 0, 0
@@ -699,13 +711,13 @@ class Mininet( object ):
 
     # XXX This should be cleaned up
 
-    def iperf( self, hosts=None, l4Type='TCP', udpBw='10M', format=None,
+    def iperf( self, hosts=None, l4Type='TCP', udpBw='10M', fmt=None,
                seconds=5):
         """Run iperf between two hosts.
-           hosts: list of hosts; if None, uses opposite hosts
+           hosts: list of hosts; if None, uses first and last hosts
            l4Type: string, one of [ TCP, UDP ]
            udpBw: bandwidth target for UDP test
-           format: iperf format argument if any
+           fmt: iperf format argument if any
            seconds: iperf time to transmit
            returns: two-element array of [ server, client ] speeds
            note: send() is buffered, so client rate can be much higher than
@@ -714,10 +726,8 @@ class Mininet( object ):
         if not quietRun( 'which telnet' ):
             error( 'Cannot find telnet in $PATH - required for iperf test' )
             return
-        if not hosts:
-            hosts = [ self.hosts[ 0 ], self.hosts[ -1 ] ]
-        else:
-            assert len( hosts ) == 2
+        hosts = hosts or [ self.hosts[ 0 ], self.hosts[ -1 ] ]
+        assert len( hosts ) == 2
         client, server = hosts
         output( '*** Iperf: testing ' + l4Type + ' bandwidth between ' )
         output( "%s and %s\n" % ( client.name, server.name ) )
@@ -729,8 +739,8 @@ class Mininet( object ):
             bwArgs = '-b ' + udpBw + ' '
         elif l4Type != 'TCP':
             raise Exception( 'Unexpected l4 type: %s' % l4Type )
-        if format:
-          iperfArgs += '-f %s ' %format
+        if fmt:
+            iperfArgs += '-f %s ' % fmt
         server.sendCmd( iperfArgs + '-s', printPid=True )
         servout = ''
         while server.lastPid is None:
@@ -755,7 +765,7 @@ class Mininet( object ):
     def runCpuLimitTest( self, cpu, duration=5 ):
         """run CPU limit test with 'while true' processes.
         cpu: desired CPU fraction of each host
-        duration: test duration in seconds
+        duration: test duration in seconds (integer)
         returns a single list of measured CPU fractions as floats.
         """
         cores = int( quietRun( 'nproc' ) )
@@ -776,12 +786,14 @@ class Mininet( object ):
         # get the initial cpu time for each host
         for host in hosts:
             outputs[ host ] = []
-            with open( '/sys/fs/cgroup/cpuacct/%s/cpuacct.usage' % host, 'r' ) as f:
+            with open( '/sys/fs/cgroup/cpuacct/%s/cpuacct.usage' %
+                       host, 'r' ) as f:
                 time[ host ] = float( f.read() )
-        for _ in range( 5 ):
+        for _ in range( duration ):
             sleep( 1 )
             for host in hosts:
-                with open( '/sys/fs/cgroup/cpuacct/%s/cpuacct.usage' % host, 'r' ) as f:
+                with open( '/sys/fs/cgroup/cpuacct/%s/cpuacct.usage' %
+                           host, 'r' ) as f:
                     readTime = float( f.read() )
                 outputs[ host ].append( ( ( readTime - time[ host ] )
                                         / 1000000000 ) / cores * 100 )

mininet/node.py

@@ -52,14 +52,13 @@ import re
 import signal
 import select
 from subprocess import Popen, PIPE
-from operator import or_
 from time import sleep
 
 from mininet.log import info, error, warn, debug
 from mininet.util import ( quietRun, errRun, errFail, moveIntf, isShellBuiltin,
                            numCores, retry, mountCgroups )
 from mininet.moduledeps import moduleDeps, pathCheck, OVS_KMOD, OF_KMOD, TUN
-from mininet.link import Link, Intf, TCIntf
+from mininet.link import Link, Intf, TCIntf, OVSIntf
 from re import findall
 from distutils.version import StrictVersion
 
@@ -129,7 +128,7 @@ class Node( object ):
         # bash -m: enable job control, i: force interactive
         # -s: pass $* to shell, and make process easy to find in ps
         # prompt is set to sentinel chr( 127 )
-        cmd = [ 'mnexec', opts, 'env',  'PS1=' + chr( 127 ),
+        cmd = [ 'mnexec', opts, 'env', 'PS1=' + chr( 127 ),
                 'bash', '--norc', '-mis', 'mininet:' + self.name ]
         # Spawn a shell subprocess in a pseudo-tty, to disable buffering
         # in the subprocess and insulate it from signals (e.g. SIGINT)
@@ -189,6 +188,8 @@ class Node( object ):
         """Internal method: spawn and return a process
             cmd: command to run (list)
             params: parameters to Popen()"""
+        # Leave this is as an instance method for now
+        assert self
         return Popen( cmd, **params )
 
     def cleanup( self ):
@@ -240,8 +241,11 @@ class Node( object ):
                 os.killpg( self.shell.pid, signal.SIGHUP )
         self.cleanup()
 
-    def stop( self ):
-        "Stop node."
+    def stop( self, deleteIntfs=False ):
+        """Stop node.
+           deleteIntfs: delete interfaces? (False)"""
+        if deleteIntfs:
+            self.deleteIntfs()
         self.terminate()
 
     def waitReadable( self, timeoutms=None ):
@@ -324,7 +328,7 @@ class Node( object ):
         log = info if verbose else debug
         output = ''
         while self.waiting:
-            data = self.monitor()
+            data = self.monitor( findPid=findPid )
             output += data
             log( data )
         return output
@@ -375,7 +379,7 @@ class Node( object ):
         """Execute a command using popen
            returns: out, err, exitcode"""
         popen = self.popen( *args, stdin=PIPE, stdout=PIPE, stderr=PIPE,
-                           **kwargs )
+                            **kwargs )
         # Warning: this can fail with large numbers of fds!
         out, err = popen.communicate()
         exitcode = popen.wait()
@@ -421,7 +425,7 @@ class Node( object ):
             warn( '*** defaultIntf: warning:', self.name,
                   'has no interfaces\n' )
 
-    def intf( self, intf='' ):
+    def intf( self, intf=None ):
         """Return our interface object with given string name,
            default intf if name is falsy (None, empty string, etc).
            or the input intf arg.
@@ -488,8 +492,8 @@ class Node( object ):
             params = intf
         else:
             params = 'dev %s' % intf
-        self.cmd( 'ip route del default' )
-        return self.cmd( 'ip route add default', params )
+        # Do this in one line in case we're messing with the root namespace
+        self.cmd( 'ip route del default; ip route add default', params )
 
     # Convenience and configuration methods
 
@@ -682,8 +686,8 @@ class CPULimitedHost( Host ):
             if int( self.cgroupGet( 'rt_runtime_us', 'cpu' ) ) <= 0:
                 mncmd += [ '-r', str( self.rtprio ) ]
             else:
-                debug( '*** error: not enough cpu time available for %s.' % self.name,
-                      'Using cfs scheduler for subprocess\n' )
+                debug( '*** error: not enough cpu time available for %s.' %
+                       self.name, 'Using cfs scheduler for subprocess\n' )
         return Host.popen( self, *args, mncmd=mncmd, **kwargs )
 
     def cleanup( self ):
@@ -692,15 +696,17 @@ class CPULimitedHost( Host ):
         retry( retries=3, delaySecs=1, fn=self.cgroupDel )
 
     _rtGroupSched = False   # internal class var: Is CONFIG_RT_GROUP_SCHED set?
-    
+
     @classmethod
     def checkRtGroupSched( cls ):
         "Check (Ubuntu,Debian) kernel config for CONFIG_RT_GROUP_SCHED for RT"
         if not cls._rtGroupSched:
             release = quietRun( 'uname -r' ).strip('\r\n')
-            output = quietRun( 'grep CONFIG_RT_GROUP_SCHED /boot/config-%s' % release )
+            output = quietRun( 'grep CONFIG_RT_GROUP_SCHED /boot/config-%s' %
+                               release )
             if output == '# CONFIG_RT_GROUP_SCHED is not set\n':
-                error( '\n*** error: please enable RT_GROUP_SCHED in your kernel\n' )
+                error( '\n*** error: please enable RT_GROUP_SCHED '
+                       'in your kernel\n' )
                 exit( 1 )
             cls._rtGroupSched = True
 
@@ -749,14 +755,14 @@ class CPULimitedHost( Host ):
         """Set overall CPU fraction for this host
            f: CPU bandwidth limit (positive fraction, or -1 for cfs unlimited)
            sched: 'rt' or 'cfs'
-           Note 'cfs' requires CONFIG_CFS_BANDWIDTH, 
+           Note 'cfs' requires CONFIG_CFS_BANDWIDTH,
            and 'rt' requires CONFIG_RT_GROUP_SCHED"""
         if not sched:
             sched = self.sched
         if sched == 'rt':
             if not f or f < 0:
-                raise Exception( 'Please set a positive CPU fraction for sched=rt\n' )
-                return
+                raise Exception( 'Please set a positive CPU fraction'
+                                 ' for sched=rt\n' )
             pstr, qstr, period, quota = self.rtInfo( f )
         elif sched == 'cfs':
             pstr, qstr, period, quota = self.cfsInfo( f )
@@ -881,7 +887,11 @@ class Switch( Node ):
 
     def connected( self ):
         "Is the switch connected to a controller? (override this method)"
-        return False and self  # satisfy pylint
+        # Assume that we are connected by default to whatever we need to
+        # be connected to. This should be overridden by any OpenFlow
+        # switch, but not by a standalone bridge.
+        debug( 'Assuming', repr( self ), 'is connected to a controller\n' )
+        return True
 
     def __repr__( self ):
         "More informative string representation"
@@ -890,6 +900,7 @@ class Switch( Node ):
         return '<%s %s: %s pid=%s> ' % (
             self.__class__.__name__, self.name, intfs, self.pid )
 
+
 class UserSwitch( Switch ):
     "User-space switch."
 
@@ -938,12 +949,12 @@ class UserSwitch( Switch ):
            we re-create the user switch's configuration, but as a
            leaf of the TCIntf-created configuration."""
         if isinstance( intf, TCIntf ):
-            ifspeed = 10000000000 # 10 Gbps
+            ifspeed = 10000000000  # 10 Gbps
             minspeed = ifspeed * 0.001
 
             res = intf.config( **intf.params )
 
-            if res is None: # link may not have TC parameters
+            if res is None:  # link may not have TC parameters
                 return
 
             # Re-add qdisc, root, and default classes user switch created, but
@@ -976,18 +987,17 @@ class UserSwitch( Switch ):
                   ' 1> ' + ofplog + ' 2>' + ofplog + ' &' )
         if "no-slicing" not in self.dpopts:
             # Only TCReapply if slicing is enable
-            sleep(1) # Allow ofdatapath to start before re-arranging qdisc's
+            sleep(1)  # Allow ofdatapath to start before re-arranging qdisc's
             for intf in self.intfList():
                 if not intf.IP():
                     self.TCReapply( intf )
 
     def stop( self, deleteIntfs=True ):
-        "Stop OpenFlow reference user datapath."
+        """Stop OpenFlow reference user datapath.
+           deleteIntfs: delete interfaces? (True)"""
         self.cmd( 'kill %ofdatapath' )
         self.cmd( 'kill %ofprotocol' )
-        if deleteIntfs:
-            self.deleteIntfs()
-
+        super( UserSwitch, self ).stop( deleteIntfs )
 
 class OVSLegacyKernelSwitch( Switch ):
     """Open VSwitch legacy kernel-space switch using ovs-openflowd.
@@ -1033,18 +1043,18 @@ class OVSLegacyKernelSwitch( Switch ):
         self.execed = False
 
     def stop( self, deleteIntfs=True ):
-        "Terminate kernel datapath."
+        """Terminate kernel datapath."
+           deleteIntfs: delete interfaces? (True)"""
         quietRun( 'ovs-dpctl del-dp ' + self.dp )
         self.cmd( 'kill %ovs-openflowd' )
-        if deleteIntfs:
-            self.deleteIntfs()
+        super( OVSLegacyKernelSwitch, self ).stop( deleteIntfs )
 
 
 class OVSSwitch( Switch ):
     "Open vSwitch switch. Depends on ovs-vsctl."
 
     def __init__( self, name, failMode='secure', datapath='kernel',
-                 inband=False, protocols=None, **params ):
+                  inband=False, protocols=None, **params ):
         """Init.
            name: name for switch
            failMode: controller loss behavior (secure|open)
@@ -1055,6 +1065,7 @@ class OVSSwitch( Switch ):
         self.datapath = datapath
         self.inband = inband
         self.protocols = protocols
+        self._uuids = []  # controller UUIDs
 
     @classmethod
     def setup( cls ):
@@ -1075,13 +1086,14 @@ class OVSSwitch( Switch ):
                    'You may wish to try '
                    '"service openvswitch-switch start".\n' )
             exit( 1 )
-        info = quietRun( 'ovs-vsctl --version' )
-        cls.OVSVersion =  findall( '\d+\.\d+', info )[ 0 ]
+        version = quietRun( 'ovs-vsctl --version' )
+        cls.OVSVersion = findall( r'\d+\.\d+', version )[ 0 ]
 
     @classmethod
     def isOldOVS( cls ):
+        "Is OVS ersion < 1.10?"
         return ( StrictVersion( cls.OVSVersion ) <
-             StrictVersion( '1.10' ) )
+                 StrictVersion( '1.10' ) )
 
     @classmethod
     def batchShutdown( cls, switches ):
@@ -1112,22 +1124,38 @@ class OVSSwitch( Switch ):
         "Disconnect a data port"
         self.cmd( 'ovs-vsctl del-port', self, intf )
 
-    def controllerUUIDs( self ):
-        "Return ovsdb UUIDs for our controllers"
-        uuids = []
-        controllers = self.cmd( 'ovs-vsctl -- get Bridge', self,
-                               'Controller' ).strip()
-        if controllers.startswith( '[' ) and controllers.endswith( ']' ):
-            controllers = controllers[ 1 : -1 ]
-            uuids = [ c.strip() for c in controllers.split( ',' ) ]
-        return uuids
+    def controllerUUIDs( self, update=False ):
+        """Return ovsdb UUIDs for our controllers
+           update: update cached value"""
+        if not self._uuids or update:
+            controllers = self.cmd( 'ovs-vsctl -- get Bridge', self,
+                                    'Controller' ).strip()
+            if controllers.startswith( '[' ) and controllers.endswith( ']' ):
+                controllers = controllers[ 1 : -1 ]
+                if controllers:
+                    self._uuids = [ c.strip()
+                                    for c in controllers.split( ',' ) ]
+        return self._uuids
 
     def connected( self ):
         "Are we connected to at least one of our controllers?"
-        results = [ 'true' in self.cmd( 'ovs-vsctl -- get Controller',
-                                         uuid, 'is_connected' )
-                    for uuid in self.controllerUUIDs() ]
-        return reduce( or_, results, False )
+        for uuid in self.controllerUUIDs():
+            if 'true' in self.cmd( 'ovs-vsctl -- get Controller',
+                                            uuid, 'is_connected' ):
+                return True
+        return self.failMode == 'standalone'
+
+    @staticmethod
+    def patchOpts( intf ):
+        "Return OVS patch port options (if any) for intf"
+        if not isinstance( intf, OVSIntf ):
+            # Ignore if it's not a patch link
+            return ''
+        intf1, intf2 = intf.link.intf1, intf.link.intf2
+        peer = intf1 if intf1 != intf else intf2
+        return ( '-- set Interface %s type=patch '
+                 '-- set Interface %s options:peer=%s ' %
+                 ( intf, intf, peer ) )
 
     def start( self, controllers ):
         "Start up a new OVS OpenFlow switch using ovs-vsctl"
@@ -1136,15 +1164,16 @@ class OVSSwitch( Switch ):
                 'OVS kernel switch does not work in a namespace' )
         # Annoyingly, --if-exists option seems not to work
         self.cmd( 'ovs-vsctl del-br', self )
-        int( self.dpid, 16 ) # DPID must be a hex string
+        int( self.dpid, 16 )  # DPID must be a hex string
         # Interfaces and controllers
         intfs = ' '.join( '-- add-port %s %s ' % ( self, intf ) +
                           '-- set Interface %s ' % intf +
                           'ofport_request=%s ' % self.ports[ intf ]
-                         for intf in self.intfList()
-                         if self.ports[ intf ] and not intf.IP() )
+                          + self.patchOpts( intf )
+                          for intf in self.intfList()
+                          if self.ports[ intf ] and not intf.IP() )
         clist = ' '.join( '%s:%s:%d' % ( c.protocol, c.IP(), c.port )
-                         for c in controllers )
+                          for c in controllers )
         if self.listenPort:
             clist += ' ptcp:%s' % self.listenPort
         # Construct big ovs-vsctl command for new versions of OVS
@@ -1172,26 +1201,24 @@ class OVSSwitch( Switch ):
             cmd += '-- set bridge %s datapath_type=netdev ' % self
         if self.protocols:
             cmd += '-- set bridge %s protocols=%s' % ( self, self.protocols )
-        # Reconnect quickly to controllers (1s vs. 15s max_backoff)
-        for uuid in self.controllerUUIDs():
-            if uuid.count( '-' ) != 4:
-                # Doesn't look like a UUID
-                continue
-            uuid = uuid.strip()
-            cmd += '-- set Controller %smax_backoff=1000 ' % uuid
         # Do it!!
         self.cmd( cmd )
+        # Reconnect quickly to controllers (1s vs. 15s max_backoff)
+        uuids = [ '-- set Controller %s max_backoff=1000' % uuid
+                  for uuid in self.controllerUUIDs() ]
+        if uuids:
+            self.cmd( 'ovs-vsctl', *uuids )
+        # If necessary, restore TC config overwritten by OVS
         for intf in self.intfList():
             self.TCReapply( intf )
 
-
     def stop( self, deleteIntfs=True ):
-        "Terminate OVS switch."
+        """Terminate OVS switch.
+           deleteIntfs: delete interfaces? (True)"""
         self.cmd( 'ovs-vsctl del-br', self )
         if self.datapath == 'user':
             self.cmd( 'ip link del', self )
-        if deleteIntfs:
-            self.deleteIntfs()
+        super( OVSSwitch, self ).stop( deleteIntfs )
 
 
 OVSKernelSwitch = OVSSwitch
@@ -1199,17 +1226,17 @@ OVSKernelSwitch = OVSSwitch
 
 class OVSBridge( OVSSwitch ):
     "OVSBridge is an OVSSwitch in standalone/bridge mode"
-    
+
     def __init__( self, args, **kwargs ):
         kwargs.update( failMode='standalone' )
         OVSSwitch.__init__( self, args, **kwargs )
-    
+
     def start( self, controllers ):
         OVSSwitch.start( self, controllers=[] )
 
 
 class IVSSwitch( Switch ):
-    """IVS virtual switch"""
+    "Indigo Virtual Switch"
 
     def __init__( self, name, verbose=False, **kwargs ):
         Switch.__init__( self, name, **kwargs )
@@ -1255,11 +1282,11 @@ class IVSSwitch( Switch ):
         self.cmd( ' '.join(args) + ' >' + logfile + ' 2>&1 </dev/null &' )
 
     def stop( self, deleteIntfs=True ):
-        "Terminate IVS switch."
+        """Terminate IVS switch.
+           deleteIntfs: delete interfaces? (True)"""
         self.cmd( 'kill %ivs' )
         self.cmd( 'wait' )
-        if deleteIntfs:
-            self.deleteIntfs()
+        super( IVSSwitch, self ).stop( deleteIntfs )
 
     def attach( self, intf ):
         "Connect a data port"
@@ -1323,11 +1350,11 @@ class Controller( Node ):
                   ' 1>' + cout + ' 2>' + cout + ' &' )
         self.execed = False
 
-    def stop( self ):
+    def stop( self, *args, **kwargs ):
         "Stop controller."
         self.cmd( 'kill %' + self.command )
         self.cmd( 'wait %' + self.command )
-        self.terminate()
+        super( Controller, self ).stop( *args, **kwargs )
 
     def IP( self, intf=None ):
         "Return IP address of the Controller"
@@ -1342,19 +1369,24 @@ class Controller( Node ):
         return '<%s %s: %s:%s pid=%s> ' % (
             self.__class__.__name__, self.name,
             self.IP(), self.port, self.pid )
+
     @classmethod
-    def isAvailable( self ):
+    def isAvailable( cls ):
+        "Is controller available?"
         return quietRun( 'which controller' )
 
+
 class OVSController( Controller ):
     "Open vSwitch controller"
     def __init__( self, name, command='ovs-controller', **kwargs ):
         if quietRun( 'which test-controller' ):
             command = 'test-controller'
         Controller.__init__( self, name, command=command, **kwargs )
+
     @classmethod
-    def isAvailable( self ):
-        return quietRun( 'which ovs-controller' ) or quietRun( 'which test-controller' )
+    def isAvailable( cls ):
+        return ( quietRun( 'which ovs-controller' ) or
+                 quietRun( 'which test-controller' ) )
 
 class NOX( Controller ):
     "Controller to run a NOX application."
@@ -1397,11 +1429,11 @@ class RYU( Controller ):
             ryuArgs = [ ryuArgs ]
 
         Controller.__init__( self, name,
-                         command='ryu-manager',
-                         cargs='--ofp-tcp-listen-port %s ' +
-                         ' '.join( ryuArgs ),
-                         cdir=ryuCoreDir,
-                         **kwargs )
+                             command='ryu-manager',
+                             cargs='--ofp-tcp-listen-port %s ' +
+                             ' '.join( ryuArgs ),
+                             cdir=ryuCoreDir,
+                             **kwargs )
 
 class RemoteController( Controller ):
     "Controller running outside of Mininet's control."
@@ -1432,7 +1464,7 @@ class RemoteController( Controller ):
                   " at %s:%d\n" % ( self.ip, self.port ) )
 
 
-DefaultControllers = [ Controller, OVSController ]
+DefaultControllers = ( Controller, OVSController )
 
 def findController( controllers=DefaultControllers ):
     "Return first available controller from list, if any"
@@ -1446,4 +1478,3 @@ def DefaultController( name, controllers=DefaultControllers, **kwargs ):
     if not controller:
         raise Exception( 'Could not find a default OpenFlow controller' )
     return controller( name, **kwargs )
-

mininet/nodelib.py

@@ -32,8 +32,8 @@ class LinuxBridge( Switch ):
             return 'forwarding' in self.cmd( 'brctl showstp', self )
         else:
             return True
-    
-    def start( self, controllers ):
+
+    def start( self, _controllers ):
         "Start Linux bridge"
         self.cmd( 'ifconfig', self, 'down' )
         self.cmd( 'brctl delbr', self )
@@ -46,10 +46,12 @@ class LinuxBridge( Switch ):
                 self.cmd( 'brctl addif', self, i )
         self.cmd( 'ifconfig', self, 'up' )
 
-    def stop( self ):
-        "Stop Linux bridge"
+    def stop( self, deleteIntfs=True ):
+        """Stop Linux bridge
+           deleteIntfs: delete interfaces? (True)"""
         self.cmd( 'ifconfig', self, 'down' )
         self.cmd( 'brctl delbr', self )
+        super( LinuxBridge, self ).stop( deleteIntfs )
 
     def dpctl( self, *args ):
         "Run brctl command"
@@ -62,24 +64,25 @@ class LinuxBridge( Switch ):
 
 
 class NAT( Node ):
-    """NAT: Provides connectivity to external network"""
+    "NAT: Provides connectivity to external network"
 
-    def __init__( self, name, inetIntf=None, subnet='10.0/8', localIntf=None, **params):
+    def __init__( self, name, inetIntf=None, subnet='10.0/8',
+                  localIntf=None, **params):
+        """Start NAT/forwarding between Mininet and external network
+           inetIntf: interface for internet access
+           subnet: Mininet subnet (default 10.0/8)="""
         super( NAT, self ).__init__( name, **params )
 
-        """Start NAT/forwarding between Mininet and external network
-        inetIntf: interface for internet access
-        subnet: Mininet subnet (default 10.0/8)="""
         self.inetIntf = inetIntf if inetIntf else self.getGatewayIntf()
         self.subnet = subnet
         self.localIntf = localIntf
 
     def config( self, **params ):
-        super( NAT, self).config( **params )
         """Configure the NAT and iptables"""
+        super( NAT, self).config( **params )
 
         if not self.localIntf:
-            self.localIntf =  self.defaultIntf()
+            self.localIntf = self.defaultIntf()
 
         self.cmd( 'sysctl net.ipv4.ip_forward=0' )
 
@@ -94,10 +97,14 @@ class NAT( Node ):
         self.cmd( 'iptables -P FORWARD DROP' )
 
         # Configure NAT
-        self.cmd( 'iptables -I FORWARD -i', self.localIntf, '-d', self.subnet, '-j DROP' )
-        self.cmd( 'iptables -A FORWARD -i', self.localIntf, '-s', self.subnet, '-j ACCEPT' )
-        self.cmd( 'iptables -A FORWARD -i', self.inetIntf, '-d', self.subnet, '-j ACCEPT' )
-        self.cmd( 'iptables -t nat -A POSTROUTING -o ', self.inetIntf, '-s', self.subnet, '-j MASQUERADE' )
+        self.cmd( 'iptables -I FORWARD',
+                  '-i', self.localIntf, '-d', self.subnet, '-j DROP' )
+        self.cmd( 'iptables -A FORWARD',
+                  '-i', self.localIntf, '-s', self.subnet, '-j ACCEPT' )
+        self.cmd( 'iptables -A FORWARD',
+                  '-i', self.inetIntf, '-d', self.subnet, '-j ACCEPT' )
+        self.cmd( 'iptables -t nat -A POSTROUTING',
+                  '-o', self.inetIntf, '-s', self.subnet, '-j MASQUERADE' )
 
         # Instruct the kernel to perform forwarding
         self.cmd( 'sysctl net.ipv4.ip_forward=1' )
@@ -116,14 +123,17 @@ class NAT( Node ):
         # hopefully this won't disconnect you
         self.cmd( 'service network-manager restart' )
 
-    def getGatewayIntf( self ):
+    def getGatewayIntf( self, fallback='eth0' ):
+        """Return gateway interface name
+           fallback: default device to fall back to"""
         routes = self.cmd( 'ip route show' )
-        match = re.search('default via \S+ dev (\S+)', routes )
+        match = re.search( r'default via \S+ dev (\S+)', routes )
         if match:
             return match.group( 1 )
         else:
-            warn( 'There is no default route set. Using eth0 as gateway interface...\n' )
-            return 'eth0'
+            warn( 'There is no default route set.',
+                  'Using', fallback, 'as gateway interface...\n' )
+            return fallback
 
     def terminate( self ):
         """Stop NAT/forwarding between Mininet and external network"""
@@ -136,4 +146,3 @@ class NAT( Node ):
         self.cmd( 'sysctl net.ipv4.ip_forward=0' )
 
         super( NAT, self ).terminate()
-

mininet/term.py

@@ -32,7 +32,7 @@ def tunnelX11( node, display=None):
         port = 6000 + int( float( screen ) )
         connection = r'TCP\:%s\:%s' % ( host, port )
         cmd = [ "socat", "TCP-LISTEN:%d,fork,reuseaddr" % port,
-               "EXEC:'mnexec -a 1 socat STDIO %s'" % connection ]
+                "EXEC:'mnexec -a 1 socat STDIO %s'" % connection ]
     return 'localhost:' + screen, node.popen( cmd )
 
 def makeTerm( node, title='Node', term='xterm', display=None ):

mininet/test/runner.py

@@ -6,7 +6,7 @@ Run all mininet core tests
  -quick : skip tests that take more than ~30 seconds
 """
 
-import unittest
+from unittest import defaultTestLoader, TextTestRunner
 import os
 import sys
 from mininet.util import ensureRoot
@@ -19,13 +19,13 @@ def runTests( testDir, verbosity=1 ):
     ensureRoot()
     cleanup()
     # discover all tests in testDir
-    testSuite = unittest.defaultTestLoader.discover( testDir )
+    testSuite = defaultTestLoader.discover( testDir )
     # run tests
-    unittest.TextTestRunner( verbosity=verbosity ).run( testSuite )
+    TextTestRunner( verbosity=verbosity ).run( testSuite )
 
 if __name__ == '__main__':
     setLogLevel( 'warning' )
     # get the directory containing example tests
-    testDir = os.path.dirname( os.path.realpath( __file__ ) )
-    verbosity = 2 if '-v' in sys.argv else 1
-    runTests( testDir, verbosity )
+    thisdir = os.path.dirname( os.path.realpath( __file__ ) )
+    vlevel = 2 if '-v' in sys.argv else 1
+    runTests( testDir=thisdir, verbosity=vlevel )

mininet/test/test_hifi.py

@@ -4,6 +4,7 @@
    Test creation and pings for topologies with link and/or CPU options."""
 
 import unittest
+import sys
 from functools import partial
 
 from mininet.net import Mininet
@@ -13,6 +14,7 @@ from mininet.link import TCLink
 from mininet.topo import Topo
 from mininet.log import setLogLevel
 from mininet.util import quietRun
+from mininet.clean import cleanup
 
 # Number of hosts for each test
 N = 2
@@ -38,7 +40,13 @@ class testOptionsTopoCommon( object ):
     """Verify ability to create networks with host and link options
        (common code)."""
 
-    switchClass = None # overridden in subclasses
+    switchClass = None  # overridden in subclasses
+
+    @staticmethod
+    def tearDown():
+        "Clean up if necessary"
+        if sys.exc_info != ( None, None, None ):
+            cleanup()
 
     def runOptionsTopoTest( self, n, msg, hopts=None, lopts=None ):
         "Generic topology-with-options test runner."
@@ -79,7 +87,7 @@ class testOptionsTopoCommon( object ):
                      upperBound, lowerBound ) )
         msg += info
 
-        self.assertGreaterEqual( float( measured ),lowerBound, msg=msg )
+        self.assertGreaterEqual( float( measured ), lowerBound, msg=msg )
         self.assertLessEqual( float( measured ), upperBound, msg=msg )
 
     def testCPULimits( self ):
@@ -96,7 +104,8 @@ class testOptionsTopoCommon( object ):
         results = mn.runCpuLimitTest( cpu=CPU_FRACTION )
         mn.stop()
         hostUsage = '\n'.join( 'h%s: %s' %
-                               ( n + 1, results[ ( n - 1 ) * 5: ( n * 5 ) - 1 ] )
+                               ( n + 1,
+                                 results[ (n - 1) * 5 : (n * 5) - 1 ] )
                                for n in range( N ) )
         hoptsStr = ', '.join( '%s: %s' % ( opt, value )
                               for opt, value in hopts.items() )
@@ -106,7 +115,8 @@ class testOptionsTopoCommon( object ):
                 'hopts = %s\n'
                 'host = CPULimitedHost\n'
                 'Switch = %s\n'
-                % ( CPU_FRACTION * 100, hostUsage, N, hoptsStr, self.switchClass ) )
+                % ( CPU_FRACTION * 100, hostUsage, N, hoptsStr,
+                    self.switchClass ) )
         for pct in results:
             #divide cpu by 100 to convert from percentage to fraction
             self.assertWithinTolerance( pct/100, CPU_FRACTION,
@@ -115,7 +125,8 @@ class testOptionsTopoCommon( object ):
     def testLinkBandwidth( self ):
         "Verify that link bandwidths are accurate within a bound."
         if self.switchClass is UserSwitch:
-            self.skipTest ( 'UserSwitch has very poor performance, so skip for now' )
+            self.skipTest( 'UserSwitch has very poor performance -'
+                           ' skipping for now' )
         BW = 5  # Mbps
         BW_TOLERANCE = 0.8  # BW fraction below which test should fail
         # Verify ability to create limited-link topo first;
@@ -124,7 +135,7 @@ class testOptionsTopoCommon( object ):
         mn = Mininet( SingleSwitchOptionsTopo( n=N, lopts=lopts ),
                       link=TCLink, switch=self.switchClass,
                       waitConnected=True )
-        bw_strs = mn.run( mn.iperf, format='m' )
+        bw_strs = mn.run( mn.iperf, fmt='m' )
         loptsStr = ', '.join( '%s: %s' % ( opt, value )
                               for opt, value in lopts.items() )
         msg = ( '\nTesting link bandwidth limited to %d Mbps per link\n'
@@ -141,7 +152,7 @@ class testOptionsTopoCommon( object ):
         # As long as the kernel doesn't wait a long time before
         # delivering bytes to the iperf server, its reported data rate
         # should be close to the actual receive rate.
-        serverRate, clientRate = bw_strs
+        serverRate, _clientRate = bw_strs
         bw = float( serverRate.split(' ')[0] )
         self.assertWithinTolerance( bw, BW, BW_TOLERANCE, msg )
 
@@ -160,12 +171,12 @@ class testOptionsTopoCommon( object ):
         mn.stop()
         test_outputs = ping_delays[0]
         # Ignore unused variables below
-        # pylint: disable-msg=W0612
+        # pylint: disable=W0612
         node, dest, ping_outputs = test_outputs
         sent, received, rttmin, rttavg, rttmax, rttdev = ping_outputs
         pingFailMsg = 'sent %s pings, only received %s' % ( sent, received )
         self.assertEqual( sent, received, msg=pingFailMsg )
-        # pylint: enable-msg=W0612
+        # pylint: enable=W0612
         loptsStr = ', '.join( '%s: %s' % ( opt, value )
                               for opt, value in lopts.items() )
         msg = ( '\nTesting Link Delay of %s ms\n'
@@ -181,10 +192,9 @@ class testOptionsTopoCommon( object ):
 
         for rttval in [rttmin, rttavg, rttmax]:
             # Multiply delay by 4 to cover there & back on two links
-            self.assertWithinTolerance( rttval, DELAY_MS * 4.0, 
+            self.assertWithinTolerance( rttval, DELAY_MS * 4.0,
                                         DELAY_TOLERANCE, msg )
 
-
     def testLinkLoss( self ):
         "Verify that we see packet drops with a high configured loss rate."
         LOSS_PERCENT = 99
@@ -212,7 +222,8 @@ class testOptionsTopoCommon( object ):
                 'lopts = %s\n'
                 'host = default\n'
                 'switch = %s\n'
-                % ( LOSS_PERCENT, dropped_total, N, loptsStr, self.switchClass ) )
+                % ( LOSS_PERCENT, dropped_total, N, loptsStr,
+                    self.switchClass ) )
 
         self.assertGreater( dropped_total, 0, msg )
 
@@ -245,9 +256,10 @@ class testOptionsTopoIVS( testOptionsTopoCommon, unittest.TestCase ):
     switchClass = IVSSwitch
 
 @unittest.skipUnless( quietRun( 'which ofprotocol' ),
-                     'Reference user switch is not installed' )
+                      'Reference user switch is not installed' )
 class testOptionsTopoUserspace( testOptionsTopoCommon, unittest.TestCase ):
-    "Verify ability to create networks with host and link options (UserSwitch)."
+    """Verify ability to create networks with host and link options
+     (UserSwitch)."""
     longMessage = True
     switchClass = UserSwitch
 

mininet/test/test_nets.py

@@ -4,6 +4,7 @@
    Test creation and all-pairs ping for each included mininet topo type."""
 
 import unittest
+import sys
 from functools import partial
 
 from mininet.net import Mininet
@@ -12,6 +13,7 @@ from mininet.node import UserSwitch, OVSSwitch, IVSSwitch
 from mininet.topo import SingleSwitchTopo, LinearTopo
 from mininet.log import setLogLevel
 from mininet.util import quietRun
+from mininet.clean import cleanup
 
 # Tell pylint not to complain about calls to other class
 # pylint: disable=E1101
@@ -19,7 +21,13 @@ from mininet.util import quietRun
 class testSingleSwitchCommon( object ):
     "Test ping with single switch topology (common code)."
 
-    switchClass = None # overridden in subclasses
+    switchClass = None  # overridden in subclasses
+
+    @staticmethod
+    def tearDown():
+        "Clean up if necessary"
+        if sys.exc_info != ( None, None, None ):
+            cleanup()
 
     def testMinimal( self ):
         "Ping test on minimal topology"
@@ -51,7 +59,7 @@ class testSingleSwitchIVS( testSingleSwitchCommon, unittest.TestCase ):
     switchClass = IVSSwitch
 
 @unittest.skipUnless( quietRun( 'which ofprotocol' ),
-                     'Reference user switch is not installed' )
+                      'Reference user switch is not installed' )
 class testSingleSwitchUserspace( testSingleSwitchCommon, unittest.TestCase ):
     "Test ping with single switch topology (Userspace switch)."
     switchClass = UserSwitch
@@ -63,11 +71,12 @@ class testSingleSwitchUserspace( testSingleSwitchCommon, unittest.TestCase ):
 class testLinearCommon( object ):
     "Test all-pairs ping with LinearNet (common code)."
 
-    switchClass = None # overridden in subclasses
+    switchClass = None  # overridden in subclasses
 
     def testLinear5( self ):
         "Ping test on a 5-switch topology"
-        mn = Mininet( LinearTopo( k=5 ), self.switchClass, Host, Controller, waitConnected=True )
+        mn = Mininet( LinearTopo( k=5 ), self.switchClass, Host,
+                      Controller, waitConnected=True )
         dropped = mn.run( mn.ping )
         self.assertEqual( dropped, 0 )
 

mininet/test/test_switchdpidassignment.py

@@ -4,40 +4,59 @@
    Regression tests for switch dpid assignment."""
 
 import unittest
-from functools import partial
-import re
+import sys
 
 from mininet.net import Mininet
 from mininet.node import Host, Controller
-from mininet.node import UserSwitch, OVSSwitch, OVSLegacyKernelSwitch, IVSSwitch
+from mininet.node import ( UserSwitch, OVSSwitch, OVSLegacyKernelSwitch,
+                           IVSSwitch )
 from mininet.topo import Topo
 from mininet.log import setLogLevel
 from mininet.util import quietRun
+from mininet.clean import cleanup
 
 
-class testSwitchDpidAssignmentCommon ( object ):
-    """Verify Switch dpid assignment."""
+class TestSwitchDpidAssignmentOVS( unittest.TestCase ):
+    "Verify Switch dpid assignment."
 
-    switchClass = None # overridden in subclasses
+    switchClass = OVSSwitch  # overridden in subclasses
 
-    def testDefaultDpid ( self ):
+    def tearDown( self ):
+        "Clean up if necessary"
+        # satisfy pylint
+        assert self
+        if sys.exc_info != ( None, None, None ):
+            cleanup()
+
+    def testDefaultDpid( self ):
         """Verify that the default dpid is assigned using a valid provided
         canonical switchname if no dpid is passed in switch creation."""
-        switch = Mininet( Topo(), self.switchClass, Host, Controller ).addSwitch( 's1' )
+        switch = Mininet( Topo(),
+                          self.switchClass,
+                          Host, Controller ).addSwitch( 's1' )
         self.assertEqual( switch.defaultDpid(), switch.dpid )
 
+    def dpidFrom( self, num ):
+        "Compute default dpid from number"
+        fmt = ( '%0' + str( self.switchClass.dpidLen ) + 'x' )
+        return fmt % num
+
     def testActualDpidAssignment( self ):
-        """Verify that Switch dpid is the actual dpid assigned if dpid is 
+        """Verify that Switch dpid is the actual dpid assigned if dpid is
         passed in switch creation."""
-        switch = Mininet( Topo(), self.switchClass, Host, Controller ).addSwitch( 'A', dpid = '000000000000ABCD' )
-        self.assertEqual( switch.dpid, '000000000000ABCD' )
+        dpid = self.dpidFrom( 0xABCD )
+        switch = Mininet( Topo(), self.switchClass,
+                          Host, Controller ).addSwitch(
+                            's1', dpid=dpid )
+        self.assertEqual( switch.dpid, dpid )
 
     def testDefaultDpidAssignmentFailure( self ):
-        """Verify that Default dpid assignment raises an Exception if the 
-        name of the switch does not contin a digit. Also verify the 
+        """Verify that Default dpid assignment raises an Exception if the
+        name of the switch does not contin a digit. Also verify the
         exception message."""
         with self.assertRaises( Exception ) as raises_cm:
-            Mininet( Topo(), self.switchClass, Host, Controller ).addSwitch( 'A' )
+            Mininet( Topo(), self.switchClass,
+                     Host, Controller ).addSwitch( 'A' )
         self.assertEqual(raises_cm.exception.message, 'Unable to derive '
                          'default datapath ID - please either specify a dpid '
                          'or use a canonical switch name such as s23.')
@@ -47,43 +66,39 @@ class testSwitchDpidAssignmentCommon ( object ):
         16 - len(hex of first string of contiguous digits passed in switch
         name) 0's followed by hex of first string of contiguous digits passed
         in switch name."""
-        switch = Mininet( Topo(), self.switchClass, Host, Controller ).addSwitch( 's123' )
-        dpid = hex( int(re.findall( r'\d+', switch.name ) [0]) ) [ 2: ]
-        try:
-            if issubclass(UserSwitch, self.switchClass):
-                # Dpid lenght of UserSwitch = 12
-                self.assertEqual( switch.dpid, '0' * (12 - len(dpid)) + str(dpid) )
-            else:
-                self.assertEqual( switch.dpid, '0' * (16 - len(dpid)) + str(dpid) )
-        except TypeError:
-            # Switch is OVS User Switch
-            self.assertEqual( switch.dpid, '0' * (16 - len(dpid)) + str(dpid) )
-            
+        switch = Mininet( Topo(), self.switchClass,
+                          Host, Controller ).addSwitch( 's123' )
 
-class testSwitchOVSKernel( testSwitchDpidAssignmentCommon, unittest.TestCase ):
-    """Test dpid assignnment of OVS Kernel Switch."""
-    switchClass = OVSSwitch
+        self.assertEqual( switch.dpid, self.dpidFrom( 123 ) )
 
-class testSwitchOVSUser( testSwitchDpidAssignmentCommon, unittest.TestCase ):
-    """Test dpid assignnment of OVS User Switch."""
-    switchClass = partial(OVSSwitch, datapath = 'user')
-    
-@unittest.skipUnless( quietRun( 'which ovs-openflowd' ), 'OVS Legacy Kernel switch is not installed' )
-class testSwitchOVSLegacyKernel( testSwitchDpidAssignmentCommon, unittest.TestCase ):
-    """Test dpid assignnment of OVS Legacy Kernel Switch."""
+class OVSUser( OVSSwitch):
+    "OVS User Switch convenience class"
+    def __init__( self, *args, **kwargs ):
+        kwargs.update( datapath='user' )
+        OVSSwitch.__init__( self, *args, **kwargs )
+
+class testSwitchOVSUser( TestSwitchDpidAssignmentOVS ):
+    "Test dpid assignnment of OVS User Switch."
+    switchClass = OVSUser
+
+@unittest.skipUnless( quietRun( 'which ovs-openflowd' ),
+                      'OVS Legacy Kernel switch is not installed' )
+class testSwitchOVSLegacyKernel( TestSwitchDpidAssignmentOVS ):
+    "Test dpid assignnment of OVS Legacy Kernel Switch."
     switchClass = OVSLegacyKernelSwitch
-    
-@unittest.skipUnless( quietRun( 'which ivs-ctl' ), 'IVS switch is not installed' )
-class testSwitchIVS( testSwitchDpidAssignmentCommon, unittest.TestCase ):
-    """Test dpid assignment of IVS switch."""
+
+@unittest.skipUnless( quietRun( 'which ivs-ctl' ),
+                      'IVS switch is not installed' )
+class testSwitchIVS( TestSwitchDpidAssignmentOVS ):
+    "Test dpid assignment of IVS switch."
     switchClass = IVSSwitch
 
-@unittest.skipUnless( quietRun( 'which ofprotocol' ), 'Reference user switch is not installed' )
-class testSwitchUserspace( testSwitchDpidAssignmentCommon, unittest.TestCase ):
-    """Test dpid assignment of Userspace switch."""
+@unittest.skipUnless( quietRun( 'which ofprotocol' ),
+                      'Reference user switch is not installed' )
+class testSwitchUserspace( TestSwitchDpidAssignmentOVS ):
+    "Test dpid assignment of Userspace switch."
     switchClass = UserSwitch
 
-
 if __name__ == '__main__':
     setLogLevel( 'warning' )
     unittest.main()

mininet/test/test_walkthrough.py

@@ -14,11 +14,16 @@ from mininet.util import quietRun
 from distutils.version import StrictVersion
 
 def tsharkVersion():
+    "Return tshark version"
     versionStr = quietRun( 'tshark -v' )
-    versionMatch = re.findall( 'TShark \d+.\d+.\d+', versionStr )[0]
+    versionMatch = re.findall( r'TShark \d+.\d+.\d+', versionStr )[0]
     return versionMatch.split()[ 1 ]
 
+# pylint doesn't understand pexpect.match, unfortunately!
+# pylint:disable=maybe-no-member
+
 class testWalkthrough( unittest.TestCase ):
+    "Test Mininet walkthrough"
 
     prompt = 'mininet>'
 
@@ -31,6 +36,8 @@ class testWalkthrough( unittest.TestCase ):
 
     def testWireshark( self ):
         "Use tshark to test the of dissector"
+        # Satisfy pylint
+        assert self
         if StrictVersion( tsharkVersion() ) < StrictVersion( '1.12.0' ):
             tshark = pexpect.spawn( 'tshark -i lo -R of' )
         else:
@@ -51,7 +58,7 @@ class testWalkthrough( unittest.TestCase ):
         self.assertEqual( index, 0, 'No output for "help" command')
         # nodes command
         p.sendline( 'nodes' )
-        p.expect( '([chs]\d ?){4}' )
+        p.expect( r'([chs]\d ?){4}' )
         nodes = p.match.group( 0 ).split()
         self.assertEqual( len( nodes ), 4, 'No nodes in "nodes" command')
         p.expect( self.prompt )
@@ -67,14 +74,15 @@ class testWalkthrough( unittest.TestCase ):
         p.expect( self.prompt )
         # dump command
         p.sendline( 'dump' )
-        expected = [ '<\w+ (%s)' % n for n in nodes ]
+        expected = [ r'<\w+ (%s)' % n for n in nodes ]
         actual = []
         for _ in nodes:
             index = p.expect( expected )
             node = p.match.group( 1 )
             actual.append( node )
             p.expect( '\n' )
-        self.assertEqual( actual.sort(), nodes.sort(), '"nodes" and "dump" differ' )
+        self.assertEqual( actual.sort(), nodes.sort(),
+                          '"nodes" and "dump" differ' )
         p.expect( self.prompt )
         p.sendline( 'exit' )
         p.wait()
@@ -161,7 +169,7 @@ class testWalkthrough( unittest.TestCase ):
         p.expect( pexpect.EOF )
         # test iperf
         p = pexpect.spawn( 'mn --test iperf' )
-        p.expect( "Results: \['([\d\.]+) .bits/sec'," )
+        p.expect( r"Results: \['([\d\.]+) .bits/sec'," )
         bw = float( p.match.group( 1 ) )
         self.assertTrue( bw > 0 )
         p.expect( pexpect.EOF )
@@ -170,7 +178,7 @@ class testWalkthrough( unittest.TestCase ):
         "Test pingall on single,3 and linear,4 topos"
         # testing single,3
         p = pexpect.spawn( 'mn --test pingall --topo single,3' )
-        p.expect( '(\d+)/(\d+) received')
+        p.expect( r'(\d+)/(\d+) received')
         received = int( p.match.group( 1 ) )
         sent = int( p.match.group( 2 ) )
         self.assertEqual( sent, 6, 'Wrong number of pings sent in single,3' )
@@ -178,7 +186,7 @@ class testWalkthrough( unittest.TestCase ):
         p.expect( pexpect.EOF )
         # testing linear,4
         p = pexpect.spawn( 'mn --test pingall --topo linear,4' )
-        p.expect( '(\d+)/(\d+) received')
+        p.expect( r'(\d+)/(\d+) received')
         received = int( p.match.group( 1 ) )
         sent = int( p.match.group( 2 ) )
         self.assertEqual( sent, 12, 'Wrong number of pings sent in linear,4' )
@@ -191,14 +199,15 @@ class testWalkthrough( unittest.TestCase ):
         # test bw
         p.expect( self.prompt )
         p.sendline( 'iperf' )
-        p.expect( "Results: \['([\d\.]+) Mbits/sec'," )
+        p.expect( r"Results: \['([\d\.]+) Mbits/sec'," )
         bw = float( p.match.group( 1 ) )
         self.assertTrue( bw < 10.1, 'Bandwidth > 10 Mb/s')
         self.assertTrue( bw > 9.0, 'Bandwidth < 9 Mb/s')
         p.expect( self.prompt )
         # test delay
         p.sendline( 'h1 ping -c 4 h2' )
-        p.expect( 'rtt min/avg/max/mdev = ([\d\.]+)/([\d\.]+)/([\d\.]+)/([\d\.]+) ms' )
+        p.expect( r'rtt min/avg/max/mdev = '
+                  r'([\d\.]+)/([\d\.]+)/([\d\.]+)/([\d\.]+) ms' )
         delay = float( p.match.group( 2 ) )
         self.assertTrue( delay > 40, 'Delay < 40ms' )
         self.assertTrue( delay < 45, 'Delay > 40ms' )
@@ -222,10 +231,13 @@ class testWalkthrough( unittest.TestCase ):
 
     def testCustomTopo( self ):
         "Start Mininet using a custom topo, then run pingall"
+        # Satisfy pylint
+        assert self
         custom = os.path.dirname( os.path.realpath( __file__ ) )
         custom = os.path.join( custom, '../../custom/topo-2sw-2host.py' )
         custom = os.path.normpath( custom )
-        p = pexpect.spawn( 'mn --custom %s --topo mytopo --test pingall' % custom )
+        p = pexpect.spawn(
+            'mn --custom %s --topo mytopo --test pingall' % custom )
         p.expect( '0% dropped' )
         p.expect( pexpect.EOF )
 
@@ -243,7 +255,7 @@ class testWalkthrough( unittest.TestCase ):
         switches = [ 'user', 'ovsk' ]
         for sw in switches:
             p = pexpect.spawn( 'mn --switch %s --test iperf' % sw )
-            p.expect( "Results: \['([\d\.]+) .bits/sec'," )
+            p.expect( r"Results: \['([\d\.]+) .bits/sec'," )
             bw = float( p.match.group( 1 ) )
             self.assertTrue( bw > 0 )
             p.expect( pexpect.EOF )
@@ -251,7 +263,7 @@ class testWalkthrough( unittest.TestCase ):
     def testBenchmark( self ):
         "Run benchmark and verify that it takes less than 2 seconds"
         p = pexpect.spawn( 'mn --test none' )
-        p.expect( 'completed in ([\d\.]+) seconds' )
+        p.expect( r'completed in ([\d\.]+) seconds' )
         time = float( p.match.group( 1 ) )
         self.assertTrue( time < 2, 'Benchmark takes more than 2 seconds' )
 
@@ -275,7 +287,7 @@ class testWalkthrough( unittest.TestCase ):
         self.assertEqual( ifcount, 2, 'Missing interfaces on s1' )
         # verify that all hosts a reachable
         p.sendline( 'pingall' )
-        p.expect( '(\d+)% dropped' )
+        p.expect( r'(\d+)% dropped' )
         dropped = int( p.match.group( 1 ) )
         self.assertEqual( dropped, 0, 'pingall failed')
         p.expect( self.prompt )
@@ -327,11 +339,15 @@ class testWalkthrough( unittest.TestCase ):
                           'Github is not reachable; cannot download Pox' )
     def testRemoteController( self ):
         "Test Mininet using Pox controller"
+        # Satisfy pylint
+        assert self
         if not os.path.exists( '/tmp/pox' ):
-            p = pexpect.spawn( 'git clone https://github.com/noxrepo/pox.git /tmp/pox' )
+            p = pexpect.spawn(
+                'git clone https://github.com/noxrepo/pox.git /tmp/pox' )
             p.expect( pexpect.EOF )
         pox = pexpect.spawn( '/tmp/pox/pox.py forwarding.l2_learning' )
-        net = pexpect.spawn( 'mn --controller=remote,ip=127.0.0.1,port=6633 --test pingall' )
+        net = pexpect.spawn(
+            'mn --controller=remote,ip=127.0.0.1,port=6633 --test pingall' )
         net.expect( '0% dropped' )
         net.expect( pexpect.EOF )
         pox.sendintr()

mininet/topo.py

@@ -78,7 +78,6 @@ class MultiGraph( object ):
         "Return list of graph edges"
         return list( self.edges_iter( data=data, keys=keys ) )
 
-
     def __getitem__( self, node ):
         "Return link dict for given src node"
         return self.edge[ node ]
@@ -101,7 +100,7 @@ class Topo( object ):
     "Data center network representation for structured multi-trees."
 
     def __init__( self, *args, **params ):
-        """Topo object. 
+        """Topo object.
            Optional named parameters:
            hinfo: default host options
            sopts: default switch options
@@ -111,7 +110,8 @@ class Topo( object ):
         self.hopts = params.pop( 'hopts', {} )
         self.sopts = params.pop( 'sopts', {} )
         self.lopts = params.pop( 'lopts', {} )
-        self.ports = {}  # ports[src][dst][sport] is port on dst that connects to src
+        # ports[src][dst][sport] is port on dst that connects to src
+        self.ports = {}
         self.build( *args, **params )
 
     def build( self, *args, **params ):
@@ -146,7 +146,7 @@ class Topo( object ):
         return result
 
     def addLink( self, node1, node2, port1=None, port2=None,
-                key=None, **opts ):
+                 key=None, **opts ):
         """node1, node2: nodes to link together
            port1, port2: ports (optional)
            opts: link options (optional)
@@ -187,7 +187,7 @@ class Topo( object ):
            withKeys: return link keys
            withInfo: return link info
            returns: list of ( src, dst [,key, info ] )"""
-        for src, dst, key, info in self.g.edges_iter( data=True, keys=True ):
+        for _src, _dst, key, info in self.g.edges_iter( data=True, keys=True ):
             node1, node2 = info[ 'node1' ], info[ 'node2' ]
             if withKeys:
                 if withInfo:
@@ -207,7 +207,7 @@ class Topo( object ):
            withInfo: return link info
            returns: list of ( src, dst [,key, info ] )"""
         links = list( self.iterLinks( withKeys, withInfo ) )
-        if not sorted:
+        if not sort:
             return links
         # Ignore info when sorting
         tupleSize = 3 if withKeys else 2
@@ -256,7 +256,7 @@ class Topo( object ):
         if key is None:
             key = min( entry )
         return entry, key
-    
+
     def linkInfo( self, src, dst, key=None ):
         "Return link metadata dict"
         entry, key = self._linkEntry( src, dst, key )
@@ -287,10 +287,13 @@ class Topo( object ):
         return sorted( items, key=natural )
 
 
+# Our idiom defines additional parameters in build(param...)
+# pylint: disable=arguments-differ
+
 class SingleSwitchTopo( Topo ):
     "Single switch connected to k hosts."
 
-    def build( self, k=2, **opts ):
+    def build( self, k=2, **_opts ):
         "k: number of hosts"
         self.k = k
         switch = self.addSwitch( 's1' )
@@ -302,7 +305,8 @@ class SingleSwitchTopo( Topo ):
 class SingleSwitchReversedTopo( Topo ):
     """Single switch connected to k hosts, with reversed ports.
        The lowest-numbered host is connected to the highest-numbered port.
-       Useful to verify that Mininet properly handles custom port numberings."""
+       Useful to verify that Mininet properly handles custom port
+       numberings."""
 
     def build( self, k=2 ):
         "k: number of hosts"
@@ -317,7 +321,7 @@ class SingleSwitchReversedTopo( Topo ):
 class LinearTopo( Topo ):
     "Linear topology of k switches, with n hosts per switch."
 
-    def build( self, k=2, n=1, **opts):
+    def build( self, k=2, n=1, **_opts):
         """k: number of switches
            n: number of hosts per switch"""
         self.k = k
@@ -340,3 +344,5 @@ class LinearTopo( Topo ):
             if lastSwitch:
                 self.addLink( switch, lastSwitch )
             lastSwitch = switch
+
+# pylint: enable=arguments-differ

mininet/topolib.py

@@ -3,6 +3,9 @@
 from mininet.topo import Topo
 from mininet.net import Mininet
 
+# The build() method is expected to do this:
+# pylint: disable=arguments-differ
+
 class TreeTopo( Topo ):
     "Topology for a tree network with a given depth and fanout."
 
@@ -41,11 +44,11 @@ class TorusTopo( Topo ):
        with the default controller or any Ethernet bridge
        without STP turned on! It can be used with STP, e.g.:
        # mn --topo torus,3,3 --switch lxbr,stp=1 --test pingall"""
-    
+
     def build( self, x, y ):
         if x < 3 or y < 3:
             raise Exception( 'Please use 3x3 or greater for compatibility '
-                            'with 2.1' )
+                             'with 2.1' )
         hosts, switches, dpid = {}, {}, 0
         # Create and wire interior
         for i in range( 0, x ):
@@ -53,7 +56,8 @@ class TorusTopo( Topo ):
                 loc = '%dx%d' % ( i + 1, j + 1 )
                 # dpid cannot be zero for OVS
                 dpid = ( i + 1 ) * 256 + ( j + 1 )
-                switch = switches[ i, j ] = self.addSwitch( 's' + loc, dpid='%016x' % dpid )
+                switch = switches[ i, j ] = self.addSwitch(
+                    's' + loc, dpid='%016x' % dpid )
                 host = hosts[ i, j ] = self.addHost( 'h' + loc )
                 self.addLink( host, switch )
         # Connect switches
@@ -65,5 +69,4 @@ class TorusTopo( Topo ):
                 self.addLink( sw1, sw2 )
                 self.addLink( sw1, sw3 )
 
-    
-
+# pylint: enable=arguments-differ

mininet/util.py

@@ -25,7 +25,7 @@ def checkRun( cmd ):
     return check_call( cmd.split( ' ' ) )
 
 # pylint doesn't understand explicit type checking
-# pylint: disable-msg=E1103
+# pylint: disable=maybe-no-member
 
 def oldQuietRun( *cmd ):
     """Run a command, routing stderr to stdout, and return the output.
@@ -119,8 +119,7 @@ def quietRun( cmd, **kwargs ):
     "Run a command and return merged stdout and stderr"
     return errRun( cmd, stderr=STDOUT, **kwargs )[ 0 ]
 
-# pylint: enable-msg=E1103
-# pylint: disable-msg=E1101
+# pylint: enable=maybe-no-member
 
 def isShellBuiltin( cmd ):
     "Return True if cmd is a bash builtin."
@@ -133,8 +132,6 @@ def isShellBuiltin( cmd ):
 
 isShellBuiltin.builtIns = None
 
-# pylint: enable-msg=E1101
-
 # Interface management
 #
 # Interfaces are managed as strings which are simply the
@@ -148,22 +145,22 @@ isShellBuiltin.builtIns = None
 # live in the root namespace and thus do not have to be
 # explicitly moved.
 
-def makeIntfPair( intf1, intf2, addr1=None, addr2=None, run=quietRun ):
+def makeIntfPair( intf1, intf2, addr1=None, addr2=None, runCmd=quietRun ):
     """Make a veth pair connecting intf1 and intf2.
        intf1: string, interface
        intf2: string, interface
-       node: node to run on or None (default)
+       runCmd: function to run shell commands (quietRun)
        returns: ip link add result"""
     # Delete any old interfaces with the same names
-    run( 'ip link del ' + intf1 )
-    run( 'ip link del ' + intf2 )
+    runCmd( 'ip link del ' + intf1 )
+    runCmd( 'ip link del ' + intf2 )
     # Create new pair
     if addr1 is None and addr2 is None:
         cmd = 'ip link add name ' + intf1 + ' type veth peer name ' + intf2
     else:
         cmd = ( 'ip link add name ' + intf1 + ' address ' + addr1 +
                 ' type veth peer name ' + intf2 + ' address ' + addr2 )
-    cmdOutput = run( cmd )
+    cmdOutput = runCmd( cmd )
     if cmdOutput == '':
         return True
     else:
@@ -202,8 +199,8 @@ def moveIntfNoRetry( intf, dstNode, printError=False ):
         return False
     return True
 
-def moveIntf( intf, dstNode, srcNode=None, printError=True,
-             retries=3, delaySecs=0.001 ):
+def moveIntf( intf, dstNode, printError=True,
+              retries=3, delaySecs=0.001 ):
     """Move interface to node, retrying on failure.
        intf: string, interface
        dstNode: destination Node
@@ -296,7 +293,7 @@ def ipAdd( i, prefixLen=8, ipBaseNum=0x0a000000 ):
 def ipParse( ip ):
     "Parse an IP address and return an unsigned int."
     args = [ int( arg ) for arg in ip.split( '.' ) ]
-    while ( len(args) < 4 ):
+    while len(args) < 4:
         args.append( 0 )
     return ipNum( *args )
 
@@ -427,9 +424,12 @@ def fixLimits():
         sysctlTestAndSet( 'net.ipv4.route.max_size', 32768 )
         #Increase number of PTYs for nodes
         sysctlTestAndSet( 'kernel.pty.max', 20000 )
-    except:
+    # pylint: disable=broad-except
+    except Exception:
         warn( "*** Error setting resource limits. "
               "Mininet's performance may be affected.\n" )
+    # pylint: enable=broad-except
+
 
 def mountCgroups():
     "Make sure cgroups file system is mounted"
@@ -545,15 +545,16 @@ def ensureRoot():
 def waitListening( client=None, server='127.0.0.1', port=80, timeout=None ):
     """Wait until server is listening on port.
        returns True if server is listening"""
-    run = ( client.cmd if client else
-                partial( quietRun, shell=True ) )
-    if not run( 'which telnet' ):
+    runCmd = ( client.cmd if client else
+               partial( quietRun, shell=True ) )
+    if not runCmd( 'which telnet' ):
         raise Exception('Could not find telnet' )
+    # pylint: disable=maybe-no-member
     serverIP = server if isinstance( server, basestring ) else server.IP()
     cmd = ( 'sh -c "echo A | telnet -e A %s %s"' %
-           ( serverIP, port ) )
+            ( serverIP, port ) )
     time = 0
-    while 'Connected' not in run( cmd ):
+    while 'Connected' not in runCmd( cmd ):
         if timeout:
             print time
             if time >= timeout:

util/doxify.py

@@ -30,7 +30,7 @@ def fixParam( line ):
 def fixReturns( line ):
     "Change returns: foo to @return foo"
     return re.sub( 'returns:', r'@returns', line )
-    
+
 def fixLine( line ):
     global comment
     match = spaces.match( line )
@@ -69,7 +69,7 @@ def funTest():
     ).splitlines( True )
 
     fixLines( testFun )
-    
+
 def fixLines( lines, fid ):
     for line in lines:
         os.write( fid, fixLine( line ) )
@@ -86,4 +86,4 @@ if __name__ == '__main__':
 
 
 
-    
+

util/install.sh

@@ -554,9 +554,9 @@ function vm_other {
     #    BLACKLIST=/etc/modprobe.d/blacklist
     #fi
     #sudo sh -c "echo 'blacklist net-pf-10\nblacklist ipv6' >> $BLACKLIST"
-
+    echo "Disabling IPv6"
     # Disable IPv6
-    if ! grep 'disable IPv6' /etc/sysctl.conf; then
+    if ! grep 'disable_ipv6' /etc/sysctl.conf; then
         echo 'Disabling IPv6'
         echo '
 # Mininet: disable IPv6
@@ -564,6 +564,13 @@ net.ipv6.conf.all.disable_ipv6 = 1
 net.ipv6.conf.default.disable_ipv6 = 1
 net.ipv6.conf.lo.disable_ipv6 = 1' | sudo tee -a /etc/sysctl.conf > /dev/null
     fi
+    # Since the above doesn't disable neighbor discovery, also do this:
+    if ! grep 'ipv6.disable' /etc/default/grub; then
+        sudo sed -i -e \
+        's/GRUB_CMDLINE_LINUX_DEFAULT="/GRUB_CMDLINE_LINUX_DEFAULT="ipv6.disable=1/' \
+        /etc/default/grub
+        sudo update-grub
+    fi
     # Disabling IPv6 breaks X11 forwarding via ssh
     line='AddressFamily inet'
     file='/etc/ssh/sshd_config'

util/vm/build.py

@@ -881,7 +881,7 @@ def getMininetVersion( vm ):
     return version
 
 
-def bootAndRun( image, prompt=Prompt, memory=1024, outputFile=None, 
+def bootAndRun( image, prompt=Prompt, memory=1024, outputFile=None,
                 runFunction=None, **runArgs ):
     """Boot and test VM
        tests: list of tests to run

util/vm/install-mininet-vm.sh

@@ -11,7 +11,8 @@ sudo sed -i -e 's/Default/#Default/' /etc/sudoers
 echo mininet-vm | sudo tee /etc/hostname > /dev/null
 sudo sed -i -e 's/ubuntu/mininet-vm/g' /etc/hosts
 sudo hostname `cat /etc/hostname`
-sudo sed -i -e 's/quiet splash/text/' /etc/default/grub
+sudo sed -i -e 's/splash//' /etc/default/grub
+sudo sed -i -e 's/quiet/text/' /etc/default/grub
 sudo update-grub
 # Update from official archive
 sudo apt-get update
@@ -34,7 +35,9 @@ git clone git://github.com/mininet/mininet
 # Optionally check out branch
 if [ "$1" != "" ]; then
   pushd mininet
-  git checkout -b $1 $1
+  #git checkout -b $1 $1
+  # TODO branch will in detached HEAD state if it is not master
+  git checkout $1
   popd
 fi
 # Install Mininet