diff options
| author | John Estabrook <jestabro@vyos.io> | 2023-08-06 19:59:43 -0500 | 
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2023-08-07 14:46:42 -0500 | 
| commit | ec30a443353293e97de3e60598a2aca06f0e082d (patch) | |
| tree | a243537f135219719baab6ab9a842ed363a2fa09 /src | |
| parent | 12ba001730c86ed8af0cfdb5ba89674ea2053efe (diff) | |
| download | vyos-1x-ec30a443353293e97de3e60598a2aca06f0e082d.tar.gz vyos-1x-ec30a443353293e97de3e60598a2aca06f0e082d.zip | |
T5434: use merge_defaults in ssh.py
Diffstat (limited to 'src')
| -rwxr-xr-x | src/conf_mode/ssh.py | 6 | 
1 files changed, 2 insertions, 4 deletions
| diff --git a/src/conf_mode/ssh.py b/src/conf_mode/ssh.py index 3b63fcb7d..ee5e1eca2 100755 --- a/src/conf_mode/ssh.py +++ b/src/conf_mode/ssh.py @@ -21,12 +21,10 @@ from syslog import syslog  from syslog import LOG_INFO  from vyos.config import Config -from vyos.configdict import dict_merge  from vyos.configdict import is_node_changed  from vyos.configverify import verify_vrf  from vyos.utils.process import call  from vyos.template import render -from vyos.xml import defaults  from vyos import ConfigError  from vyos import airbag  airbag.enable() @@ -57,8 +55,8 @@ def get_config(config=None):      # 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) -    ssh = dict_merge(default_values, ssh) +    ssh = conf.merge_defaults(ssh, recursive=True) +      # pass config file path - used in override template      ssh['config_file'] = config_file | 
