Merge pull request #2136 from jestabro/with-defaults

T5319: remove workarounds for incorrect defaults in config-mode scripts

1 files changed, 3 insertions, 22 deletions

diff --git a/src/conf_mode/system_sflow.py b/src/conf_mode/system_sflow.py
index eae869a6d..2df1bbb7a 100755
--- a/src/conf_mode/system_sflow.py
+++ b/src/conf_mode/system_sflow.py
@@ -19,11 +19,9 @@ 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.utils.network import is_addr_assigned
-from vyos.xml import defaults
 from vyos import ConfigError
 from vyos import airbag
 airbag.enable()
@@ -42,26 +40,9 @@ def get_config(config=None):
     if not conf.exists(base):
         return None
 
-    sflow = 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)
-
-    sflow = dict_merge(default_values, sflow)
-
-    # Ignore default XML values if config doesn't exists
-    # Delete key from dict
-    if 'port' in sflow['server']:
-        del sflow['server']['port']
-
-    # Set default values per server
-    if 'server' in sflow:
-        for server in sflow['server']:
-            default_values = defaults(base + ['server'])
-            sflow['server'][server] = dict_merge(default_values, sflow['server'][server])
+    sflow = conf.get_config_dict(base, key_mangling=('-', '_'),
+                                 get_first_key=True,
+                                 with_recursive_defaults=True)
 
     return sflow