diff options
| author | John Estabrook <jestabro@vyos.io> | 2025-03-20 14:27:22 -0500 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2025-03-31 00:50:30 -0500 |
| commit | 96058ef19d655a8854ccbb676ec43b16b4d1e0af (patch) | |
| tree | c15232446a3497a59f58fc7627814c4d78cd1247 /src | |
| parent | 920b75a6dbf9eac4b94600b759818b2ec28004ae (diff) | |
| download | vyconf-96058ef19d655a8854ccbb676ec43b16b4d1e0af.tar.gz vyconf-96058ef19d655a8854ccbb676ec43b16b4d1e0af.zip | |
T7272: clean up dune file names and dependencies
Diffstat (limited to 'src')
| -rw-r--r-- | src/adapter/vyos1x_adapter.ml | 2 | ||||
| -rw-r--r-- | src/dune | 17 | ||||
| -rw-r--r-- | src/validate.ml | 2 | ||||
| -rw-r--r-- | src/vycli.ml | 4 |
4 files changed, 12 insertions, 13 deletions
diff --git a/src/adapter/vyos1x_adapter.ml b/src/adapter/vyos1x_adapter.ml index dedb2cd..d4dbac7 100644 --- a/src/adapter/vyos1x_adapter.ml +++ b/src/adapter/vyos1x_adapter.ml @@ -44,7 +44,7 @@ let delete_path_reversed handle path _len = let path = List.rev path in cstore_delete_path handle path -module VC = Client.Vyconf_client_session +module VC = Vyconfd_client.Vyconf_client_session let get_sockname = "/var/run/vyconfd.sock" @@ -4,23 +4,22 @@ (name vyconf_connect) (public_name vyconf.vyconf-connect) (modules vyconf_pbt message) - (libraries lwt lwt.unix lwt_log lwt_ppx ocaml-protoc fileutils ppx_deriving_yojson) - (preprocess (pps lwt_ppx ppx_deriving_yojson))) + (libraries lwt lwt.unix lwt_log lwt_ppx ocaml-protoc ocplib-endian) + (preprocess (pps lwt_ppx))) (library (name vyconfd_config) (public_name vyconf.vyconfd-config) (modules vyconf_config startup session directories defaults commit) - (libraries vyos1x-config vyconf_connect toml sha ppx_deriving.show) + (libraries vyos1x-config vyconf_connect toml sha ppx_deriving.show yojson ppx_deriving_yojson) (preprocess (pps lwt_ppx ppx_deriving.show ppx_deriving_yojson))) (library - (name client) + (name vyconfd_client) (public_name vyconf.vyconf-client) (modules vyconf_client vyconf_client_session) - (libraries vyos1x-config vyconf_connect lwt lwt.unix lwt_log lwt_ppx ocaml-protoc toml sha - yojson ppx_deriving.show ppx_deriving_yojson) - (preprocess (pps lwt_ppx ppx_deriving.show ppx_deriving_yojson))) + (libraries vyos1x-config vyconf_connect lwt lwt.unix lwt_log lwt_ppx) + (preprocess (pps lwt_ppx))) (library (name vycall_message) @@ -46,14 +45,14 @@ (name vycli) (public_name vycli) (modules vycli) - (libraries client) + (libraries vyconfd_client) (preprocess (pps lwt_ppx))) (executable (name validate) (public_name validate) (modules validate) - (libraries client)) + (libraries vyconfd_client)) (executable (name test_commit_data) diff --git a/src/validate.ml b/src/validate.ml index 7b3b596..875bc7a 100644 --- a/src/validate.ml +++ b/src/validate.ml @@ -1,4 +1,4 @@ -open Client.Vyconf_client_session +open Vyconfd_client.Vyconf_client_session let path_opt = ref "" diff --git a/src/vycli.ml b/src/vycli.ml index f793ae0..bd14713 100644 --- a/src/vycli.ml +++ b/src/vycli.ml @@ -1,4 +1,4 @@ -open Client.Vyconf_client +open Vyconfd_client.Vyconf_client open Vyconf_connect.Vyconf_pbt type op_t = @@ -53,7 +53,7 @@ let output_format_of_string s = | _ -> failwith (Printf.sprintf "Unknown output format %s, should be plain or json" s) let main socket op path out_format config_format = - let%lwt client = Client.Vyconf_client.create ~token:!token socket out_format config_format in + let%lwt client = create ~token:!token socket out_format config_format in let%lwt result = match op with | None -> Error "Operation required" |> Lwt.return | Some o -> |