Merge branch 'current' into equuleus

1 files changed, 26 insertions, 3 deletions

diff --git a/python/vyos/config.py b/python/vyos/config.py
index bcf04225b..c9c73b971 100644
--- a/python/vyos/config.py
+++ b/python/vyos/config.py
@@ -87,9 +87,13 @@ class Config(object):
     the only state it keeps is relative *config path* for convenient access to config
     subtrees.
     """
-    def __init__(self):
+    def __init__(self, session_env=None):
         self._cli_shell_api = "/bin/cli-shell-api"
         self._level = ""
+        if session_env:
+            self.__session_env = session_env
+        else:
+            self.__session_env = None
 
     def _make_command(self, op, path):
         args = path.split()
@@ -97,7 +101,10 @@ class Config(object):
         return cmd
 
     def _run(self, cmd):
-        p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
+        if self.__session_env:
+            p = subprocess.Popen(cmd, stdout=subprocess.PIPE, env=self.__session_env)
+        else:
+            p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
         out = p.stdout.read()
         p.wait()
         if p.returncode != 0:
@@ -169,6 +176,21 @@ class Config(object):
         except VyOSError:
             return False
 
+    def show_config(self, path='', default=None):
+        """
+        Args:
+            path (str): Configuration tree path, or empty
+            default (str): Default value to return
+
+        Returns:
+            str: working configuration
+        """
+        try:
+            out = self._run(self._make_command('showConfig', path))
+            return out
+        except VyOSError:
+            return(default)
+
     def is_multi(self, path):
         """
         Args:
@@ -383,7 +405,8 @@ class Config(object):
         else:
             try:
                 out = self._run(self._make_command('returnEffectiveValues', full_path))
-                return out
+                values = re.findall(r"\'(.*?)\'", out)
+                return values
             except VyOSError:
                 return(default)