diff options
| author | John Estabrook <jestabro@vyos.io> | 2023-08-10 22:30:34 -0500 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2023-08-10 22:30:58 -0500 |
| commit | d64d3b179ce487aa6b442c397c4bb3bb1f572155 (patch) | |
| tree | c6a958a1051489903e704f6dd608d24a6a33ca8c | |
| parent | 7978ac921faba95d9b452ff1788eafa85c6057f0 (diff) | |
| download | vyos-1x-d64d3b179ce487aa6b442c397c4bb3bb1f572155.tar.gz vyos-1x-d64d3b179ce487aa6b442c397c4bb3bb1f572155.zip | |
T5319: remove defaults workarounds in vyos-domain-resolver.py
| -rwxr-xr-x | src/helpers/vyos-domain-resolver.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/helpers/vyos-domain-resolver.py b/src/helpers/vyos-domain-resolver.py index 2036ca72e..7e2fe2462 100755 --- a/src/helpers/vyos-domain-resolver.py +++ b/src/helpers/vyos-domain-resolver.py @@ -26,7 +26,7 @@ from vyos.utils.commit import commit_in_progress from vyos.utils.dict import dict_search_args from vyos.utils.process import cmd from vyos.utils.process import run -from vyos.xml import defaults +from vyos.xml_ref import get_defaults base = ['firewall'] timeout = 300 @@ -49,13 +49,7 @@ def get_config(conf): firewall = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True, no_tag_node_value_mangle=True) - default_values = defaults(base) - for tmp in ['name', 'ipv6_name']: - if tmp in default_values: - del default_values[tmp] - - if 'zone' in default_values: - del default_values['zone'] + default_values = get_defaults(base, get_first_key=True) firewall = dict_merge(default_values, firewall) |