diff options
| author | John Estabrook <jestabro@vyos.io> | 2025-05-28 14:53:38 -0500 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2025-05-28 15:35:16 -0500 |
| commit | c8d4ef91d39216218a10d6e643bdb15a2530628c (patch) | |
| tree | 4c0636190f0084b506524e0bb7d2ec6db07ff63e /python | |
| parent | 0464fc0dd9c62beff242ec024086fb57947469c0 (diff) | |
| download | vyos-1x-c8d4ef91d39216218a10d6e643bdb15a2530628c.tar.gz vyos-1x-c8d4ef91d39216218a10d6e643bdb15a2530628c.zip | |
http-api: T7498: allow passing config string in body of '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 1b19c68b4..7be2e665c 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', @@ -338,6 +339,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]) |