diff options
| author | John Estabrook <jestabro@vyos.io> | 2025-06-28 23:05:00 -0500 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2025-07-08 08:26:11 -0500 |
| commit | fc7329f3d2bb6b18a36b01626d1fab51bde4012e (patch) | |
| tree | 4739e0afb0d1f6e2f61e0c4cb94b6b55985cca74 /python | |
| parent | 352ebebc689df69488a70ff496f364f03d4767fa (diff) | |
| download | vyos-1x-fc7329f3d2bb6b18a36b01626d1fab51bde4012e.tar.gz vyos-1x-fc7329f3d2bb6b18a36b01626d1fab51bde4012e.zip | |
T7499: expose direct request to http-api
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/configsession.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/python/vyos/configsession.py b/python/vyos/configsession.py index 175b40260..569a82f3c 100644 --- a/python/vyos/configsession.py +++ b/python/vyos/configsession.py @@ -364,8 +364,13 @@ class ConfigSession(object): return out def merge_config(self, file_path, destructive=False): - destr = ['--destructive'] if destructive else [] - out = self.__run_command(MERGE_CONFIG + [file_path] + destr) + if self._vyconf_session is None: + destr = ['--destructive'] if destructive else [] + out = self.__run_command(MERGE_CONFIG + [file_path] + destr) + else: + out, _ = self._vyconf_session.merge_config( + file=file_path, destructive=destructive + ) return out |