From 4809941c24d363c9ab44348ec1060559cf58ce24 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Fri, 31 Jan 2025 15:47:55 -0600 Subject: T6946: binding for show_commit_data --- Makefile | 2 +- lib/bindings.ml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0ba31e2..28e6da4 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ BUILDDIR=_build VPATH=$(BUILDDIR) OCAMLDIR=$(shell ocamlopt -where) $(shell mkdir -p $(BUILDDIR) $(BUILDDIR)/stub $(BUILDDIR)/lib $(BUILDDIR)/stub_generator $(BUILDDIR)/test $(BUILDDIR)/generated) -PACKAGES=vyos1x-config,re,ctypes.stubs,ctypes.foreign +PACKAGES=vyos1x-config,vyconf.vyconfd-config,re,ctypes.stubs,ctypes.foreign GENERATOR_FILES=$(BUILDDIR)/lib/bindings.cmx \ $(BUILDDIR)/stub_generator/generate.cmx diff --git a/lib/bindings.ml b/lib/bindings.ml index 052495d..09fe5f4 100644 --- a/lib/bindings.ml +++ b/lib/bindings.ml @@ -2,9 +2,11 @@ open Ctypes open Foreign open Vyos1x +open Vyconfd_config module CT = Config_tree module CD = Config_diff +module CM = Commit let error_message = ref "" @@ -245,6 +247,11 @@ let mask_tree c_ptr_l c_ptr_r = | CD.Incommensurable -> error_message := "Incommensurable"; Ctypes.null | CD.Empty_comparison -> error_message := "Empty comparison"; Ctypes.null +let show_commit_data c_ptr_a c_ptr_w = + let ct_a = Root.get c_ptr_a in + let ct_w = Root.get c_ptr_w in + CM.show_commit_data ct_a ct_w + module Stubs(I : Cstubs_inverted.INTERNAL) = struct @@ -278,4 +285,5 @@ struct let () = I.internal "tree_union" ((ptr void) @-> (ptr void) @-> returning (ptr void)) tree_union let () = I.internal "reference_tree_to_json" (string @-> string @-> string @-> returning int) reference_tree_to_json let () = I.internal "mask_tree" ((ptr void) @-> (ptr void) @-> returning (ptr void)) mask_tree + let () = I.internal "show_commit_data" ((ptr void) @-> (ptr void) @-> returning string) show_commit_data end -- cgit v1.2.3 From 7b32d2f139aa44dd3aa3cd738bc39a9e77ebb353 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Wed, 5 Feb 2025 15:25:27 -0600 Subject: T7121: add configtree read/write to internal representation --- lib/bindings.ml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/lib/bindings.ml b/lib/bindings.ml index 09fe5f4..49f4657 100644 --- a/lib/bindings.ml +++ b/lib/bindings.ml @@ -8,6 +8,8 @@ module CT = Config_tree module CD = Config_diff module CM = Commit +module I = Internal.Make(Config_tree) + let error_message = ref "" let make_syntax_error pos err = @@ -25,6 +27,9 @@ let make_config_tree name = Ctypes.Root.create (CT.make name) let destroy c_ptr = Root.release c_ptr +let equal c_ptr_l c_ptr_r = + (Root.get c_ptr_l) = (Root.get c_ptr_r) + let from_string s = try error_message := ""; @@ -55,6 +60,22 @@ let render_commands c_ptr op = | _ -> CT.render_commands ~op:CT.Set (Root.get c_ptr) [] +let read_internal file = + try + error_message := ""; + let ct = I.read_internal file in + Ctypes.Root.create ct + with Internal.Read_error msg -> + error_message := msg; Ctypes.null + +let write_internal c_ptr file = + try + error_message := ""; + let ct = Root.get c_ptr in + I.write_internal ct file + with Internal.Write_error msg -> + error_message := msg + let create_node c_ptr path = let ct = Root.get c_ptr in let path = split_on_whitespace path in @@ -257,12 +278,15 @@ struct let () = I.internal "make" (string @-> returning (ptr void)) make_config_tree let () = I.internal "destroy" ((ptr void) @-> returning void) destroy + let () = I.internal "equal" ((ptr void) @-> (ptr void) @-> returning bool) equal let () = I.internal "from_string" (string @-> returning (ptr void)) from_string let () = I.internal "get_error" (void @-> returning string) get_error let () = I.internal "to_string" ((ptr void) @-> bool @-> 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) @-> string @-> returning string) render_commands + let () = I.internal "read_internal" (string @-> returning (ptr void)) read_internal + let () = I.internal "write_internal" ((ptr void) @-> string @-> returning void) write_internal let () = I.internal "create_node" ((ptr void) @-> string @-> returning int) create_node 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 -- cgit v1.2.3 From e3ae891db98471b61fb6a6a56e5c6c2c494314cb Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Wed, 5 Feb 2025 17:28:18 -0600 Subject: T7121: create session directory --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/rules b/debian/rules index 99a5ee2..eb80bf0 100755 --- a/debian/rules +++ b/debian/rules @@ -4,6 +4,7 @@ DIR := debian/tmp OCAML_DIR := /opt/opam/${OCAML_VERSION} VYCONF := usr/libexec/vyos/vyconf VYCONF_CONF := $(VYCONF)/config +VYCONF_SESSION := $(VYCONF)/session VYCONF_DATA := usr/share/vyos/vyconf VYCONF_DEF := etc/vyos @@ -15,6 +16,7 @@ override_dh_auto_build: override_dh_auto_install: mkdir -p $(DIR)/$(VYCONF_CONF) + mkdir -p $(DIR)/$(VYCONF_SESSION) mkdir -p $(DIR)/$(VYCONF_DATA) mkdir -p $(DIR)/$(VYCONF_DEF) cp $(OCAML_DIR)/share/vyconf/vyconf.proto $(DIR)/$(VYCONF_DATA) -- cgit v1.2.3 From 91853bf4daf0a9fedc2f0f13516ef94db54fb244 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Mon, 17 Feb 2025 14:38:41 -0600 Subject: T7121: add binding for test_commit --- Makefile | 2 +- lib/bindings.ml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 28e6da4..b61d0d2 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ BUILDDIR=_build VPATH=$(BUILDDIR) OCAMLDIR=$(shell ocamlopt -where) $(shell mkdir -p $(BUILDDIR) $(BUILDDIR)/stub $(BUILDDIR)/lib $(BUILDDIR)/stub_generator $(BUILDDIR)/test $(BUILDDIR)/generated) -PACKAGES=vyos1x-config,vyconf.vyconfd-config,re,ctypes.stubs,ctypes.foreign +PACKAGES=vyos1x-config,vyconf.vyconfd-config,vyconf.vycall-client,re,ctypes.stubs,ctypes.foreign GENERATOR_FILES=$(BUILDDIR)/lib/bindings.cmx \ $(BUILDDIR)/stub_generator/generate.cmx diff --git a/lib/bindings.ml b/lib/bindings.ml index 49f4657..0ce05d1 100644 --- a/lib/bindings.ml +++ b/lib/bindings.ml @@ -3,10 +3,12 @@ open Foreign open Vyos1x open Vyconfd_config +open Commitd_client module CT = Config_tree module CD = Config_diff module CM = Commit +module VC = Vycall_client module I = Internal.Make(Config_tree) @@ -273,6 +275,11 @@ let show_commit_data c_ptr_a c_ptr_w = let ct_w = Root.get c_ptr_w in CM.show_commit_data ct_a ct_w +let test_commit c_ptr_a c_ptr_w = + let ct_a = Root.get c_ptr_a in + let ct_w = Root.get c_ptr_w in + VC.test_commit ct_a ct_w + module Stubs(I : Cstubs_inverted.INTERNAL) = struct @@ -310,4 +317,5 @@ struct let () = I.internal "reference_tree_to_json" (string @-> string @-> string @-> returning int) reference_tree_to_json let () = I.internal "mask_tree" ((ptr void) @-> (ptr void) @-> returning (ptr void)) mask_tree let () = I.internal "show_commit_data" ((ptr void) @-> (ptr void) @-> returning string) show_commit_data + let () = I.internal "test_commit" ((ptr void) @-> (ptr void) @-> returning void) test_commit end -- cgit v1.2.3 From 97cdcfaa28c5275912e3828ee8ea23fcfe918877 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Tue, 18 Mar 2025 10:22:33 -0500 Subject: T7121: T6946: update hashes for commit algorithm/commitd messaging --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 054ade4..f4da007 100755 --- a/build.sh +++ b/build.sh @@ -2,8 +2,8 @@ DIR=$1 -sudo sh -c 'eval $(opam env --root=/opt/opam --set-root) && opam pin add vyos1x-config https://github.com/vyos/vyos1x-config.git#be576e9d9281d8b97059bba3882be8deac4f724d -y' -sudo sh -c 'eval $(opam env --root=/opt/opam --set-root) && opam pin add vyconf https://github.com/vyos/vyconf.git#a375860a302a224722d254c31a1cb210cb12d972 -y' +sudo sh -c 'eval $(opam env --root=/opt/opam --set-root) && opam pin add vyos1x-config https://github.com/vyos/vyos1x-config.git#d08be19809a3e1c8413e0d98556273244dc18e77 -y' +sudo sh -c 'eval $(opam env --root=/opt/opam --set-root) && opam pin add vyconf https://github.com/vyos/vyconf.git#33cc7567d909c776d43ea6698267125ea1ec2f66 -y' eval `opam config env` make clean -- cgit v1.2.3