diff --git a/mininet/link.py b/mininet/link.py index af895a1..4a1a683 100644 --- a/mininet/link.py +++ b/mininet/link.py @@ -197,9 +197,10 @@ class Intf( object ): def delete( self ): "Delete interface" self.cmd( 'ip link del ' + self.name ) - if self.node.inNamespace: - # Link may have been dumped into root NS - quietRun( 'ip link del ' + self.name ) + # We used to do this, but it slows us down: + # if self.node.inNamespace: + # Link may have been dumped into root NS + # quietRun( 'ip link del ' + self.name ) def status( self ): "Return intf status as a string" diff --git a/mininet/node.py b/mininet/node.py index e416261..ec473e0 100644 --- a/mininet/node.py +++ b/mininet/node.py @@ -194,10 +194,11 @@ class Node( object ): def cleanup( self ): "Help python collect its garbage." + # We used to do this, but it slows us down: # Intfs may end up in root NS - for intfName in self.intfNames(): - if self.name in intfName: - quietRun( 'ip link del ' + intfName ) + # for intfName in self.intfNames(): + # if self.name in intfName: + # quietRun( 'ip link del ' + intfName ) self.shell = None # Subshell I/O, commands and control @@ -1311,10 +1312,6 @@ class OVSBatch( OVSSwitch ): super( OVSBatch, self ).stop( *args, **kwargs ) self.started = False - def cleanup( self): - "Don't bother to clean up" - return - class IVSSwitch( Switch ): "Indigo Virtual Switch"