1 files changed, 17 insertions, 6 deletions
diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py
index 73986e9af..8e5781b81 100644
--- a/python/vyos/configdict.py
+++ b/python/vyos/configdict.py
@@ -155,18 +155,15 @@ def get_removed_vlans(conf, dict):
     D.set_level(conf.get_level())
     # get_child_nodes() will return dict_keys(), mangle this into a list with PEP448
     keys = D.get_child_nodes_diff(['vif'], expand_nodes=Diff.DELETE)['delete'].keys()
-    if keys:
-        dict.update({'vif_remove': [*keys]})
+    if keys: dict['vif_remove'] = [*keys]
 
     # get_child_nodes() will return dict_keys(), mangle this into a list with PEP448
     keys = D.get_child_nodes_diff(['vif-s'], expand_nodes=Diff.DELETE)['delete'].keys()
-    if keys:
-        dict.update({'vif_s_remove': [*keys]})
+    if keys: dict['vif_s_remove'] = [*keys]
 
     for vif in dict.get('vif_s', {}).keys():
         keys = D.get_child_nodes_diff(['vif-s', vif, 'vif-c'], expand_nodes=Diff.DELETE)['delete'].keys()
-        if keys:
-            dict.update({'vif_s': { vif : {'vif_c_remove': [*keys]}}})
+        if keys: dict['vif_s'][vif]['vif_c_remove'] = [*keys]
 
     return dict
 
@@ -522,6 +519,11 @@ def get_accel_dict(config, base, chap_secrets):
     if dict_search('authentication.local_users.username', default_values):
         del default_values['authentication']['local_users']['username']
 
+    # T2665: defaults include IPv6 client-pool mask per TAG node which need to be
+    # added to individual local users instead - so we can simply delete them
+    if dict_search('client_ipv6_pool.prefix.mask', default_values):
+        del default_values['client_ipv6_pool']['prefix']['mask']
+
     dict = dict_merge(default_values, dict)
 
     # set CPUs cores to process requests
@@ -565,4 +567,13 @@ def get_accel_dict(config, base, chap_secrets):
             dict['authentication']['local_users']['username'][username] = dict_merge(
                 default_values, dict['authentication']['local_users']['username'][username])
 
+    # Add individual IPv6 client-pool default mask if required
+    if dict_search('client_ipv6_pool.prefix', dict):
+        # T2665
+        default_values = defaults(base + ['client-ipv6-pool', 'prefix'])
+
+        for prefix in dict_search('client_ipv6_pool.prefix', dict):
+            dict['client_ipv6_pool']['prefix'][prefix] = dict_merge(
+                default_values, dict['client_ipv6_pool']['prefix'][prefix])
+
     return dict