Pass code check

This commit is contained in:
Bob Lantz
2015-02-04 04:43:02 -08:00
parent 340bf3cb7a
commit d7e01bb821
+5 -4
View File
@@ -111,7 +111,7 @@ class ClusterCleanup( object ):
inited = False inited = False
serveruser = {} serveruser = {}
@classmethod @classmethod
def add( cls, server, user='' ): def add( cls, server, user='' ):
"Add an entry to server: user dict" "Add an entry to server: user dict"
@@ -120,7 +120,7 @@ class ClusterCleanup( object ):
if not user: if not user:
user = findUser() user = findUser()
cls.serveruser[ server ] = user cls.serveruser[ server ] = user
@classmethod @classmethod
def cleanup( cls ): def cleanup( cls ):
"Clean up" "Clean up"
@@ -333,7 +333,7 @@ class RemoteOVSSwitch( RemoteMixin, OVSSwitch ):
switch = group[ 0 ] switch = group[ 0 ]
OVSSwitch.batchStartup( group, run=switch.cmd ) OVSSwitch.batchStartup( group, run=switch.cmd )
return switches return switches
@classmethod @classmethod
def batchShutdown( cls, switches, **_kwargs ): def batchShutdown( cls, switches, **_kwargs ):
"Stop switches in per-server batches" "Stop switches in per-server batches"
@@ -454,7 +454,8 @@ class RemoteLink( Link ):
if not addr: if not addr:
result = node.cmd( 'ip link set tap9 name', intf ) result = node.cmd( 'ip link set tap9 name', intf )
else: else:
result = node.cmd( 'ip link set tap9 name', intf, 'address', addr ) result = node.cmd( 'ip link set tap9 name', intf,
'address', addr )
if result: if result:
raise Exception( 'error renaming %s: %s' % ( intf, result ) ) raise Exception( 'error renaming %s: %s' % ( intf, result ) )
return tunnel return tunnel