diff options
| author | John Estabrook <jestabro@vyos.io> | 2023-08-06 20:27:07 -0500 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2023-08-07 14:46:42 -0500 |
| commit | bc460b6950f3e15201fed908ef504a7103f16351 (patch) | |
| tree | 745c713fda4d1084bd5dece32f795c07c6c66c2d /src/conf_mode | |
| parent | bc3dfed3bb2d479deaf803b0ae8b781b958af8bb (diff) | |
| download | vyos-1x-bc460b6950f3e15201fed908ef504a7103f16351.tar.gz vyos-1x-bc460b6950f3e15201fed908ef504a7103f16351.zip | |
T5434: use auto-defaults in system-ipv6.py
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/system-ipv6.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/conf_mode/system-ipv6.py b/src/conf_mode/system-ipv6.py index 22210c27a..8a4df11fa 100755 --- a/src/conf_mode/system-ipv6.py +++ b/src/conf_mode/system-ipv6.py @@ -24,7 +24,6 @@ from vyos.template import render_to_string from vyos.utils.dict import dict_search from vyos.utils.system import sysctl_write from vyos.utils.file import write_file -from vyos.xml import defaults from vyos import ConfigError from vyos import frr from vyos import airbag @@ -37,12 +36,9 @@ def get_config(config=None): conf = Config() base = ['system', 'ipv6'] - opt = 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) - opt = dict_merge(default_values, opt) + opt = conf.get_config_dict(base, key_mangling=('-', '_'), + get_first_key=True, + with_recursive_defaults=True) # When working with FRR we need to know the corresponding address-family opt['afi'] = 'ipv6' |