Revision c1934706 mininet/util.py

View differences:

mininet/util.py
82 82
    poller.register( popen.stdout, POLLIN )
83 83
    fdtofile = { popen.stdout.fileno(): popen.stdout }
84 84
    outDone, errDone = False, True
85
    #bookmark: rearrange this for aynch startup. shouldnt have to keep 
86
    # maybe we dont rearrange this. we really just need a method to call a command and NOT poll for output
85 87
    if popen.stderr:
86 88
        fdtofile[ popen.stderr.fileno() ] = popen.stderr
87 89
        poller.register( popen.stderr, POLLIN )
......
185 187
    intf = str( intf )
186 188
    cmd = 'ip link set %s netns %s' % ( intf, dstNode.pid )
187 189
    if srcNode:
188
        srcNode.cmd( cmd )
190
        output = srcNode.cmd( cmd )
189 191
    else:
190
        quietRun( cmd )
191
    if ( ' %s:' % intf ) not in dstNode.cmd( 'ip link show', intf ):
192
        output = quietRun( cmd )
193
    if output:
192 194
        if printError:
193 195
            error( '*** Error: moveIntf: ' + intf +
194 196
                   ' not successfully moved to ' + dstNode.name + '\n' )

Also available in: Unified diff