diff --git a/mininet/clean.py b/mininet/clean.py index e3862a5..f190e63 100755 --- a/mininet/clean.py +++ b/mininet/clean.py @@ -23,6 +23,7 @@ def sh( cmd ): def cleanup(): """Clean up junk which might be left over from old runs; do fast stuff before slow dp and link removal!""" + info("*** Removing excess controllers/ofprotocols/ofdatapaths/pings/noxes" "\n") zombies = 'controller ofprotocol ofdatapath ping nox_core lt-nox_core ' @@ -32,22 +33,23 @@ def cleanup(): # you can't connect to them either, so they're mostly harmless. sh( 'killall -9 ' + zombies + ' 2> /dev/null' ) - info("*** Removing junk from /tmp\n") + info( "*** Removing junk from /tmp\n" ) sh( 'rm -f /tmp/vconn* /tmp/vlogs* /tmp/*.out /tmp/*.log' ) - info("*** Removing old screen sessions") + info( "*** Removing old screen sessions\n" ) cleanUpScreens() - info("*** Removing excess kernel datapaths\n") + info( "*** Removing excess kernel datapaths\n" ) dps = sh( "ps ax | egrep -o 'dp[0-9]+' | sed 's/dp/nl:/'" ).split( '\n' ) for dp in dps: if dp != '': sh( 'dpctl deldp ' + dp ) - info("*** Removing all links of the pattern foo-ethX\n") + info( "*** Removing all links of the pattern foo-ethX\n" ) links = sh( "ip link show | egrep -o '(\w+-eth\w+)'" ).split( '\n' ) for link in links: if link != '': sh( "ip link del " + link ) - info("*** Cleanup complete.\n") + info( "*** Cleanup complete.\n" ) +