summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2023-08-05 21:14:52 -0500
committerJohn Estabrook <jestabro@vyos.io>2023-08-07 00:48:31 -0500
commit957c79ec36e2a76a5b1cc87126186c32d11f14dd (patch)
treeb64a1eaff2302f625c1f2d4d39cda88dcb8c3735
parenta7ab80afb7bec216435ea3c36e420bdd63a4e767 (diff)
downloadvyos-1x-957c79ec36e2a76a5b1cc87126186c32d11f14dd.tar.gz
vyos-1x-957c79ec36e2a76a5b1cc87126186c32d11f14dd.zip
T5434: use auto-defaults in dhcp_relay.py
-rwxr-xr-xsrc/conf_mode/dhcp_relay.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/conf_mode/dhcp_relay.py b/src/conf_mode/dhcp_relay.py
index fd39bd9fe..37d708847 100755
--- a/src/conf_mode/dhcp_relay.py
+++ b/src/conf_mode/dhcp_relay.py
@@ -20,12 +20,10 @@ from sys import exit
from vyos.base import Warning
from vyos.config import Config
-from vyos.configdict import dict_merge
from vyos.template import render
from vyos.base import Warning
from vyos.utils.process import call
from vyos.utils.dict import dict_search
-from vyos.xml import defaults
from vyos import ConfigError
from vyos import airbag
airbag.enable()
@@ -41,11 +39,9 @@ def get_config(config=None):
if not conf.exists(base):
return None
- relay = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True)
- # 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)
- relay = dict_merge(default_values, relay)
+ relay = conf.get_config_dict(base, key_mangling=('-', '_'),
+ get_first_key=True,
+ with_recursive_defaults=True)
return relay