Add option to turn off passive listening port
This commit is contained in:
@@ -179,6 +179,8 @@ class MininetRunner( object ):
|
|||||||
opts.add_option( '--listenport', type='int', default=6634,
|
opts.add_option( '--listenport', type='int', default=6634,
|
||||||
help='[base port for passive switch listening'
|
help='[base port for passive switch listening'
|
||||||
' controller]' )
|
' controller]' )
|
||||||
|
opts.add_option( '--nolistenport', action='store_true',
|
||||||
|
default=False, help="don't use passive listening port")
|
||||||
opts.add_option( '--pre', type='string', default=None,
|
opts.add_option( '--pre', type='string', default=None,
|
||||||
help='[CLI script to run before tests]' )
|
help='[CLI script to run before tests]' )
|
||||||
opts.add_option( '--post', type='string', default=None,
|
opts.add_option( '--post', type='string', default=None,
|
||||||
@@ -225,6 +227,8 @@ class MininetRunner( object ):
|
|||||||
xterms = self.options.xterms
|
xterms = self.options.xterms
|
||||||
mac = self.options.mac
|
mac = self.options.mac
|
||||||
arp = self.options.arp
|
arp = self.options.arp
|
||||||
|
listenPort = None
|
||||||
|
if not self.options.nolistenport:
|
||||||
listenPort = self.options.listenport
|
listenPort = self.options.listenport
|
||||||
mn = Mininet( topo, switch, host, controller, controllerParams,
|
mn = Mininet( topo, switch, host, controller, controllerParams,
|
||||||
inNamespace=inNamespace,
|
inNamespace=inNamespace,
|
||||||
|
|||||||
+1
-1
@@ -174,7 +174,7 @@ class Mininet( object ):
|
|||||||
sw = self.switch( name, listenPort=self.listenPort,
|
sw = self.switch( name, listenPort=self.listenPort,
|
||||||
defaultMAC=mac, defaultIP=ip, dp=self.dps,
|
defaultMAC=mac, defaultIP=ip, dp=self.dps,
|
||||||
inNamespace=self.inNamespace )
|
inNamespace=self.inNamespace )
|
||||||
if not self.inNamespace:
|
if not self.inNamespace and self.listenPort:
|
||||||
self.listenPort += 1
|
self.listenPort += 1
|
||||||
self.dps += 1
|
self.dps += 1
|
||||||
self.switches.append( sw )
|
self.switches.append( sw )
|
||||||
|
|||||||
Reference in New Issue
Block a user