1 files changed, 49 insertions, 10 deletions
diff --git a/python/vyos/util.py b/python/vyos/util.py
index 17a7dda91..2a3f6a228 100644
--- a/python/vyos/util.py
+++ b/python/vyos/util.py
@@ -364,7 +364,7 @@ def colon_separated_to_dict(data_string, uniquekeys=False):
 
     return data
 
-def mangle_dict_keys(data, regex, replacement):
+def _mangle_dict_keys(data, regex, replacement, abs_path=[], no_tag_node_value_mangle=False, mod=0):
     """ Mangles dict keys according to a regex and replacement character.
     Some libraries like Jinja2 do not like certain characters in dict keys.
     This function can be used for replacing all offending characters
@@ -375,18 +375,41 @@ def mangle_dict_keys(data, regex, replacement):
 
     Returns: dict
     """
+    from vyos.xml import is_tag
+
     new_dict = {}
+
     for key in data.keys():
-        new_key = re.sub(regex, replacement, key)
+        save_mod = mod
+        save_path = abs_path[:]
+
+        abs_path.append(key)
+
+        if not is_tag(abs_path):
+            new_key = re.sub(regex, replacement, key)
+        else:
+            if mod%2:
+                new_key = key
+            else:
+                new_key = re.sub(regex, replacement, key)
+            if no_tag_node_value_mangle:
+                mod += 1
 
         value = data[key]
+
         if isinstance(value, dict):
-            new_dict[new_key] = mangle_dict_keys(value, regex, replacement)
+            new_dict[new_key] = _mangle_dict_keys(value, regex, replacement, abs_path=abs_path, mod=mod, no_tag_node_value_mangle=no_tag_node_value_mangle)
         else:
             new_dict[new_key] = value
 
+        mod = save_mod
+        abs_path = save_path[:]
+
     return new_dict
 
+def mangle_dict_keys(data, regex, replacement, abs_path=[], no_tag_node_value_mangle=False):
+    return _mangle_dict_keys(data, regex, replacement, abs_path=abs_path, no_tag_node_value_mangle=no_tag_node_value_mangle, mod=0)
+
 def _get_sub_dict(d, lpath):
     k = lpath[0]
     if k not in d.keys():
@@ -630,23 +653,26 @@ def find_device_file(device):
 
     return None
 
-def dict_search(path, dict):
-    """ Traverse Python dictionary (dict) delimited by dot (.).
+def dict_search(path, my_dict):
+    """ Traverse Python dictionary (my_dict) delimited by dot (.).
     Return value of key if found, None otherwise.
 
-    This is faster implementation then jmespath.search('foo.bar', dict)"""
+    This is faster implementation then jmespath.search('foo.bar', my_dict)"""
+    if not isinstance(my_dict, dict) or not path:
+        return None
+
     parts = path.split('.')
     inside = parts[:-1]
     if not inside:
-        if path not in dict:
+        if path not in my_dict:
             return None
-        return dict[path]
-    c = dict
+        return my_dict[path]
+    c = my_dict
     for p in parts[:-1]:
         c = c.get(p, {})
     return c.get(parts[-1], None)
 
-def get_json_iface_options(interface):
+def get_interface_config(interface):
     """ Returns the used encapsulation protocol for given interface.
         If interface does not exist, None is returned.
     """
@@ -655,3 +681,16 @@ def get_json_iface_options(interface):
     from json import loads
     tmp = loads(cmd(f'ip -d -j link show {interface}'))[0]
     return tmp
+
+def get_all_vrfs():
+    """ Return a dictionary of all system wide known VRF instances """
+    from json import loads
+    tmp = loads(cmd('ip -j vrf list'))
+    # Result is of type [{"name":"red","table":1000},{"name":"blue","table":2000}]
+    # so we will re-arrange it to a more nicer representation:
+    # {'red': {'table': 1000}, 'blue': {'table': 2000}}
+    data = {}
+    for entry in tmp:
+        name = entry.pop('name')
+        data[name] = entry
+    return data