From d754a7ceeaa5e3e23d334564b052001da3b428bb Mon Sep 17 00:00:00 2001
From: Bob Lantz <rlantz@cs.stanford.edu>
Date: Thu, 4 Dec 2014 07:36:53 -0800
Subject: [PATCH] Call super(deleteIntfs)
Maybe this is better - maybe not. ;-p
---
mininet/node.py | 13 ++++---------
mininet/nodelib.py | 6 ++++--
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/mininet/node.py b/mininet/node.py
index 428a72dc..c0dcbd70 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 b629051f..7f4f841a 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"
--
GitLab