diff options
| author | Nicolás Fort <95703796+nicolas-fort@users.noreply.github.com> | 2023-07-31 15:22:51 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-31 15:22:51 -0300 |
| commit | 657a566df58478c2f5d4bccad952bfcb7991e847 (patch) | |
| tree | 1cf6ab7548286f358d05389132cd82bc177c676a /python/vyos/configtree.py | |
| parent | 7ae9d8953ddc9ba38d62400187ce1ec44abb5a6e (diff) | |
| parent | df33f450b4e8b7e0286e36540de81edfb5f52e73 (diff) | |
| download | vyos-1x-657a566df58478c2f5d4bccad952bfcb7991e847.tar.gz vyos-1x-657a566df58478c2f5d4bccad952bfcb7991e847.zip | |
Merge branch 'current' into T5014-dnat
Diffstat (limited to 'python/vyos/configtree.py')
| -rw-r--r-- | python/vyos/configtree.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/python/vyos/configtree.py b/python/vyos/configtree.py index d0cd87464..e18d9817d 100644 --- a/python/vyos/configtree.py +++ b/python/vyos/configtree.py @@ -418,10 +418,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 +431,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() |