small fixes for NAT

This commit is contained in:
Brian O'Connor
2013-10-23 13:48:50 -07:00
parent ffeb16eb66
commit e0af160213
3 changed files with 5 additions and 4 deletions
+1 -1
View File
@@ -255,7 +255,7 @@ class MininetRunner( object ):
if self.options.nat: if self.options.nat:
nat = mn.addNAT() nat = mn.addNAT()
mn.configHosts() nat.configDefault()
if self.options.pre: if self.options.pre:
CLI( mn, script=self.options.pre ) CLI( mn, script=self.options.pre )
+2 -2
View File
@@ -26,7 +26,7 @@ from mininet.cli import CLI
from mininet.util import irange from mininet.util import irange
class InternetTopo(Topo): class InternetTopo(Topo):
"Single switch connected to n hosts." "TODO: Single switch connected to n hosts."
def __init__(self, n=2, h=1, **opts): def __init__(self, n=2, h=1, **opts):
Topo.__init__(self, **opts) Topo.__init__(self, **opts)
@@ -57,7 +57,7 @@ class InternetTopo(Topo):
self.addLink(host, switch) self.addLink(host, switch)
def run(): def run():
"Create network and run simple performance test" "TODO: Create network and run simple performance test"
topo = InternetTopo() topo = InternetTopo()
net = Mininet(topo=topo) net = Mininet(topo=topo)
net.start() net.start()
+2 -1
View File
@@ -36,6 +36,8 @@ RemoteController: a remote controller node, which may use any
arbitrary OpenFlow-compatible controller, and which is not arbitrary OpenFlow-compatible controller, and which is not
created or managed by mininet. created or managed by mininet.
TODO: NAT
Future enhancements: Future enhancements:
- Possibly make Node, Switch and Controller more abstract so that - Possibly make Node, Switch and Controller more abstract so that
@@ -1309,4 +1311,3 @@ class NAT( Node ):
self.cmd( 'sysctl net.ipv4.ip_forward=0' ) self.cmd( 'sysctl net.ipv4.ip_forward=0' )
super( NAT, self ).terminate() super( NAT, self ).terminate()