diff --git a/mininet/node.py b/mininet/node.py index 428a72dcf3ece2c884664b6a65a4ec1a5d262727..c0dcbd707f78d658f2ef0c6773a564307c2ba862 100644 --- a/mininet/node.py +++ b/mininet/node.py @@ -996,9 +996,7 @@ def stop( self, deleteIntfs=True ): deleteIntfs: delete interfaces? (True)""" self.cmd( 'kill %ofdatapath' ) self.cmd( 'kill %ofprotocol' ) - if deleteIntfs: - self.deleteIntfs() - + super( UserSwitch, self ).stop( deleteIntfs ) class OVSLegacyKernelSwitch( Switch ): """Open VSwitch legacy kernel-space switch using ovs-openflowd. @@ -1048,8 +1046,7 @@ def stop( self, deleteIntfs=True ): deleteIntfs: delete interfaces? (True)""" quietRun( 'ovs-dpctl del-dp ' + self.dp ) self.cmd( 'kill %ovs-openflowd' ) - if deleteIntfs: - self.deleteIntfs() + super( OVSLegacyKernelSwitch, self ).stop( deleteIntfs ) class OVSSwitch( Switch ): @@ -1204,8 +1201,7 @@ def stop( self, deleteIntfs=True ): self.cmd( 'ovs-vsctl del-br', self ) if self.datapath == 'user': self.cmd( 'ip link del', self ) - if deleteIntfs: - self.deleteIntfs() + super( OVSSwitch, self ).stop( deleteIntfs ) OVSKernelSwitch = OVSSwitch @@ -1273,8 +1269,7 @@ def stop( self, deleteIntfs=True ): deleteIntfs: delete interfaces? (True)""" self.cmd( 'kill %ivs' ) self.cmd( 'wait' ) - if deleteIntfs: - self.deleteIntfs() + super( IVSSwitch, self ).stop( deleteIntfs ) def attach( self, intf ): "Connect a data port" diff --git a/mininet/nodelib.py b/mininet/nodelib.py index b629051fd0eaf7a194ac04b5126a3635cd2b6c7f..7f4f841aa45f16da7f3de03ff42ad8db1a9385f2 100644 --- a/mininet/nodelib.py +++ b/mininet/nodelib.py @@ -46,10 +46,12 @@ def start( self, _controllers ): self.cmd( 'brctl addif', self, i ) self.cmd( 'ifconfig', self, 'up' ) - def stop( self ): - "Stop Linux bridge" + def stop( self, deleteIntfs=True ): + """Stop Linux bridge + deleteIntfs: delete interfaces? (True)""" self.cmd( 'ifconfig', self, 'down' ) self.cmd( 'brctl delbr', self ) + super( LinuxBridge, self ).stop( deleteIntfs ) def dpctl( self, *args ): "Run brctl command"