diff options
| author | John Estabrook <jestabro@vyos.io> | 2023-08-10 14:29:15 -0500 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2023-08-10 22:26:55 -0500 |
| commit | 039116367d8c8cf841ff11df619e8da62141d4b4 (patch) | |
| tree | f61def99d01c209c7b122bb50da0bfb92b714be2 /python/vyos/configdiff.py | |
| parent | 0a9b8069155c8787df1d82523de7d8437c59e701 (diff) | |
| download | vyos-1x-039116367d8c8cf841ff11df619e8da62141d4b4.tar.gz vyos-1x-039116367d8c8cf841ff11df619e8da62141d4b4.zip | |
T5434: use get_defaults instead of defaults
Diffstat (limited to 'python/vyos/configdiff.py')
| -rw-r--r-- | python/vyos/configdiff.py | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/python/vyos/configdiff.py b/python/vyos/configdiff.py index 0caa204c3..1ec2dfafe 100644 --- a/python/vyos/configdiff.py +++ b/python/vyos/configdiff.py @@ -22,7 +22,7 @@ from vyos.configdict import list_diff from vyos.utils.dict import get_sub_dict from vyos.utils.dict import mangle_dict_keys from vyos.utils.dict import dict_search_args -from vyos.xml import defaults +from vyos.xml_ref import get_defaults class ConfigDiffError(Exception): """ @@ -240,7 +240,9 @@ class ConfigDiff(object): if self._key_mangling: ret[k] = self._mangle_dict_keys(ret[k]) if k in target_defaults and not no_defaults: - default_values = defaults(self._make_path(path)) + default_values = get_defaults(self._make_path(path), + get_first_key=True, + recursive=True) ret[k] = dict_merge(default_values, ret[k]) return ret @@ -264,7 +266,9 @@ class ConfigDiff(object): ret[k] = self._mangle_dict_keys(ret[k]) if k in target_defaults and not no_defaults: - default_values = defaults(self._make_path(path)) + default_values = get_defaults(self._make_path(path), + get_first_key=True, + recursive=True) ret[k] = dict_merge(default_values, ret[k]) return ret @@ -312,7 +316,9 @@ class ConfigDiff(object): if self._key_mangling: ret[k] = self._mangle_dict_keys(ret[k]) if k in target_defaults and not no_defaults: - default_values = defaults(self._make_path(path)) + default_values = get_defaults(self._make_path(path), + get_first_key=True, + recursive=True) ret[k] = dict_merge(default_values, ret[k]) return ret @@ -335,7 +341,9 @@ class ConfigDiff(object): ret[k] = self._mangle_dict_keys(ret[k]) if k in target_defaults and not no_defaults: - default_values = defaults(self._make_path(path)) + default_values = get_defaults(self._make_path(path), + get_first_key=True, + recursive=True) ret[k] = dict_merge(default_values, ret[k]) return ret |