File tree 5 files changed +17
-8
lines changed
5 files changed +17
-8
lines changed Original file line number Diff line number Diff line change 2
2
Mininet Installation/Configuration Notes
3
3
----------------------------------------
4
4
5
- Mininet 2.3.1b3
5
+ Mininet 2.3.1b4
6
6
---
7
7
8
8
The supported installation methods for Mininet are 1) using a
Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ Mininet: Rapid Prototyping for Software Defined Networks
2
2
========================================================
3
3
* The best way to emulate almost any network on your laptop!*
4
4
5
- Mininet 2.3.1b3
5
+ Mininet 2.3.1b4
6
6
7
7
[ ![ Build Status] [ 1 ]] ( https://github.com/mininet/mininet/actions )
8
8
@@ -70,7 +70,7 @@ Mininet includes:
70
70
71
71
### Python 3 Support
72
72
73
- - Mininet 2.3.1b3 supports Python 3 and Python 2
73
+ - Mininet 2.3.1b4 supports Python 3 and Python 2
74
74
75
75
- You can install both the Python 3 and Python 2 versions of
76
76
Mininet side by side, but the most recent installation will
Original file line number Diff line number Diff line change @@ -49,13 +49,19 @@ def perfTest( lossy=True ):
49
49
net .start ()
50
50
info ( "Dumping host connections\n " )
51
51
dumpNodeConnections (net .hosts )
52
- info ( "Testing bandwidth between h1 and h4\n " )
52
+ info ( "Testing bandwidth between h1 and h4 (lossy=%s) \n " % lossy )
53
53
h1 , h4 = net .getNodeByName ('h1' , 'h4' )
54
54
net .iperf ( ( h1 , h4 ), l4Type = 'UDP' )
55
+ # Debugging
56
+ h1 .cmd ('jobs' )
57
+ h4 .cmd ('jobs' )
55
58
net .stop ()
56
59
57
60
58
61
if __name__ == '__main__' :
59
62
setLogLevel ( 'info' )
63
+ # Debug for now
64
+ if 'testmode' in argv :
65
+ setLogLevel ( 'debug' )
60
66
# Prevent test_simpleperf from failing due to packet loss
61
67
perfTest ( lossy = ( 'testmode' not in argv ) )
Original file line number Diff line number Diff line change @@ -19,9 +19,12 @@ def testE2E( self ):
19
19
# 10 Mb/s, plus or minus 20% tolerance
20
20
BW = 10
21
21
TOLERANCE = .2
22
- p = pexpect .spawn ( 'python -m mininet.examples.simpleperf testmode' )
22
+ p = pexpect .spawn (
23
+ 'python -m mininet.examples.simpleperf testmode' )
24
+ # Log since this seems to be failing intermittently
25
+ p .logfile = sys .stdout
23
26
# check iperf results
24
- p .expect ( "Results: \['10M', '([\d\.]+) .bits/sec" , timeout = 480 )
27
+ p .expect ( "Results: \['10M', '([\d\.]+) .bits/sec" , timeout = 90 )
25
28
measuredBw = float ( p .match .group ( 1 ) )
26
29
lowerBound = BW * ( 1 - TOLERANCE )
27
30
upperBound = BW + ( 1 + TOLERANCE )
@@ -30,5 +33,5 @@ def testE2E( self ):
30
33
p .wait ()
31
34
32
35
if __name__ == '__main__' :
33
- setLogLevel ( 'warning ' )
36
+ setLogLevel ( 'debug ' )
34
37
unittest .main ()
Original file line number Diff line number Diff line change 109
109
from mininet .term import cleanUpScreens , makeTerms
110
110
111
111
# Mininet version: should be consistent with README and LICENSE
112
- VERSION = "2.3.1b3 "
112
+ VERSION = "2.3.1b4 "
113
113
114
114
class Mininet ( object ):
115
115
"Network emulation with hosts spawned in network namespaces."
You can’t perform that action at this time.
0 commit comments