summaryrefslogtreecommitdiff
path: root/src/conf_mode/service_sla.py
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2023-08-06 18:50:59 -0500
committerJohn Estabrook <jestabro@vyos.io>2023-08-07 14:46:42 -0500
commit4bf2761af63dc1b2f122772eb32c6cf14d9f5c36 (patch)
tree60b51ce112860649a471e169e1a5c525f33e540b /src/conf_mode/service_sla.py
parenta65d034064b952e3bda5b7e865189da442e8ba8b (diff)
downloadvyos-1x-4bf2761af63dc1b2f122772eb32c6cf14d9f5c36.tar.gz
vyos-1x-4bf2761af63dc1b2f122772eb32c6cf14d9f5c36.zip
T5434: use auto-defaults in service_sla.py
Diffstat (limited to 'src/conf_mode/service_sla.py')
-rwxr-xr-xsrc/conf_mode/service_sla.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/conf_mode/service_sla.py b/src/conf_mode/service_sla.py
index 54b72e029..ba5e645f0 100755
--- a/src/conf_mode/service_sla.py
+++ b/src/conf_mode/service_sla.py
@@ -19,10 +19,8 @@ import os
from sys import exit
from vyos.config import Config
-from vyos.configdict import dict_merge
from vyos.template import render
from vyos.utils.process import call
-from vyos.xml import defaults
from vyos import ConfigError
from vyos import airbag
airbag.enable()
@@ -44,11 +42,9 @@ def get_config(config=None):
if not conf.exists(base):
return None
- sla = 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)
- sla = dict_merge(default_values, sla)
+ sla = conf.get_config_dict(base, key_mangling=('-', '_'),
+ get_first_key=True,
+ with_recursive_defaults=True)
# Ignore default XML values if config doesn't exists
# Delete key from dict