diff options
| author | John Estabrook <jestabro@vyos.io> | 2022-03-10 10:07:19 -0600 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2022-03-10 12:10:49 -0600 |
| commit | ef4870e66f8c1cd6df5fba2abbfdde0eac152e0a (patch) | |
| tree | b79abe885d3b5392f8b2fa434cd4816833eea581 /python | |
| parent | fde48b4d303b471f8c56b81bc7fcef0a028bb60a (diff) | |
| download | vyos-1x-ef4870e66f8c1cd6df5fba2abbfdde0eac152e0a.tar.gz vyos-1x-ef4870e66f8c1cd6df5fba2abbfdde0eac152e0a.zip | |
Revert "save-config: T4292: rewrite vyatta-save-config.pl to Python"
This reverts commit c4d389488970c8510200cac96a67182e9333b891.
Revert while investigating failure in vyos-configtest.
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/config.py | 5 | ||||
| -rw-r--r-- | python/vyos/configsession.py | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/python/vyos/config.py b/python/vyos/config.py index 829167820..a5c1ad122 100644 --- a/python/vyos/config.py +++ b/python/vyos/config.py @@ -93,11 +93,6 @@ class Config(object): (self._running_config, self._session_config) = self._config_source.get_configtree_tuple() - def get_config_tree(self, effective=False): - if effective: - return self._running_config - return self._session_config - def _make_path(self, path): # Backwards-compatibility stuff: original implementation used string paths # libvyosconfig paths are lists, but since node names cannot contain whitespace, diff --git a/python/vyos/configsession.py b/python/vyos/configsession.py index a7eda6e61..f28ad09c5 100644 --- a/python/vyos/configsession.py +++ b/python/vyos/configsession.py @@ -28,7 +28,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'] -SAVE_CONFIG = ['/usr/libexec/vyos/vyos-save-config.py'] +SAVE_CONFIG = ['/opt/vyatta/sbin/vyatta-save-config.pl'] INSTALL_IMAGE = ['/opt/vyatta/sbin/install-image', '--url'] REMOVE_IMAGE = ['/opt/vyatta/bin/vyatta-boot-image.pl', '--del'] GENERATE = ['/opt/vyatta/bin/vyatta-op-cmd-wrapper', 'generate'] |