diff --git a/mininet/link.py b/mininet/link.py index be73d52155a6042154a8960856878daeeb068a0d..747f2bd364c39213bd73cb962ce8a2f0558ba7c9 100644 --- a/mininet/link.py +++ b/mininet/link.py @@ -279,7 +279,11 @@ def config( self, bw=None, delay=None, jitter=None, loss=None, return # Clear existing configuration - cmds = [ '%s qdisc del dev %s root' ] + tcoutput = self.tc( '%s qdisc show dev %s' ) + if "priomap" not in tcoutput: + cmds = [ '%s qdisc del dev %s root' ] + else: + cmds = [] # Bandwidth limits via various methods bwcmds, parent = self.bwCmds( bw=bw, speedup=speedup, @@ -307,6 +311,9 @@ def config( self, bw=None, delay=None, jitter=None, loss=None, # Execute all the commands in our node debug("at map stage w/cmds: %s\n" % cmds) tcoutputs = [ self.tc(cmd) for cmd in cmds ] + for output in tcoutputs: + if output != '': + error( "*** Error: %s" % output ) debug( "cmds:", cmds, '\n' ) debug( "outputs:", tcoutputs, '\n' ) result[ 'tcoutputs'] = tcoutputs