summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2023-08-06 20:42:20 -0500
committerJohn Estabrook <jestabro@vyos.io>2023-08-07 14:46:42 -0500
commit940a873709a83c3d1324cf8b57e7522fd80ffc94 (patch)
tree422ef2135a7fecb056a2d8d179b4000bbf8120cd /src/conf_mode
parentb62c2685af62ed8715fae71f94df7a2fe645bd64 (diff)
downloadvyos-1x-940a873709a83c3d1324cf8b57e7522fd80ffc94.tar.gz
vyos-1x-940a873709a83c3d1324cf8b57e7522fd80ffc94.zip
T5434: use auto-defaults in system-option.py
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/system-option.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/conf_mode/system-option.py b/src/conf_mode/system-option.py
index 917013651..d92121b3d 100755
--- a/src/conf_mode/system-option.py
+++ b/src/conf_mode/system-option.py
@@ -21,14 +21,12 @@ from sys import exit
from time import sleep
from vyos.config import Config
-from vyos.configdict import dict_merge
from vyos.configverify import verify_source_interface
from vyos.template import render
from vyos.utils.process import cmd
from vyos.utils.process import is_systemd_service_running
from vyos.utils.network import is_addr_assigned
from vyos.utils.network import is_intf_addr_assigned
-from vyos.xml import defaults
from vyos import ConfigError
from vyos import airbag
airbag.enable()
@@ -48,12 +46,9 @@ def get_config(config=None):
else:
conf = Config()
base = ['system', 'option']
- options = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True)
-
- # 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)
- options = dict_merge(default_values, options)
+ options = conf.get_config_dict(base, key_mangling=('-', '_'),
+ get_first_key=True,
+ with_recursive_defaults=True)
return options