Merge pull request #4660 from jestabro/validate-tree

T7718: expose validate_tree* methods and add validate-config script

3 files changed, 106 insertions, 20 deletions

diff --git a/libvyosconfig b/libvyosconfig
-Subproject d0c3b937497cc1132a485372c85ab189653c202
+Subproject a3f0fbb07cfcab9e178fb542c3726d952a10324
diff --git a/python/vyos/configtree.py b/python/vyos/configtree.py
index ba3f1e368..aeeb329c5 100644
--- a/python/vyos/configtree.py
+++ b/python/vyos/configtree.py
@@ -614,6 +614,44 @@ def reference_tree_cache_to_json(cache_path, render_file, libpath=LIBPATH):
         raise ConfigTreeError(msg)
 
 
+# validate_tree_filter c_ptr rt_cache validator_dir
+def validate_tree_filter(
+    config_tree,
+    cache_path='/usr/share/vyos/reftree.cache',
+    validator_dir='/usr/libexec/vyos/validators',
+    libpath=LIBPATH,
+):
+    try:
+        __lib = cdll.LoadLibrary(libpath)
+        __validate_tree_filter = __lib.validate_tree_filter
+        __validate_tree_filter.argtypes = [c_void_p, c_char_p, c_char_p]
+        __get_error = __lib.get_error
+        __get_error.argtypes = []
+        __get_error.restype = c_char_p
+        res = __validate_tree_filter(
+            config_tree._get_config(), cache_path.encode(), validator_dir.encode()
+        )
+    except Exception as e:
+        raise ConfigTreeError(e)
+
+    msg = __get_error().decode()
+    tree = ConfigTree(address=res)
+
+    return tree, msg
+
+
+def validate_tree(
+    config_tree,
+    cache_path='/usr/share/vyos/reftree.cache',
+    validator_dir='/usr/libexec/vyos/validators',
+):
+    _, out = validate_tree_filter(
+        config_tree, cache_path=cache_path, validator_dir=validator_dir
+    )
+
+    return out
+
+
 class DiffTree:
     def __init__(self, left, right, path=[], libpath=LIBPATH):
         if left is None:
diff --git a/src/helpers/validate-config.py b/src/helpers/validate-config.py
new file mode 100755
index 000000000..1c77d2240
--- /dev/null
+++ b/src/helpers/validate-config.py
@@ -0,0 +1,48 @@
+#!/usr/bin/env python3
+#
+# Copyright VyOS maintainers and contributors <maintainers@vyos.io>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+import sys
+import argparse
+
+from vyos.configtree import ConfigTree
+from vyos.configtree import validate_tree_filter
+from vyos.component_version import add_system_version
+
+
+parser = argparse.ArgumentParser()
+parser.add_argument('config_file', help='config file to validate')
+parser.add_argument('--filtered-config', help='write valid subset of config file')
+
+args = parser.parse_args()
+
+config_file = args.config_file
+filtered_config = args.filtered_config
+
+with open(config_file) as f:
+    config_str = f.read()
+
+config_tree = ConfigTree(config_str)
+
+valid_tree, out = validate_tree_filter(config_tree)
+
+if filtered_config:
+    add_system_version(valid_tree.to_string(), filtered_config)
+
+if out:
+    print(out)
+
+sys.exit(int(bool(out)))