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

Fixed to be compatible with new setIP().

Browse Source
This commit is contained in:
Bob Lantz
2010-03-04 16:55:21 -08:00
parent 086ef80e8e
commit 47e26cce19
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/scratchnet.py
+6 -4
View File
@@ -26,8 +26,8 @@ def scratchNet( cname='controller', cargs='ptcp:'):
createLink( node1=h1, port1=0, node2=switch, port2=1 ) createLink( node1=h1, port1=0, node2=switch, port2=1 )
info( "*** Configuring hosts\n" ) info( "*** Configuring hosts\n" )
h0.setIP( h0.intfs[ 0 ], '192.168.123.1', '/24' ) h0.setIP( h0.intfs[ 0 ], '192.168.123.1', 24 )
h1.setIP( h1.intfs[ 0 ], '192.168.123.2', '/24' ) h1.setIP( h1.intfs[ 0 ], '192.168.123.2', 24 )
info( str( h0 ) + '\n' ) info( str( h0 ) + '\n' )
info( str( h1 ) + '\n' ) info( str( h1 ) + '\n' )
@@ -46,9 +46,11 @@ def scratchNet( cname='controller', cargs='ptcp:'):
controller.cmd( 'kill %' + cname) controller.cmd( 'kill %' + cname)
switch.cmd( 'dpctl deldp nl:0' ) switch.cmd( 'dpctl deldp nl:0' )
switch.cmd( 'kill %ofprotocol' ) switch.cmd( 'kill %ofprotocol' )
switch.deleteIntfs()
info( '\n' )
if __name__ == '__main__': if __name__ == '__main__':
lg.setLogLevel( 'info' )
info( '*** Scratch network demo (kernel datapath)\n' ) info( '*** Scratch network demo (kernel datapath)\n' )
init() init()
lg.setLogLevel( 'info' )
scratchNet() scratchNet()
examples/scratchnetuser.py
+10 -8
View File
@@ -13,7 +13,7 @@ from mininet.node import Node
from mininet.util import createLink from mininet.util import createLink
from mininet.log import lg, info from mininet.log import lg, info
def scratchNetUser( cname='controller', cargs='ptcp:'): def scratchNetUser( cname='controller', cargs='ptcp:' ):
# Create Network # Create Network
# It's not strictly necessary for the controller and switches # It's not strictly necessary for the controller and switches
# to be in separate namespaces. For performance, they probably # to be in separate namespaces. For performance, they probably
@@ -30,12 +30,12 @@ def scratchNetUser( cname='controller', cargs='ptcp:'):
createLink( h1, 0, switch, 2 ) createLink( h1, 0, switch, 2 )
info( '*** Configuring control network\n' ) info( '*** Configuring control network\n' )
controller.setIP( controller.intfs[ 0 ], '10.0.123.1', '/24' ) controller.setIP( controller.intfs[ 0 ], '10.0.123.1', 24 )
switch.setIP( switch.intfs[ 0 ], '10.0.123.2', '/24' ) switch.setIP( switch.intfs[ 0 ], '10.0.123.2', 24 )
info( '*** Configuring hosts\n' ) info( '*** Configuring hosts\n' )
h0.setIP( h0.intfs[ 0 ], '192.168.123.1', '/24' ) h0.setIP( h0.intfs[ 0 ], '192.168.123.1', 24 )
h1.setIP( h1.intfs[ 0 ], '192.168.123.2', '/24' ) h1.setIP( h1.intfs[ 0 ], '192.168.123.2', 24 )
info( '*** Network state:\n' ) info( '*** Network state:\n' )
for node in controller, switch, h0, h1: for node in controller, switch, h0, h1:
@@ -44,7 +44,7 @@ def scratchNetUser( cname='controller', cargs='ptcp:'):
info( '*** Starting controller and user datapath\n' ) info( '*** Starting controller and user datapath\n' )
controller.cmd( cname + ' ' + cargs + '&' ) controller.cmd( cname + ' ' + cargs + '&' )
switch.cmd( 'ifconfig lo 127.0.0.1' ) 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( 'ofdatapath -i ' + ','.join( intfs ) + ' ptcp: &' )
switch.cmd( 'ofprotocol tcp:' + controller.IP() + ' tcp:localhost &' ) switch.cmd( 'ofprotocol tcp:' + controller.IP() + ' tcp:localhost &' )
@@ -55,9 +55,11 @@ def scratchNetUser( cname='controller', cargs='ptcp:'):
controller.cmd( 'kill %' + cname ) controller.cmd( 'kill %' + cname )
switch.cmd( 'kill %ofdatapath' ) switch.cmd( 'kill %ofdatapath' )
switch.cmd( 'kill %ofprotocol' ) switch.cmd( 'kill %ofprotocol' )
switch.deleteIntfs()
info( '\n' )
if __name__ == '__main__': if __name__ == '__main__':
lg.setLogLevel( 'info' )
info( '*** Scratch network demo (user datapath)\n' ) info( '*** Scratch network demo (user datapath)\n' )
init() init()
lg.setLogLevel( 'info' )
scratchNetUser() scratchNetUser()