diff options
| author | John Estabrook <jestabro@vyos.io> | 2023-08-06 18:25:47 -0500 | 
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2023-08-07 14:46:42 -0500 | 
| commit | 66092eb38fff2ca87cb591578948d4f130a6797f (patch) | |
| tree | bae565ab758b76244e410c8d9482236fb7e5b201 | |
| parent | 53b2194a6431139b612ff4ab45d88fd8080ec8af (diff) | |
| download | vyos-1x-66092eb38fff2ca87cb591578948d4f130a6797f.tar.gz vyos-1x-66092eb38fff2ca87cb591578948d4f130a6797f.zip | |
T5434: use merge_defaults in service_ids_fastnetmon.py
| -rwxr-xr-x | src/conf_mode/service_ids_fastnetmon.py | 10 | 
1 files changed, 3 insertions, 7 deletions
| diff --git a/src/conf_mode/service_ids_fastnetmon.py b/src/conf_mode/service_ids_fastnetmon.py index f6b80552b..276a71fcb 100755 --- a/src/conf_mode/service_ids_fastnetmon.py +++ b/src/conf_mode/service_ids_fastnetmon.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() @@ -41,11 +39,9 @@ def get_config(config=None):      if not conf.exists(base):          return None -    fastnetmon = 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) -    fastnetmon = dict_merge(default_values, fastnetmon) +    fastnetmon = conf.get_config_dict(base, key_mangling=('-', '_'), +                                      get_first_key=True, +                                      with_recursive_defaults=True)      return fastnetmon | 
