From 6fcc55b8b51bdcfaf2e75b254a4a7c9b6b4cb04d Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Tue, 8 Feb 2022 21:10:19 -0600 Subject: configtree: T4235: binding for config tree diff function (cherry picked from commit 297612c64230008228f77806e575c3831e15476e) --- lib/bindings.ml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lib/bindings.ml b/lib/bindings.ml index 9324282..40ef120 100644 --- a/lib/bindings.ml +++ b/lib/bindings.ml @@ -4,6 +4,7 @@ open Foreign open Vyos1x module CT = Config_tree +module CD = Config_diff let error_message = ref "" @@ -154,6 +155,20 @@ let copy_node c_ptr old_path new_path = 0 with Vytree.Nonexistent_path -> 1 +let diffs path c_ptr_l c_ptr_r = + let path = split_on_whitespace path in + let ct_l = Root.get c_ptr_l in + let ct_r = Root.get c_ptr_r in + try + let ct_add, ct_del, ct_inter = CD.diffs path ct_l ct_r in + let ptr_add = Ctypes.Root.create ct_add in + let ptr_del = Ctypes.Root.create ct_del in + let ptr_inter = Ctypes.Root.create ct_inter in + let ptr_arr = Ctypes.CArray.make (ptr void) ~initial:ptr_add 3 in Ctypes.CArray.set ptr_arr 1 ptr_del; Ctypes.CArray.set ptr_arr 2 ptr_inter; Ctypes.CArray.start ptr_arr + + with + | CD.Incommensurable -> error_message := "Incommensurable"; Ctypes.CArray.start (Ctypes.CArray.make (ptr void) 3) + | CD.Empty_comparison -> error_message := "Empty comparison"; Ctypes.CArray.start (Ctypes.CArray.make (ptr void) 3) module Stubs(I : Cstubs_inverted.INTERNAL) = struct @@ -179,4 +194,5 @@ struct let () = I.internal "list_nodes" ((ptr void) @-> string @-> returning string) list_nodes let () = I.internal "return_value" ((ptr void) @-> string @-> returning string) return_value let () = I.internal "return_values" ((ptr void) @-> string @-> returning string) return_values + let () = I.internal "diffs" (string @-> (ptr void) @-> (ptr void) @-> returning (ptr (ptr void))) diffs end -- cgit v1.2.3 From b785b6302a199b7e03609b95279d2bf428b8338d Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Tue, 8 Feb 2022 21:10:56 -0600 Subject: configtree: T4235: allow rendering delete commands (cherry picked from commit eb2ec50dea6fa47326cbbe65b47c31a3a86836ba) --- lib/bindings.ml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/bindings.ml b/lib/bindings.ml index 40ef120..484a5d7 100644 --- a/lib/bindings.ml +++ b/lib/bindings.ml @@ -46,8 +46,12 @@ let render_json c_ptr = let render_json_ast c_ptr = CT.render_json_ast (Root.get c_ptr) -let render_commands c_ptr = - CT.render_commands (Root.get c_ptr) [] +let render_commands c_ptr op = + match op with + | "delete" -> + CT.render_commands ~op:CT.Delete (Root.get c_ptr) [] + | _ -> + CT.render_commands ~op:CT.Set (Root.get c_ptr) [] let set_add_value c_ptr path value = let ct = Root.get c_ptr in @@ -180,7 +184,7 @@ struct let () = I.internal "to_string" ((ptr void) @-> returning string) render_config let () = I.internal "to_json" ((ptr void) @-> returning string) render_json let () = I.internal "to_json_ast" ((ptr void) @-> returning string) render_json_ast - let () = I.internal "to_commands" ((ptr void) @-> returning string) render_commands + let () = I.internal "to_commands" ((ptr void) @-> string @-> returning string) render_commands let () = I.internal "set_add_value" ((ptr void) @-> string @-> string @-> returning int) set_add_value let () = I.internal "set_replace_value" ((ptr void) @-> string @-> string @-> returning int) set_replace_value let () = I.internal "set_valueless" ((ptr void) @-> string @-> returning int) set_valueless -- cgit v1.2.3 From c8f8449c7c697523ef0214a57ac97fcb959f7c1c Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Fri, 25 Feb 2022 15:48:52 -0600 Subject: T4235: binding for get_subtree (cherry picked from commit eda420ac7213bdc62f0ee1fa7ee8674418d350ac) --- lib/bindings.ml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/bindings.ml b/lib/bindings.ml index 484a5d7..155162c 100644 --- a/lib/bindings.ml +++ b/lib/bindings.ml @@ -116,6 +116,12 @@ let is_tag c_ptr path = let path = split_on_whitespace path in if (CT.is_tag ct path) then 1 else 0 +let get_subtree c_ptr path with_node = + let ct = Root.get c_ptr in + let path = split_on_whitespace path in + let subt = CT.get_subtree ~with_node:with_node ct path in + Ctypes.Root.create subt + let exists c_ptr path = let ct = Root.get c_ptr in let path = split_on_whitespace path in @@ -194,6 +200,7 @@ struct let () = I.internal "copy_node" ((ptr void) @-> string @-> string @-> returning int) copy_node let () = I.internal "set_tag" ((ptr void) @-> string @-> returning int) set_tag let () = I.internal "is_tag" ((ptr void) @-> string @-> returning int) is_tag + let () = I.internal "get_subtree" ((ptr void) @-> string @-> bool @-> returning (ptr void)) get_subtree let () = I.internal "exists" ((ptr void) @-> string @-> returning int) exists let () = I.internal "list_nodes" ((ptr void) @-> string @-> returning string) list_nodes let () = I.internal "return_value" ((ptr void) @-> string @-> returning string) return_value -- cgit v1.2.3 From 786d9c8749773a787a2c60b2c32b0c956918ee9b Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Fri, 25 Feb 2022 15:49:27 -0600 Subject: T4235: binding for modified return value of diff_tree (nee diffs) (cherry picked from commit 41c75d8440f3430a12e425b67d97dba6ba081b39) --- lib/bindings.ml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/lib/bindings.ml b/lib/bindings.ml index 155162c..7236c5a 100644 --- a/lib/bindings.ml +++ b/lib/bindings.ml @@ -165,20 +165,16 @@ let copy_node c_ptr old_path new_path = 0 with Vytree.Nonexistent_path -> 1 -let diffs path c_ptr_l c_ptr_r = +let diff_tree path c_ptr_l c_ptr_r = let path = split_on_whitespace path in let ct_l = Root.get c_ptr_l in let ct_r = Root.get c_ptr_r in try - let ct_add, ct_del, ct_inter = CD.diffs path ct_l ct_r in - let ptr_add = Ctypes.Root.create ct_add in - let ptr_del = Ctypes.Root.create ct_del in - let ptr_inter = Ctypes.Root.create ct_inter in - let ptr_arr = Ctypes.CArray.make (ptr void) ~initial:ptr_add 3 in Ctypes.CArray.set ptr_arr 1 ptr_del; Ctypes.CArray.set ptr_arr 2 ptr_inter; Ctypes.CArray.start ptr_arr - + let ct_ret = CD.diff_tree path ct_l ct_r in + Ctypes.Root.create ct_ret with - | CD.Incommensurable -> error_message := "Incommensurable"; Ctypes.CArray.start (Ctypes.CArray.make (ptr void) 3) - | CD.Empty_comparison -> error_message := "Empty comparison"; Ctypes.CArray.start (Ctypes.CArray.make (ptr void) 3) + | CD.Incommensurable -> error_message := "Incommensurable"; Ctypes.null + | CD.Empty_comparison -> error_message := "Empty comparison"; Ctypes.null module Stubs(I : Cstubs_inverted.INTERNAL) = struct @@ -205,5 +201,5 @@ struct let () = I.internal "list_nodes" ((ptr void) @-> string @-> returning string) list_nodes let () = I.internal "return_value" ((ptr void) @-> string @-> returning string) return_value let () = I.internal "return_values" ((ptr void) @-> string @-> returning string) return_values - let () = I.internal "diffs" (string @-> (ptr void) @-> (ptr void) @-> returning (ptr (ptr void))) diffs + let () = I.internal "diff_tree" (string @-> (ptr void) @-> (ptr void) @-> returning (ptr void)) diff_tree end -- cgit v1.2.3 From c550348937db96739976c88b79e743ef1d500394 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Sun, 27 Feb 2022 09:42:07 -0600 Subject: T4235: binding for trim_tree (cherry picked from commit ee296ca445452d6a5021144cd8747d1456ae315e) --- lib/bindings.ml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/bindings.ml b/lib/bindings.ml index 7236c5a..d9d2051 100644 --- a/lib/bindings.ml +++ b/lib/bindings.ml @@ -176,6 +176,16 @@ let diff_tree path c_ptr_l c_ptr_r = | CD.Incommensurable -> error_message := "Incommensurable"; Ctypes.null | CD.Empty_comparison -> error_message := "Empty comparison"; Ctypes.null +let trim_tree c_ptr_l c_ptr_r = + let ct_l = Root.get c_ptr_l in + let ct_r = Root.get c_ptr_r in + try + let ct_ret = CD.trim_tree ct_l ct_r in + Ctypes.Root.create ct_ret + with + | CD.Incommensurable -> error_message := "Incommensurable"; Ctypes.null + | CD.Empty_comparison -> error_message := "Empty comparison"; Ctypes.null + module Stubs(I : Cstubs_inverted.INTERNAL) = struct @@ -202,4 +212,5 @@ struct let () = I.internal "return_value" ((ptr void) @-> string @-> returning string) return_value let () = I.internal "return_values" ((ptr void) @-> string @-> returning string) return_values let () = I.internal "diff_tree" (string @-> (ptr void) @-> (ptr void) @-> returning (ptr void)) diff_tree + let () = I.internal "trim_tree" ((ptr void) @-> (ptr void) @-> returning (ptr void)) trim_tree end -- cgit v1.2.3