lab/mininet
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Clean up display

Browse Source 
Don't print retry errors by default.
This commit is contained in:
Brandon Heller
2009-12-18 15:51:30 -08:00
parent 7c1d7c9f90
commit 1095628b8a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/mininet.py
+5 -5
View File
@@ -344,14 +344,15 @@ def makeIntfPair( intf1, intf2 ):
cmd = 'ip link add name ' + intf1 + ' type veth peer name ' + intf2 cmd = 'ip link add name ' + intf1 + ' type veth peer name ' + intf2
return checkRun( cmd ) return checkRun( cmd )
def moveIntf( intf, node ): def moveIntf( intf, node, print_error = False ):
"Move intf to node." "Move intf to node."
cmd = 'ip link set ' + intf + ' netns ' + `node.pid` cmd = 'ip link set ' + intf + ' netns ' + `node.pid`
quietRun( cmd ) quietRun( cmd )
links = node.cmd( 'ip link show' ) links = node.cmd( 'ip link show' )
if not intf in links: if not intf in links:
print "*** Error: moveIntf:", intf, "not successfully moved to", if print_error:
print node.name,":" print "*** Error: moveIntf:", intf, "not successfully moved to",
print node.name,":"
return False return False
return True return True
@@ -360,10 +361,9 @@ def retry( n, retry_delay, fn, *args):
tries = 0 tries = 0
while not apply( fn, args ) and tries < n: while not apply( fn, args ) and tries < n:
sleep( retry_delay ) sleep( retry_delay )
print "*** retrying..."; flush()
tries += 1 tries += 1
if tries >= n: if tries >= n:
print "*** giving up" print "*** gave up after %i retries" % tries; flush()
exit( 1 ) exit( 1 )
def createLink( node1, node2 ): def createLink( node1, node2 ):