diff options
| author | John Estabrook <jestabro@vyos.io> | 2023-08-06 16:08:49 -0500 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2023-08-07 14:46:42 -0500 |
| commit | 9cc10461122b84ed26010cc2cad493a3dadc1dec (patch) | |
| tree | 080e18d5de762104fbbd229af1fd098dd8936247 /src/conf_mode | |
| parent | 7a72f7692649528d28690ed55549f8b993b3f6b3 (diff) | |
| download | vyos-1x-9cc10461122b84ed26010cc2cad493a3dadc1dec.tar.gz vyos-1x-9cc10461122b84ed26010cc2cad493a3dadc1dec.zip | |
T5434: use merge_defaults in protocols_ripng.py
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/protocols_ripng.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/conf_mode/protocols_ripng.py b/src/conf_mode/protocols_ripng.py index e3c904e33..dd1550033 100755 --- a/src/conf_mode/protocols_ripng.py +++ b/src/conf_mode/protocols_ripng.py @@ -24,7 +24,6 @@ from vyos.configverify import verify_common_route_maps from vyos.configverify import verify_access_list from vyos.configverify import verify_prefix_list from vyos.utils.dict import dict_search -from vyos.xml import defaults from vyos.template import render_to_string from vyos import ConfigError from vyos import frr @@ -45,9 +44,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) - # merge in remaining default values - ripng = dict_merge(default_values, ripng) + ripng = conf.merge_defaults(ripng, recursive=True) # We also need some additional information from the config, prefix-lists # and route-maps for instance. They will be used in verify(). |