diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-07-14 22:18:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-14 22:18:36 +0200 |
| commit | d1ca536da448749dff557f13ecae97b124026e96 (patch) | |
| tree | 5b742885703c94f331ba0f5760e157c98c44c437 /src/op_mode/pki.py | |
| parent | 36ce4167538db89c9c3a822de1218faf7397c9bd (diff) | |
| download | vyos-1x-d1ca536da448749dff557f13ecae97b124026e96.tar.gz vyos-1x-d1ca536da448749dff557f13ecae97b124026e96.zip | |
T5195: vyos.util -> vyos.utils package refactoring (#2093)
* T5195: move run, cmd, call, rc_cmd helper to vyos.utils.process
* T5195: use read_file and write_file implementation from vyos.utils.file
Changed code automatically using:
find . -type f -not -path '*/\.*' -exec sed -i 's/^from vyos.util import read_file$/from vyos.utils.file import read_file/g' {} +
find . -type f -not -path '*/\.*' -exec sed -i 's/^from vyos.util import write_file$/from vyos.utils.file import write_file/g' {} +
* T5195: move chmod* helpers to vyos.utils.permission
* T5195: use colon_separated_to_dict from vyos.utils.dict
* T5195: move is_systemd_service_* to vyos.utils.process
* T5195: fix boot issues with missing imports
* T5195: move dict_search_* helpers to vyos.utils.dict
* T5195: move network helpers to vyos.utils.network
* T5195: move commit_* helpers to vyos.utils.commit
* T5195: move user I/O helpers to vyos.utils.io
Diffstat (limited to 'src/op_mode/pki.py')
| -rwxr-xr-x | src/op_mode/pki.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/op_mode/pki.py b/src/op_mode/pki.py index 7ea295ff1..7a8195a89 100755 --- a/src/op_mode/pki.py +++ b/src/op_mode/pki.py @@ -35,8 +35,9 @@ from vyos.pki import load_certificate, load_certificate_request, load_private_ke from vyos.pki import load_crl, load_dh_parameters, load_public_key from vyos.pki import verify_certificate from vyos.xml import defaults -from vyos.util import ask_input, ask_yes_no -from vyos.util import cmd +from vyos.utils.io import ask_input +from vyos.utils.io import ask_yes_no +from vyos.utils.process import cmd from vyos.util import install_into_config CERT_REQ_END = '-----END CERTIFICATE REQUEST-----' |