From 47e26cce19350615e6f29d62fe914b0a9155a139 Mon Sep 17 00:00:00 2001
From: Bob Lantz <rlantz@cs.stanford.edu>
Date: Thu, 4 Mar 2010 16:55:21 -0800
Subject: [PATCH] Fixed to be compatible with new setIP().
---
examples/scratchnet.py | 10 ++++++----
examples/scratchnetuser.py | 18 ++++++++++--------
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/examples/scratchnet.py b/examples/scratchnet.py
index 030d0dde..43f070d7 100755
--- a/examples/scratchnet.py
+++ b/examples/scratchnet.py
@@ -26,8 +26,8 @@ def scratchNet( cname='controller', cargs='ptcp:'):
createLink( node1=h1, port1=0, node2=switch, port2=1 )
info( "*** Configuring hosts\n" )
- h0.setIP( h0.intfs[ 0 ], '192.168.123.1', '/24' )
- h1.setIP( h1.intfs[ 0 ], '192.168.123.2', '/24' )
+ h0.setIP( h0.intfs[ 0 ], '192.168.123.1', 24 )
+ h1.setIP( h1.intfs[ 0 ], '192.168.123.2', 24 )
info( str( h0 ) + '\n' )
info( str( h1 ) + '\n' )
@@ -46,9 +46,11 @@ def scratchNet( cname='controller', cargs='ptcp:'):
controller.cmd( 'kill %' + cname)
switch.cmd( 'dpctl deldp nl:0' )
switch.cmd( 'kill %ofprotocol' )
-
+ switch.deleteIntfs()
+ info( '\n' )
+
if __name__ == '__main__':
+ lg.setLogLevel( 'info' )
info( '*** Scratch network demo (kernel datapath)\n' )
init()
- lg.setLogLevel( 'info' )
scratchNet()
diff --git a/examples/scratchnetuser.py b/examples/scratchnetuser.py
index 345a2af0..792017f9 100755
--- a/examples/scratchnetuser.py
+++ b/examples/scratchnetuser.py
@@ -13,7 +13,7 @@
from mininet.util import createLink
from mininet.log import lg, info
-def scratchNetUser( cname='controller', cargs='ptcp:'):
+def scratchNetUser( cname='controller', cargs='ptcp:' ):
# Create Network
# It's not strictly necessary for the controller and switches
# to be in separate namespaces. For performance, they probably
@@ -30,12 +30,12 @@ def scratchNetUser( cname='controller', cargs='ptcp:'):
createLink( h1, 0, switch, 2 )
info( '*** Configuring control network\n' )
- controller.setIP( controller.intfs[ 0 ], '10.0.123.1', '/24' )
- switch.setIP( switch.intfs[ 0 ], '10.0.123.2', '/24' )
+ controller.setIP( controller.intfs[ 0 ], '10.0.123.1', 24 )
+ switch.setIP( switch.intfs[ 0 ], '10.0.123.2', 24 )
info( '*** Configuring hosts\n' )
- h0.setIP( h0.intfs[ 0 ], '192.168.123.1', '/24' )
- h1.setIP( h1.intfs[ 0 ], '192.168.123.2', '/24' )
+ h0.setIP( h0.intfs[ 0 ], '192.168.123.1', 24 )
+ h1.setIP( h1.intfs[ 0 ], '192.168.123.2', 24 )
info( '*** Network state:\n' )
for node in controller, switch, h0, h1:
@@ -44,7 +44,7 @@ def scratchNetUser( cname='controller', cargs='ptcp:'):
info( '*** Starting controller and user datapath\n' )
controller.cmd( cname + ' ' + cargs + '&' )
switch.cmd( 'ifconfig lo 127.0.0.1' )
- intfs = [ switch.intfs[ port ] for port in (1, 2) ]
+ intfs = [ switch.intfs[ port ] for port in ( 1, 2 ) ]
switch.cmd( 'ofdatapath -i ' + ','.join( intfs ) + ' ptcp: &' )
switch.cmd( 'ofprotocol tcp:' + controller.IP() + ' tcp:localhost &' )
@@ -55,9 +55,11 @@ def scratchNetUser( cname='controller', cargs='ptcp:'):
controller.cmd( 'kill %' + cname )
switch.cmd( 'kill %ofdatapath' )
switch.cmd( 'kill %ofprotocol' )
-
+ switch.deleteIntfs()
+ info( '\n' )
+
if __name__ == '__main__':
+ lg.setLogLevel( 'info' )
info( '*** Scratch network demo (user datapath)\n' )
init()
- lg.setLogLevel( 'info' )
scratchNetUser()
--
GitLab