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

Added port to controller args; changed NOX to new arg format.

Browse Source
This commit is contained in:
Bob Lantz
2010-09-01 19:46:48 -07:00
parent 5c24e18639
commit fe769afa22
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/node.py
+3 -4
View File
@@ -200,7 +200,6 @@ class Node( object ):
"""Monitor and return the output of a command. """Monitor and return the output of a command.
Set self.waiting to False if command has completed. Set self.waiting to False if command has completed.
timeoutms: timeout in ms or None to wait indefinitely.""" timeoutms: timeout in ms or None to wait indefinitely."""
assert self.waiting
self.waitReadable( timeoutms ) self.waitReadable( timeoutms )
data = self.read( 1024 ) data = self.read( 1024 )
# Look for PID # Look for PID
@@ -623,7 +622,7 @@ class Controller( Node ):
OpenFlow controller.""" OpenFlow controller."""
def __init__( self, name, inNamespace=False, controller='controller', def __init__( self, name, inNamespace=False, controller='controller',
cargs='-v ptcp:', cdir=None, defaultIP="127.0.0.1", cargs='-v ptcp:%d', cdir=None, defaultIP="127.0.0.1",
port=6633 ): port=6633 ):
self.controller = controller self.controller = controller
self.cargs = cargs self.cargs = cargs
@@ -639,7 +638,7 @@ class Controller( Node ):
cout = '/tmp/' + self.name + '.log' cout = '/tmp/' + self.name + '.log'
if self.cdir is not None: if self.cdir is not None:
self.cmd( 'cd ' + self.cdir ) self.cmd( 'cd ' + self.cdir )
self.cmd( self.controller + ' ' + self.cargs + self.cmd( self.controller + ' ' + self.cargs % self.port +
' 1>' + cout + ' 2>' + cout + '&' ) ' 1>' + cout + ' 2>' + cout + '&' )
self.execed = False self.execed = False
@@ -684,7 +683,7 @@ class NOX( Controller ):
Controller.__init__( self, name, Controller.__init__( self, name,
controller=noxCoreDir + '/nox_core', controller=noxCoreDir + '/nox_core',
cargs='--libdir=/usr/local/lib -v -i ptcp: ' + cargs='--libdir=/usr/local/lib -v -i ptcp::%s ' % self.port +
' '.join( noxArgs ), ' '.join( noxArgs ),
cdir=noxCoreDir, **kwargs ) cdir=noxCoreDir, **kwargs )