Initial text and version updates for 2.1.0

LICENSE

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

README.md

@@ -4,7 +4,7 @@ Mininet: Rapid Prototyping for Software Defined Networks
 
 *The best way to emulate almost any network on your laptop!*
 
-Version 2.0.0
+Version 2.1.0
 
 ### What is Mininet?
 
@@ -67,32 +67,30 @@ Mininet includes:
 
   `mn -c`
 
-### New features in 2.0.0
+### New features in 2.1.0
 
-Mininet 2.0.0 is a major upgrade and provides
-a number of enhancements and new features, including:
+Mininet 2.1.0 provides a number of bug fixes as well as a
+number of new features, including:
 
-* "Mininet-HiFi" functionality:
+* Convenient access to Mininet() as a dict
+* X11 tunneling (wireshark in Mininet hosts!)
+* Accurate reflection of the Mininet() object in the CLI
+* Automatically detecting and adjusting resource limits
+* Automatic cleanup on failure of the `mn` command
+* Support for running OVS in user space mode
+* Preliminary support for the Indigo Virtual Switch (IVSSwitch)
+* The ability to import examples as modules
 
-    * Link bandwidth limits using `tc` (`TCIntf` and `TCLink` classes)
+We have provided several new examples which can also be
+imported to provide useful functionality, including:
 
-    * CPU isolation and bandwidth limits (`CPULimitedHost` class)
+* A simple NAT script to attach Mininet networks to your LAN
+* An example of modeling control and data networks
+* An example of per-host custom directories using bind mounts
 
-* Support for Open vSwitch 1.4+ (including Ubuntu OVS packages)
-
-* Debian packaging (and `apt-get install mininet` in Ubuntu 12.10)
-
-* First-class Interface (`Intf`) and Link (`Link`) classes for easier
-  extensibility
-
-* An upgraded Topology (`Topo`) class which supports node and link
-  customization
-
-* Man pages for the `mn` and `mnexec` utilities.
-
-[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.]
+Note that these are experimental features which may "graduate"
+into mainline Mininet in the future, so they should not be
+considered a stable part of the Mininet API!
 
 ### Installation
 
@@ -116,19 +114,19 @@ Mininet mailing list, `mininet-discuss` at:
 
 ### Contributing
 
-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!
+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 to the project
+(see CONTRIBUTORS for more info!)
 
 Best wishes, and we look forward to seeing what you can do with
 Mininet to change the networking world!
 
 ### Credits
 
-The Mininet Team:
+The Mininet 2.1.0 Team:
 
 * Bob Lantz
-* Brandon Heller
-* Nikhil Handigol
-* Vimal Jeyakumar
+* Brian O'Connor

mininet/net.py

@@ -102,7 +102,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.0.0"
+VERSION = "2.1.0"
 
 class Mininet( object ):
     "Network emulation with hosts spawned in network namespaces."