diff options
| author | John Estabrook <jestabro@vyos.io> | 2023-08-06 16:12:12 -0500 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2023-08-07 14:46:42 -0500 |
| commit | b9e7d620d660a45653048be7ceacfa8bdca44b52 (patch) | |
| tree | 36c365dec28346e4d58b7d572da7418c42912391 /src/conf_mode | |
| parent | 9cc10461122b84ed26010cc2cad493a3dadc1dec (diff) | |
| download | vyos-1x-b9e7d620d660a45653048be7ceacfa8bdca44b52.tar.gz vyos-1x-b9e7d620d660a45653048be7ceacfa8bdca44b52.zip | |
T5434: use merge_defaults in protocols_rip.py
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/protocols_rip.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/conf_mode/protocols_rip.py b/src/conf_mode/protocols_rip.py index 5661dc377..bd47dfd00 100755 --- a/src/conf_mode/protocols_rip.py +++ b/src/conf_mode/protocols_rip.py @@ -25,7 +25,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 @@ -55,9 +54,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 - rip = dict_merge(default_values, rip) + rip = conf.merge_defaults(rip, recursive=True) # We also need some additional information from the config, prefix-lists # and route-maps for instance. They will be used in verify(). |