Merge branch 'current' of github.com:vyos/vyos-1x into equuleus

* 'current' of github.com:vyos/vyos-1x:
  [conf completion]: T1779: Add tunnels to completion
  [XML templates] T1772: Changed old hacks to proper regex, according to the fix
  Add a function for retrieving config dicts.
  snmp: make script extension code more readable
  snmp: use proper stat literals on chmod()
  snmp: fix verify() indent on script extensions
  snmp: fix verify() bail out early order
  snmp: T1738: cleanup import statements
  T1759: Fixing dependency bug from previous commit
  T1773, T1774: add a show config operation with JSON and raw options.
  T1759: Merging interface.py into ifconfig.py
  Allow list arguments in the vyos.config show_config() function.
  Replace the try and wait for segfault approach with explicit inSession check.
  T1773: add a script for converting the config to JSON. It also exposes those functions in vyos.configtree
  [XML templates] T1772: Add escaping of `\` symbol in `<regex>`

1 files changed, 14 insertions, 0 deletions

diff --git a/python/vyos/configtree.py b/python/vyos/configtree.py
index 8832a5a63..77cffe90b 100644
--- a/python/vyos/configtree.py
+++ b/python/vyos/configtree.py
@@ -105,6 +105,14 @@ class ConfigTree(object):
         self.__to_commands.argtypes = [c_void_p]
         self.__to_commands.restype = c_char_p
 
+        self.__to_json = self.__lib.to_json
+        self.__to_json.argtypes = [c_void_p]
+        self.__to_json.restype = c_char_p
+
+        self.__to_json_ast = self.__lib.to_json_ast
+        self.__to_json_ast.argtypes = [c_void_p]
+        self.__to_json_ast.restype = c_char_p
+
         self.__set_add_value = self.__lib.set_add_value
         self.__set_add_value.argtypes = [c_void_p, c_char_p, c_char_p]
         self.__set_add_value.restype = c_int
@@ -184,6 +192,12 @@ class ConfigTree(object):
     def to_commands(self):
         return self.__to_commands(self.__config).decode()
 
+    def to_json(self):
+        return self.__to_json(self.__config).decode()
+
+    def to_json_ast(self):
+        return self.__to_json_ast(self.__config).decode()
+
     def set(self, path, value=None, replace=True):
         """Set new entry in VyOS configuration.
         path: configuration path e.g. 'system dns forwarding listen-address'