diff options
| author | John Estabrook <jestabro@vyos.io> | 2025-07-08 10:11:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-08 10:11:57 -0500 |
| commit | 4b34c65d4129eede784d5747653bd81f8d40f299 (patch) | |
| tree | 012976de08a49c6640c958b9b9c2fc6d7b836445 /src/services/api | |
| parent | 2fa5d19d86c82f4519bd6aa05ba0c7d571172f3a (diff) | |
| parent | 4d7a3a972a11ead1386ae2719b70dbfc2411831f (diff) | |
| download | vyos-1x-4b34c65d4129eede784d5747653bd81f8d40f299.tar.gz vyos-1x-4b34c65d4129eede784d5747653bd81f8d40f299.zip | |
Merge pull request #4574 from jestabro/merge-config
T7499: update config merge tools
Diffstat (limited to 'src/services/api')
| -rw-r--r-- | src/services/api/rest/models.py | 1 | ||||
| -rw-r--r-- | src/services/api/rest/routers.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/services/api/rest/models.py b/src/services/api/rest/models.py index 7a61ddfd1..70fab03ec 100644 --- a/src/services/api/rest/models.py +++ b/src/services/api/rest/models.py @@ -143,6 +143,7 @@ class ConfigFileModel(ApiModel): file: StrictStr = None string: StrictStr = None confirm_time: StrictInt = 0 + destructive: bool = False class Config: json_schema_extra = { diff --git a/src/services/api/rest/routers.py b/src/services/api/rest/routers.py index 48eca8f15..329d6e51f 100644 --- a/src/services/api/rest/routers.py +++ b/src/services/api/rest/routers.py @@ -597,7 +597,7 @@ async def config_file_op(data: ConfigFileModel, background_tasks: BackgroundTask case 'load': session.migrate_and_load_config(path) case 'merge': - session.merge_config(path) + session.merge_config(path, destructive=data.destructive) config = Config(session_env=env) d = get_config_diff(config) |