summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2022-02-25 16:10:12 -0600
committerJohn Estabrook <jestabro@vyos.io>2022-02-28 13:42:24 -0600
commit3d28528ff84b4e874faf80028709bd08b2956933 (patch)
tree779e1c10dc2211df6b6f2edb95b5842e1607f60b
parentff7e2cd622cf3679cd9265b2cb766395a1830f50 (diff)
downloadvyos-1x-3d28528ff84b4e874faf80028709bd08b2956933.tar.gz
vyos-1x-3d28528ff84b4e874faf80028709bd08b2956933.zip
configtree: T4235: simplification of diff_tree class
The return value of diff_tree is now a single config_tree, with initial children of names: ["add", "delete", "inter"] containing the config sub-trees of added paths; deleted paths; and intersection, respectively. The simplifies dumping to json, and checking existence of paths, hence, of node changes.
-rw-r--r--python/vyos/configtree.py31
1 files changed, 19 insertions, 12 deletions
diff --git a/python/vyos/configtree.py b/python/vyos/configtree.py
index 0ec15cf40..f5e697137 100644
--- a/python/vyos/configtree.py
+++ b/python/vyos/configtree.py
@@ -15,7 +15,7 @@
import re
import json
-from ctypes import cdll, c_char_p, c_void_p, c_int, POINTER
+from ctypes import cdll, c_char_p, c_void_p, c_int
LIBPATH = '/usr/lib/libvyosconfig.so.0'
@@ -303,7 +303,7 @@ class ConfigTree(object):
subt = ConfigTree(address=res)
return subt
-class Diff:
+class DiffTree:
def __init__(self, left, right, path=[], libpath=LIBPATH):
if not (isinstance(left, ConfigTree) and isinstance(right, ConfigTree)):
raise TypeError("Arguments must be instances of ConfigTree")
@@ -312,21 +312,28 @@ class Diff:
raise ConfigTreeError(f"Path {path} doesn't exist in lhs tree")
if not right.exists(path):
raise ConfigTreeError(f"Path {path} doesn't exist in rhs tree")
+
self.left = left
self.right = right
+ self.__lib = cdll.LoadLibrary(libpath)
+
+ self.__diff_tree = self.__lib.diff_tree
+ self.__diff_tree.argtypes = [c_char_p, c_void_p, c_void_p]
+ self.__diff_tree.restype = c_void_p
+
check_path(path)
path_str = " ".join(map(str, path)).encode()
- df = cdll.LoadLibrary(libpath).diffs
- df.restype = POINTER(c_void_p * 3)
- res = list(df(path_str, left._get_config(), right._get_config()).contents)
- self._diff = {'add': ConfigTree(address=res[0]),
- 'del': ConfigTree(address=res[1]),
- 'int': ConfigTree(address=res[2]) }
-
- self.add = self._diff['add']
- self.delete = self._diff['del']
- self.inter = self._diff['int']
+ res = self.__diff_tree(path_str, left._get_config(), right._get_config())
+
+ # full diff config_tree and python dict representation
+ self.full = ConfigTree(address=res)
+ self.dict = json.loads(self.full.to_json())
+
+ # config_tree sub-trees
+ self.add = self.full.get_subtree(['add'])
+ self.delete = self.full.get_subtree(['delete'])
+ self.inter = self.full.get_subtree(['inter'])
def to_commands(self):
add = self.add.to_commands()