First commit updating Mininet to version 2.3.0r1. Also updating install script

Author: Caio92

INSTALL_mininet

@@ -2,7 +2,7 @@
 Mininet Installation/Configuration Notes
 ----------------------------------------
 
-Mininet 2.0.0
+Mininet 2.3.0d1
 ---
 
 The supported installation methods for Mininet are 1) using a
@@ -15,7 +15,7 @@ like to contribute an installation script, we would welcome it!)
 1. Easiest "installation" - use our pre-built VM image!
 
    The easiest way to get Mininet running is to start with one of our
-   pre-built virtual machine images from <http://openflow.org/mininet>
+   pre-built virtual machine images from <http://mininet.org/>
 
    Boot up the VM image, log in, and follow the instructions on the
    Mininet web site.
@@ -42,29 +42,46 @@ like to contribute an installation script, we would welcome it!)
         sudo rm /usr/local/bin/ovs*
         sudo rm /usr/local/sbin/ovs*
 
-3. Native installation from source on Ubuntu 11.10+
+3. Native installation from source
+
+3.1. Native installation from source on Ubuntu 12.04+
 
    If you're reading this, you've probably already done so, but the
    command to download the Mininet source code is:
 
         git clone git://github.com/mininet/mininet.git
 
-   If you are running Ubuntu, you may be able to use our handy
-   `install.sh` script, which is in `mininet/util`.
+   Note that the above git command will check out the latest and greatest
+   Mininet (which we recommend!) If you want to run the last tagged/released
+   version of Mininet, you can look at the release tags using
+
+        cd mininet
+        git tag
+
+    and then
+
+        git checkout <release tag>
+
+   where <release tag> is the release you want to check out.
+
+   If you are running Ubuntu, Debian, or Fedora, you may be able to use
+   our handy `install.sh` script, which is in `util/`.
 
    *WARNING: USE AT YOUR OWN RISK!*
 
    `install.sh` is a bit intrusive and may possibly damage your OS
    and/or home directory, by creating/modifying several directories
-   such as `mininet`, `openflow`, `oftest`, `pox`, or `noxcosre`.
+   such as `mininet`, `openflow`, `oftest`, `pox`, etc.. We recommend
+   trying it in a VM before trying it on a system you use from day to day.
+
    Although we hope it won't do anything completely terrible, you may
    want to look at the script before you run it, and you should make
    sure your system and home directory are backed up just in case!
 
    To install Mininet itself, the OpenFlow reference implementation, and
    Open vSwitch, you may use:
 
-        mininet/util/install.sh -fnv
+        util/install.sh -fnv
 
    This should be reasonably quick, and the following command should
    work after the installation:
@@ -73,14 +90,55 @@ like to contribute an installation script, we would welcome it!)
 
    To install ALL of the software which we use for OpenFlow tutorials,
    including POX, the OpenFlow WireShark dissector, the `oftest`
-   framework, and other potentially useful software (and to add some
-   stuff to `/etc/sysctl.conf` which may or may not be useful) you may
-   use:
+   framework, and other potentially useful software, you may use:
 
-        mininet/util/install.sh -a
+        util/install.sh -a
 
    This takes about 4 minutes on our test system.
 
+   You can change the directory where the dependencies are installed using
+   the -s <directory> flag.
+
+        util/install.sh -s <directory> -a
+
+3.2. Native installation from source on Fedora 18+.
+
+   As root execute the following operations:
+
+    * install git
+
+        yum install git
+
+    * create an user account (e.g. mininet) and add it to the wheel group
+
+        useradd [...] mininet
+        usermod -a -G wheel mininet
+
+    * change the SElinux setting to permissive. It can be done
+      temporarily with:
+
+        setenforce 0
+
+   then login with the new account (e.g. mininet) and do the following:
+
+    * clone the Mininet repository
+
+        git clone git://github.com/mininet/mininet.git
+
+    * install Mininet, the OpenFlow reference implementation, and
+      Open vSwitch
+
+        util/install.sh -fnv
+
+    * enable and start openvswitch
+
+        sudo systemctl enable openvswitch
+        sudo systemctl start openvswitch
+
+    * test the mininet installation
+
+        sudo mn --test pingall
+
 4. Creating your own Mininet/OpenFlow tutorial VM
 
    Creating your own Ubuntu Mininet VM for use with the OpenFlow tutorial
@@ -103,12 +161,10 @@ like to contribute an installation script, we would welcome it!)
 
    * A Linux kernel compiled with network namespace support enabled
 
-   * An OpenFlow implementation (either the reference user or kernel
-     space implementations, or Open vSwitch.) Appropriate kernel
-     modules (e.g. tun and ofdatapath for the reference kernel
-     implementation) must be loaded.
+   * An compatible software switch such as Open vSwitch or
+     the Linux bridge.
 
-   * Python, `bash`, `ping`, `iperf`, etc.`
+   * Python, `bash`, `ping`, `iperf`, etc.
 
    * Root privileges (required for network device access)
 

LICENSE

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

Makefile

@@ -1,18 +1,20 @@
 MININET = mininet/*.py
 TEST = mininet/test/*.py
-EXAMPLES = examples/*.py
+EXAMPLES = mininet/examples/*.py
 MN = bin/mn
-SOURCES = sources/*.py
+PYMN = python -B bin/mn
 BIN = $(MN)
-PYSRC = $(MININET) $(TEST) $(EXAMPLES) $(BIN) $(SOURCES)
+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
 PDF = doc/latex/refman.pdf
 
+CFLAGS += -Wall -Wextra
+
 all: codecheck test
 
 clean:
@@ -23,7 +25,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"
@@ -35,14 +38,21 @@ 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 $@
+	cc $(CFLAGS) $(LDFLAGS) -DVERSION=\"`PYTHONPATH=. $(PYMN) --version`\" $< -o $@
 
-install:
+install: $(MNEXEC) $(MANPAGES)
+	install $(MNEXEC) $(BINDIR)
+	install $(MANPAGES) $(MANDIR)
 	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
@@ -51,11 +61,11 @@ man: $(MANPAGES)
 
 mn.1: $(MN)
 	PYTHONPATH=. help2man -N -n "create a Mininet network." \
-	--no-discard-stderr $< -o $@
+	--no-discard-stderr "$(PYMN)" -o $@
 
 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_mininet.md

@@ -1,10 +1,9 @@
-
 Mininet: Rapid Prototyping for Software Defined Networks
 ========================================================
 
 *The best way to emulate almost any network on your laptop!*
 
-Version 2.0.0
+Mininet 2.3.0d1
 
 ### What is Mininet?
 
@@ -67,32 +66,27 @@ Mininet includes:
 
   `mn -c`
 
-### New features in 2.0.0
-
-Mininet 2.0.0 is a major upgrade and provides
-a number of enhancements and new features, including:
-
-* "Mininet-HiFi" functionality:
-
-    * Link bandwidth limits using `tc` (`TCIntf` and `TCLink` classes)
-
-    * CPU isolation and bandwidth limits (`CPULimitedHost` class)
+### New features in this release
 
-* Support for Open vSwitch 1.4+ (including Ubuntu OVS packages)
+This is primarily a performance improvement and bug fix release.
 
-* Debian packaging (and `apt-get install mininet` in Ubuntu 12.10)
+- Batch startup has been implemented for Open vSwitch, improving
+  startup performance.
 
-* First-class Interface (`Intf`) and Link (`Link`) classes for easier
-  extensibility
+- OVS patch links have been implemented via OVSLink and --link ovs
 
-* An upgraded Topology (`Topo`) class which supports node and link
-  customization
+  Warning! These links have *serious limitations* compared to
+  virtual Ethernet pairs: they are not attached to real Linux
+  interfaces so you cannot use tcpdump or wireshark with them;
+  they also cannot be used in long chains - we don't recommend more
+  than 64 OVSLinks, for example --linear,64. However, they can offer
+  significantly better performance than veth pairs, for certain
+  configurations.
 
-* Man pages for the `mn` and `mnexec` utilities.
+- You can now easily install Mininet on a Raspberry Pi ;-)
 
-[Since the API (most notably the topology) has changed, existing code
-that runs in Mininet 1.0 will need to be changed to run with Mininet
-2.0. This is the primary reason for the major version number change.]
+- Additional information for this release and previous releases
+  may be found in the release notes on docs.mininet.org
 
 ### Installation
 
@@ -103,7 +97,7 @@ See `INSTALL` for installation instructions and details.
 In addition to the API documentation (`make doc`), much useful
 information, including a Mininet walkthrough and an introduction
 to the Python API, is available on the
-[Mininet Web Site](http://openflow.org/mininet).
+[Mininet Web Site](http://mininet.org).
 There is also a wiki which you are encouraged to read and to
 contribute to, particularly the Frequently Asked Questions (FAQ.)
 
@@ -114,21 +108,22 @@ Mininet mailing list, `mininet-discuss` at:
 
 <https://mailman.stanford.edu/mailman/listinfo/mininet-discuss>
 
-### Contributing
+### Join Us
 
-Mininet is an open-source project and is currently hosted at
-<https://github.com/mininet>. You are encouraged to download the code,
-examine it, modify it, and submit bug reports, bug fixes, feature
-requests, and enhancements!
+Thanks again to all of the Mininet contributors!
 
-Best wishes, and we look forward to seeing what you can do with
-Mininet to change the networking world!
+Mininet is an open source project and is currently hosted
+at <https://github.com/mininet>.  You are encouraged to download
+the code, examine it, modify it, and submit bug reports, bug fixes,
+feature requests, new features and other issues and pull requests.
+Thanks to everyone who has contributed code to the Mininet project
+(see CONTRIBUTORS for more info!) It is because of everyone's
+hard work that Mininet continues to grow and improve.
 
-### Credits
+### Enjoy Mininet
 
-The Mininet Team:
+Best wishes, and we look forward to seeing what you can do with
+Mininet to change the networking world!
 
-* Bob Lantz
-* Brandon Heller
-* Nikhil Handigol
-* Vimal Jeyakumar
+Bob Lantz
+Mininet Core Team

bin/miniccnxedit

@@ -56,8 +56,8 @@ from sources.miniccnx import CCNTopo, execute
 
 print 'MiniCCNxEdit running...' #+VERSION
 MININET_VERSION = re.sub(r'[^\d\.]', '', VERSION)
-if StrictVersion(MININET_VERSION) > StrictVersion('2.0'):
-    from mininet.node import IVSSwitch
+#if StrictVersion(MININET_VERSION) > StrictVersion('2.0'):
+#    from mininet.node import IVSSwitch
 
 TOPODEF = 'none'
 TOPOS = { 'minimal': lambda: SingleSwitchTopo( k=2 ),
@@ -3135,13 +3135,14 @@ class MiniEdit( Frame ):
              self.selection not in self.itemToWidget ):
             return
         name = self.itemToWidget[ self.selection ][ 'text' ]
+	#pdb.set_trace()
         if name not in self.net.nameToNode:
             return
         term = makeTerm( self.net.nameToNode[ name ], 'Host', term=self.appPrefs['terminalType'] )
-        if StrictVersion(MININET_VERSION) > StrictVersion('2.0'):
-            self.net.terms += term
-        else:
-            self.net.terms.append(term)
+        #if StrictVersion(MININET_VERSION) > StrictVersion('2.0'):
+            #self.net.terms += term
+        #else:
+        self.net.terms.append(term)
 
     def iperf( self, _ignore=None ):
         "Make an xterm when a button is pressed."