Stub out RemoteOVSSwitch.batchShutdown()

Eventually we should implement true batch shutdown.
In the mean time, we just ignore it. Note there's no good
way that I know of for a subclass to remove a superclass
method, so we changed the protocol a bit to require a return
value of True.
This commit is contained in:
Bob Lantz
2015-01-15 02:43:38 -08:00
parent b1983548aa
commit c1b48fb5c8
3 changed files with 8 additions and 2 deletions
+5
View File
@@ -292,6 +292,11 @@ class RemoteOVSSwitch( RemoteMixin, OVSSwitch ):
return ( StrictVersion( cls.OVSVersions[ self.server ] ) <
StrictVersion( '1.10' ) )
@classmethod
def batchShutdown( cls, *args, **kwargs ):
"Not implemented yet"
return False
class RemoteLink( Link ):
"A RemoteLink is a link between nodes which may be on different servers"
+2 -2
View File
@@ -505,8 +505,8 @@ class Mininet( object ):
for swclass, switches in groupby(
sorted( self.switches, key=type ), type ):
switches = tuple( switches )
if hasattr( swclass, 'batchShutdown' ):
swclass.batchShutdown( switches )
if ( hasattr( swclass, 'batchShutdown' ) and
swclass.batchShutdown( switches ) ):
stopped.update( { s: s for s in switches } )
for switch in self.switches:
info( switch.name + ' ' )
+1
View File
@@ -1103,6 +1103,7 @@ class OVSSwitch( Switch ):
quietRun( 'ovs-vsctl ' +
' -- '.join( '--if-exists del-br %s' % s
for s in switches ) )
return True
def dpctl( self, *args ):
"Run ovs-ofctl command"