summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2023-08-06 19:41:17 -0500
committerJohn Estabrook <jestabro@vyos.io>2023-08-07 14:46:42 -0500
commit0206a0bb8233a678be3dcc89d842f2367ec9dfc3 (patch)
treed3cf2489fac48a40e5acf79d87637c04a927dc49 /src/conf_mode
parent4bf2761af63dc1b2f122772eb32c6cf14d9f5c36 (diff)
downloadvyos-1x-0206a0bb8233a678be3dcc89d842f2367ec9dfc3.tar.gz
vyos-1x-0206a0bb8233a678be3dcc89d842f2367ec9dfc3.zip
T5319: remove workarounds for defaults in service_upnp.py
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/service_upnp.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/conf_mode/service_upnp.py b/src/conf_mode/service_upnp.py
index b37d502c2..cf26bf9ce 100755
--- a/src/conf_mode/service_upnp.py
+++ b/src/conf_mode/service_upnp.py
@@ -23,12 +23,10 @@ from ipaddress import IPv4Network
from ipaddress import IPv6Network
from vyos.config import Config
-from vyos.configdict import dict_merge
from vyos.utils.process import call
from vyos.template import render
from vyos.template import is_ipv4
from vyos.template import is_ipv6
-from vyos.xml import defaults
from vyos import ConfigError
from vyos import airbag
airbag.enable()
@@ -47,10 +45,7 @@ def get_config(config=None):
if not upnpd:
return None
- if 'rule' in upnpd:
- default_member_values = defaults(base + ['rule'])
- for rule,rule_config in upnpd['rule'].items():
- upnpd['rule'][rule] = dict_merge(default_member_values, upnpd['rule'][rule])
+ upnpd = conf.merge_defaults(upnpd, recursive=True)
uuidgen = uuid.uuid1()
upnpd.update({'uuid': uuidgen})