diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-05-29 14:29:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-29 14:29:39 +0200 |
| commit | 84f1263334de5dcea30fadf02451e8a73e989414 (patch) | |
| tree | 7fe10eab0e68e274e2aab36e3b6e0bf8906e4992 /python | |
| parent | e604e68a5a77718a25b60737dcb9699b84c8e34b (diff) | |
| parent | c8d4ef91d39216218a10d6e643bdb15a2530628c (diff) | |
| download | vyos-1x-84f1263334de5dcea30fadf02451e8a73e989414.tar.gz vyos-1x-84f1263334de5dcea30fadf02451e8a73e989414.zip | |
Merge pull request #4530 from jestabro/api-extend-load-merge
http-api: T7498: allow passing config string in body of 'load' or 'merge' request
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/configsession.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/python/vyos/configsession.py b/python/vyos/configsession.py index b6394d139..4e0dd23a4 100644 --- a/python/vyos/configsession.py +++ b/python/vyos/configsession.py @@ -36,6 +36,7 @@ DISCARD = '/opt/vyatta/sbin/my_discard' SHOW_CONFIG = ['/bin/cli-shell-api', 'showConfig'] LOAD_CONFIG = ['/bin/cli-shell-api', 'loadFile'] MIGRATE_LOAD_CONFIG = ['/usr/libexec/vyos/vyos-load-config.py'] +MERGE_CONFIG = ['/usr/libexec/vyos/vyos-merge-config.py'] SAVE_CONFIG = ['/usr/libexec/vyos/vyos-save-config.py'] INSTALL_IMAGE = [ '/usr/libexec/vyos/op_mode/image_installer.py', @@ -339,6 +340,14 @@ 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' + + return out + def save_config(self, file_path): if self._vyconf_session is None: out = self.__run_command(SAVE_CONFIG + [file_path]) |