diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2023-08-11 11:03:15 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-11 11:03:15 +0300 |
| commit | 43294da10313198c4f71f46eb39c4276551ad118 (patch) | |
| tree | b35c2ec7912133411f0b7e49c58af58bee7d9848 /src/op_mode/pki.py | |
| parent | 4659f25804bd1b534767c134247c24699aaca722 (diff) | |
| parent | d64d3b179ce487aa6b442c397c4bb3bb1f572155 (diff) | |
| download | vyos-1x-43294da10313198c4f71f46eb39c4276551ad118.tar.gz vyos-1x-43294da10313198c4f71f46eb39c4276551ad118.zip | |
Merge pull request #2147 from jestabro/remaining-defaults
T5434: remove reamining calls to incorrect defaults
Diffstat (limited to 'src/op_mode/pki.py')
| -rwxr-xr-x | src/op_mode/pki.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/op_mode/pki.py b/src/op_mode/pki.py index f638c51bc..aff4ad1ae 100755 --- a/src/op_mode/pki.py +++ b/src/op_mode/pki.py @@ -26,7 +26,6 @@ from cryptography.x509.oid import ExtendedKeyUsageOID from vyos.config import Config from vyos.configquery import ConfigTreeQuery -from vyos.configdict import dict_merge from vyos.pki import encode_certificate, encode_public_key, encode_private_key, encode_dh_parameters from vyos.pki import get_certificate_fingerprint from vyos.pki import create_certificate, create_certificate_request, create_certificate_revocation_list @@ -39,7 +38,6 @@ from vyos.utils.io import ask_input from vyos.utils.io import ask_yes_no from vyos.utils.misc import install_into_config from vyos.utils.process import cmd -from vyos.xml import defaults CERT_REQ_END = '-----END CERTIFICATE REQUEST-----' auth_dir = '/config/auth' @@ -50,10 +48,9 @@ def get_default_values(): # Fetch default x509 values base = ['pki', 'x509', 'default'] x509_defaults = conf.get_config_dict(base, key_mangling=('-', '_'), + no_tag_node_value_mangle=True, get_first_key=True, - no_tag_node_value_mangle=True) - default_values = defaults(base) - x509_defaults = dict_merge(default_values, x509_defaults) + with_recursive_defaults=True) return x509_defaults |