diff options
| author | John Estabrook <jestabro@vyos.io> | 2025-06-23 19:24:08 -0500 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2025-07-08 08:26:11 -0500 |
| commit | 170244db88f76e42aeceb0b971246327fe079e19 (patch) | |
| tree | d74e806635f1c98b9730df4c6ac9f18f57f4fd31 /python | |
| parent | 8af85206e172b2c50514df9990ea6061f72a1ed5 (diff) | |
| download | vyos-1x-170244db88f76e42aeceb0b971246327fe079e19.tar.gz vyos-1x-170244db88f76e42aeceb0b971246327fe079e19.zip | |
T7499: expose destructive merge in http-api
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/configsession.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/python/vyos/configsession.py b/python/vyos/configsession.py index 216069992..175b40260 100644 --- a/python/vyos/configsession.py +++ b/python/vyos/configsession.py @@ -363,11 +363,9 @@ class ConfigSession(object): return out - def merge_config(self, file_path): - if self._vyconf_session is None: - out = self.__run_command(MERGE_CONFIG + [file_path]) - else: - out = 'unimplemented' + def merge_config(self, file_path, destructive=False): + destr = ['--destructive'] if destructive else [] + out = self.__run_command(MERGE_CONFIG + [file_path] + destr) return out |