diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/commit.ml | 13 | ||||
| -rw-r--r-- | src/session.ml | 17 | ||||
| -rw-r--r-- | src/session.mli | 2 | ||||
| -rw-r--r-- | src/vycall_client.ml | 12 | ||||
| -rw-r--r-- | src/vycall_client.mli | 2 | ||||
| -rw-r--r-- | src/vyconfd.ml | 57 |
6 files changed, 61 insertions, 42 deletions
diff --git a/src/commit.ml b/src/commit.ml index acfecfe..ba740b5 100644 --- a/src/commit.ml +++ b/src/commit.ml @@ -61,6 +61,9 @@ let default_commit_data = { result = { success = true; out = ""; }; } +let fail_status msg = + { success=false; out=msg } + let lex_order c1 c2 = let c = Vyos1x.Util.lex_order c1.path c2.path in match c with @@ -222,11 +225,17 @@ let config_result_update c_data n_data = let commit_update c_data = match c_data.init with - | None -> raise (Commit_error "commitd failure: no init status provided") + | None -> + { default_commit_data with + init=Some (fail_status "commitd failure: no init status provided") + } | Some _ -> let func acc_data nd = match nd.reply with - | None -> raise (Commit_error "commitd failure: no reply status provided") + | None -> + { default_commit_data with + init=Some (fail_status"commitd failure: no reply status provided") + } | Some _ -> config_result_update acc_data nd in List.fold_left func c_data c_data.node_list diff --git a/src/session.ml b/src/session.ml index 9e78be3..567f999 100644 --- a/src/session.ml +++ b/src/session.ml @@ -1,8 +1,6 @@ module CT = Vyos1x.Config_tree module VT = Vyos1x.Vytree module RT = Vyos1x.Reference_tree -module CC = Commitd_client.Commit -module VC = Commitd_client.Vycall_client module D = Directories exception Session_error of string @@ -90,21 +88,6 @@ let delete w s path = let config = apply_cfg_op op s.proposed_config in {s with proposed_config=config; changeset=(op :: s.changeset)} -let commit w s t = - let at = w.running_config in - let wt = s.proposed_config in - let rt = w.reference_tree in - let commit_data = CC.make_commit_data rt at wt t in - let received_commit_data = VC.do_commit commit_data in - let result_commit_data = - try - CC.commit_update received_commit_data - with CC.Commit_error e -> - raise (Session_error (Printf.sprintf "Commit internal error: %s" e)) - in - w.running_config <- result_commit_data.config_result; - result_commit_data.result.success, result_commit_data.result.out - let get_value w s path = if not (VT.exists s.proposed_config path) then raise (Session_error ("Config path does not exist")) diff --git a/src/session.mli b/src/session.mli index 507b33e..2166a80 100644 --- a/src/session.mli +++ b/src/session.mli @@ -32,8 +32,6 @@ val set : world -> session_data -> string list -> session_data val delete : world -> session_data -> string list -> session_data -val commit : world -> session_data -> string -> bool * string - val get_value : world -> session_data -> string list -> string val get_values : world -> session_data -> string list -> string list diff --git a/src/vycall_client.ml b/src/vycall_client.ml index 140fe2a..11bbe3f 100644 --- a/src/vycall_client.ml +++ b/src/vycall_client.ml @@ -86,10 +86,8 @@ let create sockfile = let do_commit commit_data = let session = commit_data_to_commit_proto commit_data in - let run () = - let sockfile = "/run/vyos-commitd.sock" in - let%lwt client = create sockfile in - let%lwt resp = do_call client session in - let%lwt () = Lwt_io.close client.oc in - Lwt.return (commit_proto_to_commit_data resp commit_data) - in Lwt_main.run @@ run () + let sockfile = "/run/vyos-commitd.sock" in + let%lwt client = create sockfile in + let%lwt resp = do_call client session in + let%lwt () = Lwt_io.close client.oc in + Lwt.return(commit_proto_to_commit_data resp commit_data) diff --git a/src/vycall_client.mli b/src/vycall_client.mli index 758a32f..fe19231 100644 --- a/src/vycall_client.mli +++ b/src/vycall_client.mli @@ -1 +1 @@ -val do_commit : Commit.commit_data -> Commit.commit_data +val do_commit : Commit.commit_data -> Commit.commit_data Lwt.t diff --git a/src/vyconfd.ml b/src/vyconfd.ml index 76f7205..d3e4216 100644 --- a/src/vyconfd.ml +++ b/src/vyconfd.ml @@ -4,8 +4,11 @@ open Vyconf_connect.Vyconf_pbt open Vyconfd_config.Defaults open Vyconfd_config.Vyconf_config -module FP = FilePath module CT = Vyos1x.Config_tree +module IC = Vyos1x.Internal.Make(CT) +module CC = Commitd_client.Commit +module VC = Commitd_client.Vycall_client +module FP = FilePath module Gen = Vyos1x.Generate module Session = Vyconfd_config.Session module Directories = Vyconfd_config.Directories @@ -161,13 +164,38 @@ let delete world token (req: request_delete) = with Session.Session_error msg -> {response_tmpl with status=Fail; error=(Some msg)} let commit world token (_req: request_commit) = - try - let success, msg_str = Session.commit world (find_session token) token in - match success with - | true -> {response_tmpl with status=Success; output=(Some msg_str)} - | false -> {response_tmpl with status=Fail; output=(Some msg_str)} - with Session.Session_error msg -> - {response_tmpl with status=Internal_error; error=(Some msg)} + let s = find_session token in + let at = world.Session.running_config in + let wt = s.proposed_config in + let rt = world.reference_tree in + let vc = world.vyconf_config in + let () = IC.write_internal at (FP.concat vc.session_dir vc.running_cache) in + let () = IC.write_internal wt (FP.concat vc.session_dir vc.session_cache) in + + let commit_data = CC.make_commit_data rt at wt token in + let%lwt received_commit_data = VC.do_commit commit_data in + let%lwt result_commit_data = + Lwt.return (CC.commit_update received_commit_data) + in + match result_commit_data.init with + | None -> + let out = "Empty init" in + Lwt.return {response_tmpl with status=Internal_error; error=(Some out)} + | Some init_data -> + let res, out = + init_data.success, init_data.out + in + match res with + | false -> + Lwt.return {response_tmpl with status=Internal_error; error=(Some out)} + | true -> + world.Session.running_config <- result_commit_data.config_result; + let success, msg_str = + result_commit_data.result.success, result_commit_data.result.out + in + match success with + | true -> Lwt.return {response_tmpl with status=Success; output=(Some msg_str)} + | false -> Lwt.return {response_tmpl with status=Fail; output=(Some msg_str)} let reload_reftree world (_req: request_reload_reftree) = let config = world.Session.vyconf_config in @@ -197,11 +225,14 @@ let rec handle_connection world ic oc () = with Pbrt.Decoder.Failure e -> Lwt.return (Error (Pbrt.Decoder.error_to_string e)) in let%lwt resp = - (match req with - | Error msg -> {response_tmpl with status=Fail; error=(Some (Printf.sprintf "Decoding error: %s" msg))} + match req with + | Error msg -> Lwt.return {response_tmpl with status=Fail; error=(Some (Printf.sprintf "Decoding error: %s" msg))} | Ok req -> + match req with + | Some t, Commit r -> commit world t r + | _ as req -> begin - match req with + (match req with | _, Status -> response_tmpl | _, Setup_session r -> setup_session world r | _, Reload_reftree r -> reload_reftree world r @@ -217,9 +248,9 @@ let rec handle_connection world ic oc () = | Some t, Validate r -> validate world t r | Some t, Set r -> set world t r | Some t, Delete r -> delete world t r - | Some t, Commit r -> commit world t r | _ -> failwith "Unimplemented" - end) |> Lwt.return + ) |> Lwt.return + end in let%lwt () = send_response oc resp in handle_connection world ic oc () |