diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-08-06 14:31:52 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2023-08-06 14:31:52 +0200 |
| commit | 4bc6e6b60070f53910c23b9927a31d36f0dec507 (patch) | |
| tree | ceb9b101c373ef5c2e33ed8047907e4e910c6148 | |
| parent | fac6f661eff1e85bbb36d360839bafcfb5bc14b1 (diff) | |
| download | vyos-1x-4bc6e6b60070f53910c23b9927a31d36f0dec507.tar.gz vyos-1x-4bc6e6b60070f53910c23b9927a31d36f0dec507.zip | |
dyndns: T5228: remove T2665 workarounds
| -rwxr-xr-x | src/conf_mode/dns_dynamic.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/conf_mode/dns_dynamic.py b/src/conf_mode/dns_dynamic.py index d78eb70bc..97d46148a 100755 --- a/src/conf_mode/dns_dynamic.py +++ b/src/conf_mode/dns_dynamic.py @@ -49,16 +49,9 @@ def get_config(config=None): if not conf.exists(base_level): return None - dyndns = conf.get_config_dict(base_level, key_mangling=('-', '_'), get_first_key=True) - - if 'address' in dyndns: - for address in dyndns['address']: - # Apply service specific defaults (svc_type = ['rfc2136', 'service']) - for svc_type in dyndns['address'][address]: - default_values = defaults(base_level + ['address', svc_type]) - for svc_cfg in dyndns['address'][address][svc_type]: - dyndns['address'][address][svc_type][svc_cfg] = dict_merge( - default_values, dyndns['address'][address][svc_type][svc_cfg]) + dyndns = conf.get_config_dict(base_level, key_mangling=('-', '_'), + get_first_key=True, no_tag_node_value_mangle=True, + with_defaults=True, with_recursive_defaults=True) dyndns['config_file'] = config_file return dyndns |