Reinstantiated inNamespace and routed control network.

We need to figure out how to specify the IP addresses for the
routed control network. For now I'm going back to 192.168.12x.y

Also changed controller params to use IP strings rather than
numbers. However, we still need to clarify what ControllerParams
is actually for.
This commit is contained in:
Bob Lantz
2010-03-09 21:48:14 -08:00
parent 47dbca2921
commit d44a5843d3
4 changed files with 156 additions and 112 deletions
+3 -3
View File
@@ -20,7 +20,7 @@ class testSingleSwitch( unittest.TestCase ):
"Ping test with both datapaths on minimal topology"
init()
for switch in SWITCHES.values():
controllerParams = ControllerParams( 0x0a000000, 8 ) # 10.0.0.0/8
controllerParams = ControllerParams( '10.0.0.0', 8 )
mn = Mininet( SingleSwitchTopo(), switch, Host, Controller,
controllerParams )
dropped = mn.run( 'ping' )
@@ -30,7 +30,7 @@ class testSingleSwitch( unittest.TestCase ):
"Ping test with both datapaths on 5-host single-switch topology"
init()
for switch in SWITCHES.values():
controllerParams = ControllerParams( 0x0a000000, 8 ) # 10.0.0.0/8
controllerParams = ControllerParams( '10.0.0.0', 8 )
mn = Mininet( SingleSwitchTopo( k=5 ), switch, Host, Controller,
controllerParams )
dropped = mn.run( 'ping' )
@@ -44,7 +44,7 @@ class testLinear( unittest.TestCase ):
"Ping test with both datapaths on a 5-switch topology"
init()
for switch in SWITCHES.values():
controllerParams = ControllerParams( 0x0a000000, 8 ) # 10.0.0.0/8
controllerParams = ControllerParams( '10.0.0.0', 8 )
mn = Mininet( LinearTopo( k=5 ), switch, Host, Controller,
controllerParams )
dropped = mn.run( 'ping' )