Remove shared reconnectms, improve self.started

lantz · lantz · commit 9ca6322603f5 · 2015-01-26T14:06:23.000-08:00
We still need to set it in batchShutdown()
diff --git a/mininet/node.py b/mininet/node.py
@@ -1273,20 +1273,13 @@ def connected( self ):
 class OVSBatch( OVSSwitch ):
     "Experiment: batch startup of OVS switches"
 
-    reconnectms = 1000  # shared for all switches
-    
     # This should be ~ int( quietRun( 'getconf ARG_MAX' ) ),
     # but the real limit seems to be much lower
     argmax = 128000
     
     def __init__( self, *args, **kwargs ):
         self.commands = []
         self.started = False
-        # Use global rather than local reconnectms
-        reconnectms = kwargs.pop( 'reconnectms', 1000 )
-        self.__class__.reconnectms = max( reconnectms,
-                                          self.__class__.reconnectms )
-        kwargs.update( reconnectms=None )
         super( OVSBatch, self ).__init__( *args, **kwargs )
 
     @classmethod
@@ -1316,6 +1309,14 @@ def vsctl( self, *args, **kwargs ):
         cmd = ' '.join( str( arg ).strip() for arg in args )
         self.commands.append( cmd )
 
+    def start( self, *args, **kwargs ):
+        super( OVSBatch, self ).start( *args, **kwargs )
+        self.started = True
+ 
+    def stop( self, *args, **kwargs ):
+        super( OVSBatch, self ).stop( *args, **kwargs )
+        self.started = False
+         
     def cleanup( self):
         "Don't bother to clean up"
         return
