diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-10-19 15:49:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-19 15:49:25 +0200 |
| commit | 1bf2cf737e9e7f09ee1d5c62691cd5bfa6eb9f05 (patch) | |
| tree | aa9690bd054958a2819aca16ddc15b121d28d1e4 /python/vyos | |
| parent | 3f933f1642debfca5c9e3873790a5742ef242c75 (diff) | |
| parent | 52e3ba35c09237744340c2cce4cba1783ec3f2be (diff) | |
| download | vyos-1x-1bf2cf737e9e7f09ee1d5c62691cd5bfa6eb9f05.tar.gz vyos-1x-1bf2cf737e9e7f09ee1d5c62691cd5bfa6eb9f05.zip | |
Merge pull request #4165 from natali-rs1985/T4914-current
pki: T4914: Rewrite the PKI op mode in the new style
Diffstat (limited to 'python/vyos')
| -rw-r--r-- | python/vyos/configsession.py | 3 | ||||
| -rw-r--r-- | python/vyos/opmode.py | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/python/vyos/configsession.py b/python/vyos/configsession.py index 9c56d246a..5876dc5b0 100644 --- a/python/vyos/configsession.py +++ b/python/vyos/configsession.py @@ -42,8 +42,7 @@ INSTALL_IMAGE = [ IMPORT_PKI = ['/opt/vyatta/bin/vyatta-op-cmd-wrapper', 'import'] IMPORT_PKI_NO_PROMPT = [ '/usr/libexec/vyos/op_mode/pki.py', - '--action', - 'import', + 'import_pki', '--no-prompt', ] REMOVE_IMAGE = [ diff --git a/python/vyos/opmode.py b/python/vyos/opmode.py index 066c8058f..136ac35e2 100644 --- a/python/vyos/opmode.py +++ b/python/vyos/opmode.py @@ -89,7 +89,10 @@ class InternalError(Error): def _is_op_mode_function_name(name): - if re.match(r"^(show|clear|reset|restart|add|update|delete|generate|set|renew|release|execute)", name): + if re.match( + r'^(show|clear|reset|restart|add|update|delete|generate|set|renew|release|execute|import)', + name, + ): return True else: return False |