Use correct command name in OVSController

This commit is contained in:
Bob Lantz
2016-05-24 17:40:00 -07:00
parent e6b0430a87
commit 57abd9baef
+5 -5
View File
@@ -1423,16 +1423,16 @@ class Controller( Node ):
class OVSController( Controller ): class OVSController( Controller ):
"Open vSwitch controller" "Open vSwitch controller"
def __init__( self, name, command='ovs-controller', **kwargs ): def __init__( self, name, **kwargs ):
if quietRun( 'which test-controller' ): kwargs.setdefault( 'command', self.isAvailable() or
command = 'test-controller' 'ovs-controller' )
Controller.__init__( self, name, command=command, **kwargs ) Controller.__init__( self, name, **kwargs )
@classmethod @classmethod
def isAvailable( cls ): def isAvailable( cls ):
return ( quietRun( 'which ovs-controller' ) or return ( quietRun( 'which ovs-controller' ) or
quietRun( 'which test-controller' ) or quietRun( 'which test-controller' ) or
quietRun( 'which ovs-testcontroller' ) ) quietRun( 'which ovs-testcontroller' ) ).strip()
class NOX( Controller ): class NOX( Controller ):
"Controller to run a NOX application." "Controller to run a NOX application."