From dbe09d4c3dac302ad7b24cdd4f2b1ed123436442 Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Fri, 31 Jan 2025 15:48:33 -0600
Subject: T6946: add wrapper for show_commit_data and test function

---
 python/vyos/config_mgmt.py | 10 +++++-----
 python/vyos/configtree.py  | 16 ++++++++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)

(limited to 'python')

diff --git a/python/vyos/config_mgmt.py b/python/vyos/config_mgmt.py
index 1c2b70fdf..dd8910afb 100644
--- a/python/vyos/config_mgmt.py
+++ b/python/vyos/config_mgmt.py
@@ -287,7 +287,7 @@ Proceed ?"""
 
         # commits under commit-confirm are not added to revision list unless
         # confirmed, hence a soft revert is to revision 0
-        revert_ct = self._get_config_tree_revision(0)
+        revert_ct = self.get_config_tree_revision(0)
 
         message = '[commit-confirm] Reverting to previous config now'
         os.system('wall -n ' + message)
@@ -351,7 +351,7 @@ Proceed ?"""
             )
             return msg, 1
 
-        rollback_ct = self._get_config_tree_revision(rev)
+        rollback_ct = self.get_config_tree_revision(rev)
         try:
             load(rollback_ct, switch='explicit')
             print('Rollback diff has been applied.')
@@ -382,7 +382,7 @@ Proceed ?"""
         if rev1 is not None:
             if not self._check_revision_number(rev1):
                 return f'Invalid revision number {rev1}', 1
-            ct1 = self._get_config_tree_revision(rev1)
+            ct1 = self.get_config_tree_revision(rev1)
             ct2 = self.working_config
             msg = f'No changes between working and revision {rev1} configurations.\n'
         if rev2 is not None:
@@ -390,7 +390,7 @@ Proceed ?"""
                 return f'Invalid revision number {rev2}', 1
             # compare older to newer
             ct2 = ct1
-            ct1 = self._get_config_tree_revision(rev2)
+            ct1 = self.get_config_tree_revision(rev2)
             msg = f'No changes between revisions {rev2} and {rev1} configurations.\n'
 
         out = ''
@@ -575,7 +575,7 @@ Proceed ?"""
             r = f.read().decode()
         return r
 
-    def _get_config_tree_revision(self, rev: int):
+    def get_config_tree_revision(self, rev: int):
         c = self._get_file_revision(rev)
         return ConfigTree(c)
 
diff --git a/python/vyos/configtree.py b/python/vyos/configtree.py
index 4ad0620a5..2b8930882 100644
--- a/python/vyos/configtree.py
+++ b/python/vyos/configtree.py
@@ -488,6 +488,22 @@ def mask_inclusive(left, right, libpath=LIBPATH):
     return tree
 
 
+def show_commit_data(active_tree, proposed_tree, libpath=LIBPATH):
+    if not (
+        isinstance(active_tree, ConfigTree) and isinstance(proposed_tree, ConfigTree)
+    ):
+        raise TypeError('Arguments must be instances of ConfigTree')
+
+    __lib = cdll.LoadLibrary(libpath)
+    __show_commit_data = __lib.show_commit_data
+    __show_commit_data.argtypes = [c_void_p, c_void_p]
+    __show_commit_data.restype = c_char_p
+
+    res = __show_commit_data(active_tree._get_config(), proposed_tree._get_config())
+
+    return res.decode()
+
+
 def reference_tree_to_json(from_dir, to_file, internal_cache='', libpath=LIBPATH):
     try:
         __lib = cdll.LoadLibrary(libpath)
-- 
cgit v1.2.3