1 files changed, 46 insertions, 17 deletions
diff --git a/python/vyos/util.py b/python/vyos/util.py
index 494c8155e..e2f4b8fc4 100644
--- a/python/vyos/util.py
+++ b/python/vyos/util.py
@@ -311,7 +311,7 @@ def chmod_755(path):
 def makedir(path, user=None, group=None):
     if os.path.exists(path):
         return
-    os.mkdir(path)
+    os.makedirs(path, mode=0o755)
     chown(path, user, group)
 
 
@@ -554,16 +554,19 @@ def ask_yes_no(question, default=False) -> bool:
     from sys import stdout
     default_msg = "[Y/n]" if default else "[y/N]"
     while True:
-        stdout.write("%s %s " % (question, default_msg))
-        c = input().lower()
-        if c == '':
-            return default
-        elif c in ("y", "ye", "yes"):
-            return True
-        elif c in ("n", "no"):
-            return False
-        else:
-            stdout.write("Please respond with yes/y or no/n\n")
+        try:
+            stdout.write("%s %s " % (question, default_msg))
+            c = input().lower()
+            if c == '':
+                return default
+            elif c in ("y", "ye", "yes"):
+                return True
+            elif c in ("n", "no"):
+                return False
+            else:
+                stdout.write("Please respond with yes/y or no/n\n")
+        except EOFError:
+            stdout.write("\nPlease respond with yes/y or no/n\n")
 
 
 def is_admin() -> bool:
@@ -627,18 +630,44 @@ 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_interface_config(interface):
+    """ Returns the used encapsulation protocol for given interface.
+        If interface does not exist, None is returned.
+    """
+    if not os.path.exists(f'/sys/class/net/{interface}'):
+        return None
+    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