Merge pull request #286 from lantz/devel/ovsbatch

Enable batch startup/shutdown of OVS Not perfect, but it moves us forward at least.
2014-04-13 18:44:11 -07:00
parent bffe045267 d82900d3a8
commit 14e14f1b87
3 changed files with 27 additions and 22 deletions
@@ -408,9 +408,10 @@ class Mininet( object ):
            info( '*** Stopping %i terms\n' % len( self.terms ) )
            self.stopXterms()
        info( '*** Stopping %i switches\n' % len( self.switches ) )
-        swclass = type( self.switches[ 0 ] )
-        if False and self.switches and hasattr( swclass, 'batchShutdown' ):
-            swclass.batchShutdown( self.switches )
+        if self.switches:
+            swclass = type( self.switches[ 0 ] )
+            if hasattr( swclass, 'batchShutdown' ):
+                swclass.batchShutdown( self.switches )
        for switch in self.switches:
            info( switch.name + ' ' )
            switch.stop()