lab/mininet
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brian O'Connor
2013-12-12 15:56:41 -08:00
parent 49994c8915 17dbc7e055
commit 50423936b2
7 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
INSTALL
+1 -1
View File
@@ -2,7 +2,7 @@
Mininet Installation/Configuration Notes Mininet Installation/Configuration Notes
---------------------------------------- ----------------------------------------
Mininet 2.1.0 Mininet 2.1.0+
--- ---
The supported installation methods for Mininet are 1) using a The supported installation methods for Mininet are 1) using a
LICENSE
+1 -1
View File
@@ -1,4 +1,4 @@
Mininet 2.1.0 License Mininet 2.1.0+ License
Copyright (c) 2013 Open Networking Laboratory Copyright (c) 2013 Open Networking Laboratory
Copyright (c) 2009-2012 Bob Lantz and The Board of Trustees of Copyright (c) 2009-2012 Bob Lantz and The Board of Trustees of
README.md
+4 -4
View File
@@ -3,7 +3,7 @@ Mininet: Rapid Prototyping for Software Defined Networks
*The best way to emulate almost any network on your laptop!* *The best way to emulate almost any network on your laptop!*
Version 2.1.0 Version 2.1.0+
### What is Mininet? ### What is Mininet?
@@ -66,9 +66,9 @@ Mininet includes:
`mn -c` `mn -c`
### New features in 2.1.0 ### New features in 2.1.0+
Mininet 2.1.0 provides a number of bug fixes as well as Mininet 2.1.0+ provides a number of bug fixes as well as
several new features, including: several new features, including:
* Convenient access to `Mininet()` as a dict of nodes * Convenient access to `Mininet()` as a dict of nodes
@@ -127,7 +127,7 @@ Mininet to change the networking world!
### Credits ### Credits
The Mininet 2.1.0 Team: The Mininet 2.1.0+ Team:
* Bob Lantz * Bob Lantz
* Brian O'Connor * Brian O'Connor
mininet/net.py
+1 -1
View File
@@ -102,7 +102,7 @@ from mininet.util import macColonHex, ipStr, ipParse, netParse, ipAdd
from mininet.term import cleanUpScreens, makeTerms from mininet.term import cleanUpScreens, makeTerms
# Mininet version: should be consistent with README and LICENSE # Mininet version: should be consistent with README and LICENSE
VERSION = "2.1.0" VERSION = "2.1.0+"
class Mininet( object ): class Mininet( object ):
"Network emulation with hosts spawned in network namespaces." "Network emulation with hosts spawned in network namespaces."
mininet/test/test_walkthrough.py
-1
View File
@@ -9,7 +9,6 @@ TODO: missing xterm test
import unittest import unittest
import pexpect import pexpect
import os import os
from time import sleep
from mininet.util import quietRun from mininet.util import quietRun
class testWalkthrough( unittest.TestCase ): class testWalkthrough( unittest.TestCase ):
util/versioncheck.py
+1 -1
View File
@@ -8,7 +8,7 @@ version = 'Mininet ' + co( 'PYTHONPATH=. bin/mn --version', shell=True )
version = version.strip() version = version.strip()
# Find all Mininet path references # Find all Mininet path references
lines = co( "grep -or 'Mininet \w\.\w\.\w\w*' *", shell=True ) lines = co( "grep -or 'Mininet \w\+\.\w\+\.\w\+[+]*' *", shell=True )
error = False error = False