Merge branch 'master' into rc-local

* rc.local: /usr/bin/bash -> /bin/bash

bash is (and should be) located in /bin

this may have caused ubuntu 18.04 to not execute
/etc/rc.local and regenerate ssh keys

* fix bootAndRun()

INSTALL

@@ -211,7 +211,10 @@ like to contribute an installation script, we would welcome it!)
    support other Linux distributions.
 
 
-Good luck!
+As always, please feel free to submit issues or pull requests for
+installation-related features.
+
+Good luck, and have fun!
 
 Mininet Developers
 

README.md

@@ -70,7 +70,7 @@ Mininet includes:
 
 ### Python 3 Support
 
-- Mininet 2.3.0b2 supports Python 3 and Python 2.
+- Mininet 2.3.0b2 supports Python 3 and Python 2!
 
 - You can install both the Python 3 and Python 2 versions of
 Mininet side by side, but the most recent installation will
@@ -82,6 +82,9 @@ determine which Python version is used by default by `mn`.
 
       $ sudo python2 `which mn`
 
+- More information regarding Python 3 and Python 2 support
+  may be found in the release notes on http://docs.mininet.org.
+  
 ### Other Enhancements and Information
 
 - Support for Ubuntu 20.04 LTS (and 18.04 and 16.04)
@@ -126,8 +129,8 @@ hard work that Mininet continues to grow and improve.
 
 ### Enjoy Mininet
 
-Best wishes, and we look forward to seeing what you can do with
-Mininet to change the networking world!
+Have fun! We look forward to seeing what you will do with Mininet 
+to change the networking world.
 
 Bob Lantz
 on behalf of the Mininet Contributors

bin/mn

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 Mininet runner

examples/baresshd.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 "This example doesn't use OpenFlow, but attempts to run sshd in a namespace."
 

examples/bind.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 bind.py: Bind mount example

examples/cluster.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 cluster.py: prototyping/experimentation for distributed Mininet,

examples/clustercli.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 "CLI for Mininet Cluster Edition prototype demo"
 

examples/clusterdemo.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 "clusterdemo.py: demo of Mininet Cluster Edition prototype"
 

examples/clusterperf.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 "clusterperf.py compare the maximum throughput between SSH and GRE tunnels"
 

examples/consoles.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 consoles.py: bring up a bunch of miniature consoles on a virtual network

examples/controllers.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 Create a network where different switches are connected to

examples/controllers2.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 This example creates a multi-controller network from semi-scratch by

examples/controlnet.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 controlnet.py: Mininet with a custom control network

examples/cpu.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 cpu.py: test iperf bandwidth for varying cpu limits

examples/emptynet.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 This example shows how to create an empty Mininet object

examples/hwintf.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 This example shows how to add an interface (for example a real

examples/intfoptions.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 '''
 example of using various TCIntf options.

examples/limit.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 limit.py: example of using link and CPU limits

examples/linearbandwidth.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 Test bandwidth (using iperf) on linear networks of varying size,

examples/linuxrouter.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 linuxrouter.py: Example network with Linux IP router

examples/miniedit.py

@@ -1704,7 +1704,7 @@ class MiniEdit( Frame ):
             # debug( "Now saving under %s\n" % fileName )
             f = open(fileName, 'wb')
 
-            f.write("#!/usr/bin/python\n")
+            f.write("#!/usr/bin/env python\n")
             f.write("\n")
             f.write("from mininet.net import Mininet\n")
             f.write("from mininet.node import Controller, RemoteController, OVSController\n")

examples/mobility.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 Simple example of Mobility with Mininet

examples/multilink.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 This is a simple example that demonstrates multiple links

examples/multiping.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 multiping.py: monitor multiple sets of hosts using ping

examples/multipoll.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 Simple example of sending output to multiple files and

examples/multitest.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 This example shows how to create a network and run multiple tests.

examples/nat.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 Example to create a Mininet topology and connect it to the internet via NAT

examples/natnet.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 natnet.py: Example network with NATs

examples/numberedports.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 Create a network with 5 hosts, numbered 1-4 and 9.

examples/popen.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 This example monitors a number of hosts using host.popen() and

examples/popenpoll.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 "Monitor multiple hosts using popen()/pmonitor()"
 

examples/scratchnet.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 Build a simple network from scratch, using mininet primitives.

examples/scratchnetuser.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 Build a simple network from scratch, using mininet primitives.

examples/simpleperf.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 Simple example of setting network and CPU parameters

examples/sshd.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 Create a network and start sshd(8) on each host.

examples/tree1024.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 Create a 1024-host network, and run the CLI on it.

examples/treeping64.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 "Create a 64-node tree network, and test connectivity using ping."
 

util/doxify.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 """
 Convert simple documentation to epydoc/pydoctor-compatible markup
@@ -83,7 +83,3 @@ if __name__ == '__main__':
     infile.close()
     os.close( outfid )
     call( [ 'doxypy', outname ] )
-
-
-
-

util/install.sh

@@ -791,7 +791,7 @@ function vm_clean {
     echo 'Removing SSH keys from /etc/ssh/'
     sudo rm -f /etc/ssh/*key*
     if [ ! -e /etc/rc.local ]; then
-        echo '#!/usr/bin/bash' | sudo tee /etc/rc.local
+        echo '#!/bin/bash' | sudo tee /etc/rc.local
         sudo chmod +x /etc/rc.local
     fi
     if ! grep mininet /etc/rc.local >& /dev/null; then

util/unpep8

@@ -1,7 +1,7 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 """
-Translate from PEP8 Python style to Mininet (i.e. Arista-like) 
+Translate from PEP8 Python style to Mininet (i.e. Arista-like)
 Python style
 
 usage: unpep8 < old.py > new.py
@@ -51,7 +51,7 @@ def fixUnderscoreTriplet( match ):
 def reinstateCapWords( text ):
    underscoreTriplet = re.compile( r'[A-Za-z0-9]_[A-Za-z0-9]' )
    return underscoreTriplet.sub( fixUnderscoreTriplet, text )
- 
+
 def replaceTripleApostrophes( text ):
    "Replace triple apostrophes with triple quotes."
    return text.replace( "'''", '"""')
@@ -60,7 +60,7 @@ def simplifyTripleQuotes( text ):
    "Fix single-line doc strings."
    r = re.compile( r'"""([^\"\n]+)"""' )
    return r.sub( r'"\1"', text )
-   
+
 def insertExtraSpaces( text ):
    "Insert extra spaces inside of parentheses and brackets/curly braces."
    lparen = re.compile( r'\((?![\s\)])' )
@@ -76,9 +76,9 @@ def insertExtraSpaces( text ):
    lcurly = re.compile( r'\{(?![\s\}])' )
    text = lcurly.sub( r'{ ', text )
    rcurly = re.compile( r'([^\s\{])(?=\})' )
-   text = rcurly.sub( r'\1 ', text)   
+   text = rcurly.sub( r'\1 ', text)
    return text
-   
+
 def fixDoxygen( text ):
    """Translate @param foo to foo:, @return bar to returns: bar, and
       @author me to author: me"""
@@ -96,11 +96,11 @@ def removeCommentFirstBlankLine( text ):
    "Remove annoying blank lines after first line in comments."
    line = re.compile( r'("""[^\n]*\n)\s*\n', re.MULTILINE )
    return line.sub( r'\1', text )
-   
+
 def fixArgs( match, kwarg = re.compile( r'(\w+) = ' ) ):
    "Replace foo = bar with foo=bar."
    return kwarg.sub( r'\1=', match.group() )
-   
+
 def fixKeywords( text ):
    "Change keyword argumentsfrom foo = bar to foo=bar."
    args = re.compile( r'\(([^\)]+)\)', re.MULTILINE )
@@ -115,7 +115,7 @@ def fixKeywords( text ):
 def lineIter( text ):
    "Simple iterator over lines in text."
    for line in text.splitlines(): yield line
-   
+
 def stringIter( strList ):
    "Yield strings in strList."
    for s in strList: yield s
@@ -134,7 +134,7 @@ def restoreRegex( regex, old, new ):
 # This is a cheap hack, and it may not work 100%, since
 # it doesn't handle multiline strings.
 # However, it should be mostly harmless...
-   
+
 def restoreStrings( oldText, newText ):
    "Restore strings from oldText into newText, returning result."
    oldLines, newLines = lineIter( oldText ), lineIter( newText )
@@ -149,13 +149,13 @@ def restoreStrings( oldText, newText ):
       newLine = restoreRegex( tickStrings, oldLine, newLine )
       result += newLine + '\n'
    return result
-   
+
 # This might be slightly controversial, since it uses
 # three spaces to line up multiline comments. However,
 # I much prefer it. Limitations: if you have deeper
 # indents in comments, they will be eliminated. ;-(
 
-def fixComment( match, 
+def fixComment( match,
    indentExp=re.compile( r'\n([ ]*)(?=[^/s])', re.MULTILINE ),
    trailingQuotes=re.compile( r'\s+"""' ) ):
    "Re-indent comment, and join trailing quotes."
@@ -166,17 +166,17 @@ def fixComment( match,
    if len( originalIndent ) is not 0: indent += '   '
    comment = indentExp.sub( indent, comment )
    return originalIndent + trailingQuotes.sub( '"""', comment )
-   
+
 def fixCommentIndents( text ):
    "Fix multiline comment indentation."
    comments = re.compile( r'^([ ]*)("""[^"]*""")$', re.MULTILINE )
    return comments.sub( fixComment, text )
- 
+
 def removeBogusLinefeeds( text ):
    "Remove extra linefeeds at the end of single-line comments."
    bogusLfs = re.compile( r'"([^"\n]*)\n"', re.MULTILINE )
    return bogusLfs.sub( '"\1"', text)
-   
+
 def convertFromPep8( program ):
    oldProgram = program
    # Program text transforms

util/versioncheck.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 from subprocess import check_output as co
 from sys import exit, version_info

util/vm/build.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python2.7
+#!/usr/bin/python2
 
 """
 build.py: build a Mininet VM
@@ -954,7 +954,8 @@ def bootAndRun( image, prompt=Prompt, memory=1024, cpuCores=1, outputFile=None,
     log( '* Creating COW disk', cow )
     run( 'qemu-img create -f qcow2 -b %s %s' % ( image, cow ) )
     log( '* Extracting kernel and initrd' )
-    kernel, initrd, part = extractKernel( image, flavor=basename, imageDir=tmpdir )
+    kernel, initrd, partnum = extractKernel(
+        image, flavor=basename, imageDir=tmpdir )
     if LogToConsole:
         logfile = stdout
     else:
@@ -962,7 +963,7 @@ def bootAndRun( image, prompt=Prompt, memory=1024, cpuCores=1, outputFile=None,
                                       suffix='.testlog', delete=False )
     log( '* Logging VM output to', logfile.name )
     vm = boot( cow=cow, kernel=kernel, initrd=initrd, logfile=logfile,
-               memory=memory, cpuCores=cpuCores, part=part )
+               memory=memory, cpuCores=cpuCores, partnum=partnum )
     login( vm )
     log( '* Waiting for prompt after login' )
     vm.expect( prompt )