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

Rename Controller.controller to .command

Browse Source
This commit is contained in:
Bob Lantz
2010-09-01 20:52:29 -07:00
parent e30f2c99c2
commit 57fd19efaa
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/node.py
+7 -7
View File
@@ -464,7 +464,7 @@ class UserSwitch( Switch ):
"""Init. """Init.
name: name for the switch""" name: name for the switch"""
Switch.__init__( self, name, **kwargs ) Switch.__init__( self, name, **kwargs )
pathCheck( 'ofdatapath', 'ofprotocol', pathCheck( 'ofdatapath', 'ofprotocol',
moduleName='the OpenFlow reference user switch (openflow.org)' ) moduleName='the OpenFlow reference user switch (openflow.org)' )
@staticmethod @staticmethod
@@ -621,10 +621,10 @@ class Controller( Node ):
"""A Controller is a Node that is running (or has execed?) an """A Controller is a Node that is running (or has execed?) an
OpenFlow controller.""" OpenFlow controller."""
def __init__( self, name, inNamespace=False, controller='controller', def __init__( self, name, inNamespace=False, command='controller',
cargs='-v ptcp:%d', 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.command = command
self.cargs = cargs self.cargs = cargs
self.cdir = cdir self.cdir = cdir
self.port = port self.port = port
@@ -634,17 +634,17 @@ class Controller( Node ):
def start( self ): def start( self ):
"""Start <controller> <args> on controller. """Start <controller> <args> on controller.
Log to /tmp/cN.log""" Log to /tmp/cN.log"""
pathCheck( self.controller ) pathCheck( self.command )
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.port + self.cmd( self.command + ' ' + self.cargs % self.port +
' 1>' + cout + ' 2>' + cout + '&' ) ' 1>' + cout + ' 2>' + cout + '&' )
self.execed = False self.execed = False
def stop( self ): def stop( self ):
"Stop controller." "Stop controller."
self.cmd( 'kill %' + self.controller ) self.cmd( 'kill %' + self.command )
self.terminate() self.terminate()
def IP( self, intf=None ): def IP( self, intf=None ):
@@ -682,7 +682,7 @@ class NOX( Controller ):
noxCoreDir = os.environ[ 'NOX_CORE_DIR' ] noxCoreDir = os.environ[ 'NOX_CORE_DIR' ]
Controller.__init__( self, name, Controller.__init__( self, name,
controller=noxCoreDir + '/nox_core', command=noxCoreDir + '/nox_core',
cargs='--libdir=/usr/local/lib -v -i ptcp:%s ' % self.port + cargs='--libdir=/usr/local/lib -v -i ptcp:%s ' % self.port +
' '.join( noxArgs ), ' '.join( noxArgs ),
cdir=noxCoreDir, **kwargs ) cdir=noxCoreDir, **kwargs )