summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2021-08-11 11:54:28 -0500
committerJohn Estabrook <jestabro@vyos.io>2021-08-11 14:55:24 -0500
commitec6dc94a5144ea4ac75ba6fac4d85b4f66337ae2 (patch)
tree868f28fc1b343f0d98b2afc33cd0b1f75f64b4b7
parente7c69ead85af485b2b881f24b929a4bcc779a4ce (diff)
downloadvyos-1x-ec6dc94a5144ea4ac75ba6fac4d85b4f66337ae2.tar.gz
vyos-1x-ec6dc94a5144ea4ac75ba6fac4d85b4f66337ae2.zip
xml: T3732: merge leafNode with defaultValue with leafNode(s) of same path
-rwxr-xr-xscripts/override-default26
1 files changed, 26 insertions, 0 deletions
diff --git a/scripts/override-default b/scripts/override-default
index 228aca30f..0c49087c8 100755
--- a/scripts/override-default
+++ b/scripts/override-default
@@ -27,6 +27,7 @@
import sys
import glob
import logging
+from copy import deepcopy
from lxml import etree
debug = False
@@ -60,6 +61,28 @@ def override_element(l: list):
for el in parents:
el.getparent().remove(el)
+def merge_remaining(l: list, elementtree):
+ """
+ Merge (now) single leaf node containing 'defaultValue' with leaf nodes
+ of same path and no 'defaultValue'.
+ """
+ for p in l:
+ p = p.split()
+ path_str = f'/interfaceDefinition/*'
+ path_list = []
+ for i in range(len(p)):
+ path_list.append(f'[@name="{p[i]}"]')
+ path_str += '/children/*'.join(path_list)
+ rp = elementtree.xpath(path_str)
+ if len(rp) > 1:
+ for el in rp[1:]:
+ # in practice there will only be one child of the path,
+ # either defaultValue or Properties, since
+ # override_element() has already run
+ for child in el:
+ rp[0].append(deepcopy(child))
+ el.getparent().remove(el)
+
def collect_and_override(dir_name):
"""
Collect elements with defaultValue tag into dictionary indexed by name
@@ -84,6 +107,9 @@ def collect_and_override(dir_name):
logger.info(f"overridding default in path '{k}'")
override_element(v)
+ to_merge = list(defv)
+ merge_remaining(to_merge, tree)
+
revised_str = etree.tostring(root, encoding='unicode', pretty_print=True)
with open(f'{fname}', 'w') as f: