1 files changed, 11 insertions, 17 deletions
diff --git a/python/vyos/configtree.py b/python/vyos/configtree.py
index d0cd87464..09cfd43d3 100644
--- a/python/vyos/configtree.py
+++ b/python/vyos/configtree.py
@@ -383,14 +383,16 @@ def union(left, right, libpath=LIBPATH):
     return tree
 
 def reference_tree_to_json(from_dir, to_file, libpath=LIBPATH):
-    __lib = cdll.LoadLibrary(libpath)
-    __reference_tree_to_json = __lib.reference_tree_to_json
-    __reference_tree_to_json.argtypes = [c_char_p, c_char_p]
-    __get_error = __lib.get_error
-    __get_error.argtypes = []
-    __get_error.restype = c_char_p
-
-    res = __reference_tree_to_json(from_dir.encode(), to_file.encode())
+    try:
+        __lib = cdll.LoadLibrary(libpath)
+        __reference_tree_to_json = __lib.reference_tree_to_json
+        __reference_tree_to_json.argtypes = [c_char_p, c_char_p]
+        __get_error = __lib.get_error
+        __get_error.argtypes = []
+        __get_error.restype = c_char_p
+        res = __reference_tree_to_json(from_dir.encode(), to_file.encode())
+    except Exception as e:
+        raise ConfigTreeError(e)
     if res == 1:
         msg = __get_error().decode()
         raise ConfigTreeError(msg)
@@ -418,10 +420,6 @@ class DiffTree:
         self.__diff_tree.argtypes = [c_char_p, c_void_p, c_void_p]
         self.__diff_tree.restype = c_void_p
 
-        self.__trim_tree = self.__lib.trim_tree
-        self.__trim_tree.argtypes = [c_void_p, c_void_p]
-        self.__trim_tree.restype = c_void_p
-
         check_path(path)
         path_str = " ".join(map(str, path)).encode()
 
@@ -435,11 +433,7 @@ class DiffTree:
         self.add = self.full.get_subtree(['add'])
         self.sub = self.full.get_subtree(['sub'])
         self.inter = self.full.get_subtree(['inter'])
-
-        # trim sub(-tract) tree to get delete tree for commands
-        ref = self.right.get_subtree(path, with_node=True) if path else self.right
-        res = self.__trim_tree(self.sub._get_config(), ref._get_config())
-        self.delete = ConfigTree(address=res)
+        self.delete = self.full.get_subtree(['del'])
 
     def to_commands(self):
         add = self.add.to_commands()