diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-08-09 09:45:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-09 09:45:40 +0200 |
| commit | 98ed11a7d6e35de49f57406a0dd9d4759541f2d4 (patch) | |
| tree | 3eb831987a33c1d86acd6668c034ee25188d21ef /src/conf_mode/service_console-server.py | |
| parent | 0e92ee262d8ec6ee88d7331f2cbffe8b6b689437 (diff) | |
| parent | 4c5afc9bd6d5acd6089d2b78c03daa65529eaec9 (diff) | |
| download | vyos-1x-98ed11a7d6e35de49f57406a0dd9d4759541f2d4.tar.gz vyos-1x-98ed11a7d6e35de49f57406a0dd9d4759541f2d4.zip | |
Merge pull request #2136 from jestabro/with-defaults
T5319: remove workarounds for incorrect defaults in config-mode scripts
Diffstat (limited to 'src/conf_mode/service_console-server.py')
| -rwxr-xr-x | src/conf_mode/service_console-server.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/conf_mode/service_console-server.py b/src/conf_mode/service_console-server.py index 7eb41ea87..b112add3f 100755 --- a/src/conf_mode/service_console-server.py +++ b/src/conf_mode/service_console-server.py @@ -20,10 +20,8 @@ from sys import exit from psutil import process_iter from vyos.config import Config -from vyos.configdict import dict_merge from vyos.template import render from vyos.utils.process import call -from vyos.xml import defaults from vyos import ConfigError config_file = '/run/conserver/conserver.cf' @@ -49,11 +47,7 @@ def get_config(config=None): # We have gathered the dict representation of the CLI, but there are default # options which we need to update into the dictionary retrived. - default_values = defaults(base + ['device']) - if 'device' in proxy: - for device in proxy['device']: - tmp = dict_merge(default_values, proxy['device'][device]) - proxy['device'][device] = tmp + proxy = conf.merge_defaults(proxy, recursive=True) return proxy |