From e02e338e3c7eda2f36442c3f147316ce455202d1 Mon Sep 17 00:00:00 2001
From: lantz <rlantz@cs.stanford.edu>
Date: Sun, 3 Jan 2021 22:24:28 -0800
Subject: [PATCH] intfoptions and test adjustments (#992)

* 2.3.0a1

* intfoptions and test_intfoptions tweaks

also added cleanup() to test_walkthrough fixture
---
 INSTALL                           |  2 +-
 LICENSE                           |  4 ++--
 README.md                         | 19 +++++--------------
 examples/intfoptions.py           |  6 +++---
 examples/test/test_intfoptions.py |  2 +-
 mininet/net.py                    |  2 +-
 mininet/test/test_walkthrough.py  |  6 ++++++
 7 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/INSTALL b/INSTALL
index 960a438..23327c3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,7 +2,7 @@
 Mininet Installation/Configuration Notes
 ----------------------------------------
 
-Mininet 2.3.0d6
+Mininet 2.3.0a1
 ---
 
 The supported installation methods for Mininet are 1) using a
diff --git a/LICENSE b/LICENSE
index 846f4fe..73a2f67 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
-Mininet 2.3.0d6 License
+Mininet 2.3.0a1 License
 
-Copyright (c) 2013-2019 Open Networking Laboratory
+Copyright (c) 2013-2020 Open Networking Foundation
 Copyright (c) 2009-2012 Bob Lantz and The Board of Trustees of
 The Leland Stanford Junior University
 
diff --git a/README.md b/README.md
index 28b1652..6e48ad0 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ Mininet: Rapid Prototyping for Software Defined Networks
 ========================================================
 *The best way to emulate almost any network on your laptop!*
 
-Mininet 2.3.0d6
+Mininet 2.3.0a1
 
 [![Build Status][2]](https://github.com/mininet/mininet/actions)
 [![Travis Status][1]](https://travis-ci.org/mininet/mininet)
@@ -73,20 +73,11 @@ Mininet includes:
 
 This is primarily a performance improvement and bug fix release.
 
-- Batch startup has been implemented for Open vSwitch, improving
-  startup performance.
+- Python 3 support (Python 2 is still supported as well)
 
-- OVS patch links have been implemented via OVSLink and --link ovs
+- Support for Ubuntu 20.04
 
-  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.
-
-- You can now easily install Mininet on a Raspberry Pi ;-)
+- More reliable testing and CI via github actions
 
 - Additional information for this release and previous releases
   may be found in the release notes on docs.mininet.org
@@ -129,7 +120,7 @@ Best wishes, and we look forward to seeing what you can do with
 Mininet to change the networking world!
 
 Bob Lantz
-Mininet Core Team
+on behalf of the Mininet Contributors
 
 [1]: https://travis-ci.org/mininet/mininet.svg?branch=master
 [2]: https://github.com/mininet/mininet/workflows/mininet-tests/badge.svg
diff --git a/examples/intfoptions.py b/examples/intfoptions.py
index 183e73b..b1b864e 100755
--- a/examples/intfoptions.py
+++ b/examples/intfoptions.py
@@ -25,10 +25,10 @@ def intfOptions():
     # flush out latency from reactive forwarding delay
     net.pingAll()
 
-    info( '\n*** Configuring one intf with bandwidth of 5 Mb\n' )
-    link1.intf1.config( bw=5 )
+    info( '\n*** Configuring one intf with bandwidth of 10 Mb\n' )
+    link1.intf1.config( bw=10 )
     info( '\n*** Running iperf to test\n' )
-    net.iperf()
+    net.iperf( seconds=10 )
 
     info( '\n*** Configuring one intf with loss of 50%\n' )
     link1.intf1.config( loss=50 )
diff --git a/examples/test/test_intfoptions.py b/examples/test/test_intfoptions.py
index 2d72471..35b45cd 100755
--- a/examples/test/test_intfoptions.py
+++ b/examples/test/test_intfoptions.py
@@ -22,7 +22,7 @@ class testIntfOptions( unittest.TestCase ):
         while True:
             index = p.expect( opts, timeout=600 )
             if index == 0:
-                BW = 5
+                BW = 10
                 bw = float( p.match.group( 1 ) )
                 self.assertGreaterEqual( bw, BW * ( 1 - tolerance ) )
                 self.assertLessEqual( bw, BW * ( 1 + tolerance ) )
diff --git a/mininet/net.py b/mininet/net.py
index 9b94378..84bb7ae 100755
--- a/mininet/net.py
+++ b/mininet/net.py
@@ -108,7 +108,7 @@ from mininet.util import ( quietRun, fixLimits, numCores, ensureRoot,
 from mininet.term import cleanUpScreens, makeTerms
 
 # Mininet version: should be consistent with README and LICENSE
-VERSION = "2.3.0d6"
+VERSION = "2.3.0a1"
 
 class Mininet( object ):
     "Network emulation with hosts spawned in network namespaces."
diff --git a/mininet/test/test_walkthrough.py b/mininet/test/test_walkthrough.py
index 795f956..b3b83fb 100755
--- a/mininet/test/test_walkthrough.py
+++ b/mininet/test/test_walkthrough.py
@@ -10,6 +10,7 @@ import unittest
 import os
 import re
 from mininet.util import quietRun, pexpect
+from mininet.clean import cleanup
 from distutils.version import StrictVersion
 from time import sleep
 
@@ -28,6 +29,11 @@ class testWalkthrough( unittest.TestCase ):
 
     prompt = 'mininet>'
 
+
+    def setup( self ):
+        "Be paranoid and run cleanup() before each test"
+        cleanup()
+
     # PART 1
     def testHelp( self ):
         "Check the usage message"