diff options
| author | John Estabrook <jestabro@vyos.io> | 2025-10-14 15:54:52 -0700 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2025-10-22 19:36:45 -0500 |
| commit | 916ea4510c35e1e37cf2ff53f48df20a1a1998bf (patch) | |
| tree | 6555a4f029e1b12ef6e454fd0fca49399aecb0cb | |
| parent | 304e4d2a172fe1baf2c1df7f61b7a0a8e40f7d5d (diff) | |
| download | vyconf-916ea4510c35e1e37cf2ff53f48df20a1a1998bf.tar.gz vyconf-916ea4510c35e1e37cf2ff53f48df20a1a1998bf.zip | |
T7910: drop proposed_config field from session record
After the move in T7728 to dynamically generate the session proposed
config, the record field can be dropped.
| -rw-r--r-- | src/session.ml | 4 | ||||
| -rw-r--r-- | src/session.mli | 1 | ||||
| -rw-r--r-- | src/vyconfd.ml | 3 |
3 files changed, 2 insertions, 6 deletions
diff --git a/src/session.ml b/src/session.ml index 5f70feb..4156b73 100644 --- a/src/session.ml +++ b/src/session.ml @@ -30,7 +30,6 @@ type aux_op = { type session_data = { - proposed_config : CT.t; modified: bool; conf_mode: bool; changeset: cfg_op list; @@ -41,8 +40,7 @@ type session_data = { client_sudo_user: string; } -let make world client_app sudo_user user pid = { - proposed_config = world.running_config; +let make _world client_app sudo_user user pid = { modified = false; conf_mode = false; changeset = []; diff --git a/src/session.mli b/src/session.mli index a08f873..ea838c9 100644 --- a/src/session.mli +++ b/src/session.mli @@ -16,7 +16,6 @@ type aux_op = { } [@@deriving yojson] type session_data = { - proposed_config : Vyos1x.Config_tree.t; modified: bool; conf_mode: bool; changeset: cfg_op list; diff --git a/src/vyconfd.ml b/src/vyconfd.ml index 05cd693..caaee9c 100644 --- a/src/vyconfd.ml +++ b/src/vyconfd.ml @@ -113,11 +113,10 @@ let enter_conf_mode req token = if req.exclusive then (conf_mode_lock := Some session.client_pid; aux token session) else aux token session -let exit_conf_mode world token = +let exit_conf_mode _world token = let open Session in let session = Hashtbl.find sessions token in let session = {session with - proposed_config=world.running_config; changeset = []; modified = false} in Hashtbl.replace sessions token session; |