Revision 9db6cdc2

View differences:

mininet/link.py
465 465
    def delete( self ):
466 466
        "Delete this link"
467 467
        self.intf1.delete()
468
        # We only need to delete one side, but this doesn't seem to
469
        # cost us anything and may help subclasses.
470
        self.intf2.delete()
468
        # We only need to delete one side, though this doesn't seem to
469
        # cost us much and might help subclasses.
470
        # self.intf2.delete()
471 471

  
472 472
    def stop( self ):
473 473
        "Override to stop and clean up link as needed"
474
        pass
474
        self.delete()
475 475

  
476 476
    def status( self ):
477 477
        "Return link status as a string"
mininet/node.py
259 259
           and return without waiting for the command to complete.
260 260
           args: command and arguments, or string
261 261
           printPid: print command's PID?"""
262
        assert not self.waiting
262
        assert self.shell and not self.waiting
263 263
        printPid = kwargs.get( 'printPid', True )
264 264
        # Allow sendCmd( [ list ] )
265 265
        if len( args ) == 1 and isinstance( args[ 0 ], list ):
......
339 339
        verbose = kwargs.get( 'verbose', False )
340 340
        log = info if verbose else debug
341 341
        log( '*** %s : %s\n' % ( self.name, args ) )
342
        self.sendCmd( *args, **kwargs )
343
        return self.waitOutput( verbose )
342
        if self.shell:
343
            self.sendCmd( *args, **kwargs )
344
            return self.waitOutput( verbose )
345
        else:
346
            warn( '(%s exited - ignoring cmd%s)\n' % ( self, args ) )
344 347

  
345 348
    def cmdPrint( self, *args):
346 349
        """Call cmd and printing its output

Also available in: Unified diff