diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2024-02-08 12:26:57 +0000 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-02-08 18:34:09 +0000 |
| commit | 70d4dafa4367183360d7c8add8221ab99ee767e5 (patch) | |
| tree | b65370999b3255f1dfdbb56a210963e0dd45b07d /src/conf_mode | |
| parent | ec60a936645a22050db1550de12ca1fbb63abfbe (diff) | |
| download | vyos-1x-70d4dafa4367183360d7c8add8221ab99ee767e5.tar.gz vyos-1x-70d4dafa4367183360d7c8add8221ab99ee767e5.zip | |
T6026: QoS hide attempts to delete qdisc from devices
Hide unexpected output by attempts of deleting `qdisc` from
interfaces
[ qos ]
Error: Cannot find specified qdisc on specified device.
Error: Cannot delete qdisc with handle of zero.
(cherry picked from commit 6dcb68ba5553ac94eb3a9da4a915999500b00ab2)
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/qos.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/conf_mode/qos.py b/src/conf_mode/qos.py index 40d7a6c16..4a0b4d0c5 100755 --- a/src/conf_mode/qos.py +++ b/src/conf_mode/qos.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2023 VyOS maintainers and contributors +# Copyright (C) 2023-2024 VyOS maintainers and contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 or later as @@ -36,7 +36,7 @@ from vyos.qos import RateLimiter from vyos.qos import RoundRobin from vyos.qos import TrafficShaper from vyos.qos import TrafficShaperHFSC -from vyos.utils.process import call +from vyos.utils.process import run from vyos.utils.dict import dict_search_recursive from vyos import ConfigError from vyos import airbag @@ -205,8 +205,8 @@ def apply(qos): # Always delete "old" shapers first for interface in interfaces(): # Ignore errors (may have no qdisc) - call(f'tc qdisc del dev {interface} parent ffff:') - call(f'tc qdisc del dev {interface} root') + run(f'tc qdisc del dev {interface} parent ffff:') + run(f'tc qdisc del dev {interface} root') call_dependents() |