summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorkhramshinr <khramshinr@gmail.com>2024-04-16 15:49:19 +0800
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-04-25 15:32:51 +0000
commit8c5c3bc48f76a5bb0c819c6f549d7fbcacf964de (patch)
treea82bc760d3a19454bcbab0a5d37a50a24c4d1f1a /src/conf_mode
parent018b940f685b01a9765657ec25724853cff25188 (diff)
downloadvyos-1x-8c5c3bc48f76a5bb0c819c6f549d7fbcacf964de.tar.gz
vyos-1x-8c5c3bc48f76a5bb0c819c6f549d7fbcacf964de.zip
qos: T4248: Allow to remove the only rule from the qos class
(cherry picked from commit da40bd2b2a826986de128354ea1bfc041ada0016)
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/qos.py23
1 files changed, 23 insertions, 0 deletions
diff --git a/src/conf_mode/qos.py b/src/conf_mode/qos.py
index 3dfb4bab8..ccfc8f6b8 100755
--- a/src/conf_mode/qos.py
+++ b/src/conf_mode/qos.py
@@ -70,6 +70,22 @@ def get_shaper(qos, interface_config, direction):
return (map_vyops_tc[shaper_type], shaper_config)
+
+def _clean_conf_dict(conf):
+ """
+ Delete empty nodes from config e.g.
+ match ADDRESS30 {
+ ip {
+ source {}
+ }
+ }
+ """
+ if isinstance(conf, dict):
+ return {node: _clean_conf_dict(val) for node, val in conf.items() if val != {} and _clean_conf_dict(val) != {}}
+ else:
+ return conf
+
+
def get_config(config=None):
if config:
conf = config
@@ -120,6 +136,13 @@ def get_config(config=None):
if 'queue_limit' not in qos['policy'][policy][p_name]['precedence'][precedence]:
qos['policy'][policy][p_name]['precedence'][precedence]['queue_limit'] = \
str(int(4 * max_thr))
+ # cleanup empty match config
+ if 'class' in p_config:
+ for cls, cls_config in p_config['class'].items():
+ if 'match' in cls_config:
+ cls_config['match'] = _clean_conf_dict(cls_config['match'])
+ if cls_config['match'] == {}:
+ del cls_config['match']
return qos