Revision 574d634f

View differences:

mininet/link.py
197 197
    def delete( self ):
198 198
        "Delete interface"
199 199
        self.cmd( 'ip link del ' + self.name )
200
        if self.node.inNamespace:
201
            # Link may have been dumped into root NS
202
            quietRun( 'ip link del ' + self.name )
200
        # We used to do this, but it slows us down:
201
        # if self.node.inNamespace:
202
        # Link may have been dumped into root NS
203
        # quietRun( 'ip link del ' + self.name )
203 204

  
204 205
    def status( self ):
205 206
        "Return intf status as a string"
mininet/node.py
194 194

  
195 195
    def cleanup( self ):
196 196
        "Help python collect its garbage."
197
        # We used to do this, but it slows us down:
197 198
        # Intfs may end up in root NS
198
        for intfName in self.intfNames():
199
            if self.name in intfName:
200
                quietRun( 'ip link del ' + intfName )
199
        # for intfName in self.intfNames():
200
        # if self.name in intfName:
201
        # quietRun( 'ip link del ' + intfName )
201 202
        self.shell = None
202 203

  
203 204
    # Subshell I/O, commands and control
......
1311 1312
        super( OVSBatch, self ).stop( *args, **kwargs )
1312 1313
        self.started = False
1313 1314
         
1314
    def cleanup( self):
1315
        "Don't bother to clean up"
1316
        return
1317

  
1318 1315

  
1319 1316
class IVSSwitch( Switch ):
1320 1317
    "Indigo Virtual Switch"

Also available in: Unified diff