configdict: T8358: rename internal representation from traffic_policy to qos

Commit 0bf386cee9b0 ('qos: T4284: rename "traffic-policy" node to "qos policy"')
already renamed the CLI for QoS. The internal data representation kept the old
name which is now corrected.

3 files changed, 7 insertions, 7 deletions

diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py
index e1d05c384..b16c3cf1d 100644
--- a/python/vyos/configdict.py
+++ b/python/vyos/configdict.py
@@ -472,7 +472,7 @@ def get_interface_dict(config, base, ifname='', recursive_defaults=True, with_pk
 
     # Check if QoS policy applied on this interface - See ifconfig.interface.set_mirror_redirect()
     if config.exists(['qos', 'interface', ifname]):
-        dict.update({'traffic_policy': {}})
+        dict.update({'qos': {}})
 
     address = leaf_node_changed(config, base + [ifname, 'address'])
     if address: dict.update({'address_old' : address})
@@ -531,7 +531,7 @@ def get_interface_dict(config, base, ifname='', recursive_defaults=True, with_pk
         dict['vif'][vif].update({'ifname' : f'{ifname}.{vif}'})
 
         if config.exists(['qos', 'interface', f'{ifname}.{vif}']):
-            dict['vif'][vif].update({'traffic_policy': {}})
+            dict['vif'][vif].update({'qos': {}})
 
         if 'deleted' not in dict:
             address = leaf_node_changed(config, base + [ifname, 'vif', vif, 'address'])
@@ -558,7 +558,7 @@ def get_interface_dict(config, base, ifname='', recursive_defaults=True, with_pk
         dict['vif_s'][vif_s].update({'ifname' : f'{ifname}.{vif_s}'})
 
         if config.exists(['qos', 'interface', f'{ifname}.{vif_s}']):
-            dict['vif_s'][vif_s].update({'traffic_policy': {}})
+            dict['vif_s'][vif_s].update({'qos': {}})
 
         if 'deleted' not in dict:
             address = leaf_node_changed(config, base + [ifname, 'vif-s', vif_s, 'address'])
@@ -586,7 +586,7 @@ def get_interface_dict(config, base, ifname='', recursive_defaults=True, with_pk
             dict['vif_s'][vif_s]['vif_c'][vif_c].update({'ifname' : f'{ifname}.{vif_s}.{vif_c}'})
 
             if config.exists(['qos', 'interface', f'{ifname}.{vif_s}.{vif_c}']):
-                dict['vif_s'][vif_s]['vif_c'][vif_c].update({'traffic_policy': {}})
+                dict['vif_s'][vif_s]['vif_c'][vif_c].update({'qos': {}})
 
             if 'deleted' not in dict:
                 address = leaf_node_changed(config, base + [ifname, 'vif-s', vif_s, 'vif-c', vif_c, 'address'])
diff --git a/python/vyos/configverify.py b/python/vyos/configverify.py
index cc4419913..1094288c5 100644
--- a/python/vyos/configverify.py
+++ b/python/vyos/configverify.py
@@ -197,10 +197,10 @@ def verify_mirror_redirect(config):
             raise ConfigError(f'Requested redirect interface "{redirect_ifname}" '\
                                'does not exist!')
 
-    if ('mirror' in config or 'redirect' in config) and dict_search('traffic_policy.in', config) is not None:
+    if 'qos' in config and ('mirror' in config or 'redirect' in config):
         # XXX: support combination of limiting and redirect/mirror - this is an
         # artificial limitation
-        raise ConfigError('Can not use ingress policy together with mirror or redirect!')
+        raise ConfigError('Can not use QoS together with mirror/redirect!')
 
 def verify_authentication(config):
     """
diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py
index f03d0cb68..33b643e7e 100644
--- a/python/vyos/ifconfig/interface.py
+++ b/python/vyos/ifconfig/interface.py
@@ -1630,7 +1630,7 @@ class Interface(Control):
 
         # clear existing ingess - ignore errors (e.g. "Error: Cannot find specified
         # qdisc on specified device") - we simply cleanup all stuff here
-        if not 'traffic_policy' in self.config:
+        if not 'qos' in self.config:
             self._popen(f'tc qdisc del dev {source_if} parent ffff: 2>/dev/null');
             self._popen(f'tc qdisc del dev {source_if} parent 1: 2>/dev/null');