diff options
| author | John Estabrook <jestabro@vyos.io> | 2023-08-06 16:13:30 -0500 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2023-08-07 14:46:42 -0500 |
| commit | 56958bc1d230a7557586376a45290cfa23d5bc36 (patch) | |
| tree | 016d1d7b2cf005ac8f107066a287e112d79f5318 /src/conf_mode/protocols_rpki.py | |
| parent | b9e7d620d660a45653048be7ceacfa8bdca44b52 (diff) | |
| download | vyos-1x-56958bc1d230a7557586376a45290cfa23d5bc36.tar.gz vyos-1x-56958bc1d230a7557586376a45290cfa23d5bc36.zip | |
T5434: use merge_defaults in protocols_rpki.py
Diffstat (limited to 'src/conf_mode/protocols_rpki.py')
| -rwxr-xr-x | src/conf_mode/protocols_rpki.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/conf_mode/protocols_rpki.py b/src/conf_mode/protocols_rpki.py index 035b7db05..05e876f3b 100755 --- a/src/conf_mode/protocols_rpki.py +++ b/src/conf_mode/protocols_rpki.py @@ -19,10 +19,8 @@ import os from sys import exit from vyos.config import Config -from vyos.configdict import dict_merge from vyos.template import render_to_string from vyos.utils.dict import dict_search -from vyos.xml import defaults from vyos import ConfigError from vyos import frr from vyos import airbag @@ -43,8 +41,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) - rpki = dict_merge(default_values, rpki) + rpki = conf.merge_defaults(rpki, recursive=True) return rpki |