From 12a21a4bba6dfeb3ebb005b62748a2dbaabd84df Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Mon, 9 Dec 2019 11:36:48 -0600 Subject: vyos.config: T1846: ignore edit level when obtaining working config --- python/vyos/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'python/vyos') diff --git a/python/vyos/config.py b/python/vyos/config.py index c677d3118..532b56571 100644 --- a/python/vyos/config.py +++ b/python/vyos/config.py @@ -107,7 +107,7 @@ class Config(object): # Session config ("active") only exists in conf mode. # In op mode, we'll just use the same running config for both active and session configs. if self.in_session(): - session_config_text = self._run([self._cli_shell_api, '--show-working-only', '--show-show-defaults', 'showConfig']) + session_config_text = self._run([self._cli_shell_api, '--show-working-only', '--show-show-defaults', '--show-ignore-edit', 'showConfig']) else: session_config_text = running_config_text -- cgit v1.2.3 From eced4a49c67d2e0e3e131193afe679aee0c5c679 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Mon, 9 Dec 2019 11:57:09 -0600 Subject: vyos.config: T1764: allow for list argument to exists, in value case --- python/vyos/config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'python/vyos') diff --git a/python/vyos/config.py b/python/vyos/config.py index 532b56571..441944338 100644 --- a/python/vyos/config.py +++ b/python/vyos/config.py @@ -194,7 +194,8 @@ class Config(object): else: # libvyosconfig exists() works only for _nodes_, not _values_ # libvyattacfg one also worked for values, so we emulate that case here - path = re.split(r'\s*', path) + if isinstance(path, str): + path = re.split(r'\s*', path) path_without_value = path[:-1] path_str = " ".join(path_without_value) try: -- cgit v1.2.3