T5195: vyos.util -> vyos.utils package refactoring part #2

7 files changed, 13 insertions, 16 deletions

diff --git a/src/op_mode/igmp-proxy.py b/src/op_mode/igmp-proxy.py
index a640b0bbf..709e25915 100755
--- a/src/op_mode/igmp-proxy.py
+++ b/src/op_mode/igmp-proxy.py
@@ -28,17 +28,14 @@ import tabulate
 import vyos.config
 import vyos.opmode
 
-from vyos.util import bytes_to_human
+from vyos.utils.convert import bytes_to_human
 from vyos.utils.io import print_error
+from vyos.utils.process import process_named_running
 
 def _is_configured():
     """Check if IGMP proxy is configured"""
     return vyos.config.Config().exists_effective('protocols igmp-proxy')
 
-def _is_running():
-    """Check if IGMP proxy is currently running"""
-    return not vyos.util.run('ps -C igmpproxy')
-
 def _kernel_to_ip(addr):
     """
     Convert any given address from Linux kernel to a proper, IPv4 address
@@ -85,7 +82,7 @@ def show_interface(raw: bool):
 if not _is_configured():
     print_error('IGMP proxy is not configured.')
     sys.exit(0)
-if not _is_running():
+if not process_named_running('igmpproxy'):
     print_error('IGMP proxy is not running.')
     sys.exit(0)
 
diff --git a/src/op_mode/ipsec.py b/src/op_mode/ipsec.py
index 774459771..57d3cfed9 100755
--- a/src/op_mode/ipsec.py
+++ b/src/op_mode/ipsec.py
@@ -21,8 +21,8 @@ from hurry import filesize
 from re import split as re_split
 from tabulate import tabulate
 
-from vyos.util import convert_data
-from vyos.util import seconds_to_human
+from vyos.utils.convert import convert_data
+from vyos.utils.convert import seconds_to_human
 from vyos.utils.process import cmd
 from vyos.configquery import ConfigTreeQuery
 
diff --git a/src/op_mode/memory.py b/src/op_mode/memory.py
index 7666de646..eb530035b 100755
--- a/src/op_mode/memory.py
+++ b/src/op_mode/memory.py
@@ -54,7 +54,7 @@ def _get_raw_data():
     return mem_data
 
 def _get_formatted_output(mem):
-    from vyos.util import bytes_to_human
+    from vyos.utils.convert import bytes_to_human
 
     # For human-readable outputs, we convert bytes to more convenient units
     # (100M, 1.3G...)
diff --git a/src/op_mode/openvpn.py b/src/op_mode/openvpn.py
index f59206330..fd9d2db92 100755
--- a/src/op_mode/openvpn.py
+++ b/src/op_mode/openvpn.py
@@ -23,7 +23,7 @@ import typing
 from tabulate import tabulate
 
 import vyos.opmode
-from vyos.util import bytes_to_human
+from vyos.utils.convert import bytes_to_human
 from vyos.utils.commit import commit_in_progress
 from vyos.utils.process import call
 from vyos.utils.process import rc_cmd
diff --git a/src/op_mode/pki.py b/src/op_mode/pki.py
index 7a8195a89..4c31291ad 100755
--- a/src/op_mode/pki.py
+++ b/src/op_mode/pki.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2021 VyOS maintainers and contributors
+# Copyright (C) 2021-2023 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -34,11 +34,11 @@ from vyos.pki import create_dh_parameters
 from vyos.pki import load_certificate, load_certificate_request, load_private_key
 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.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.util import install_into_config
+from vyos.xml import defaults
 
 CERT_REQ_END = '-----END CERTIFICATE REQUEST-----'
 auth_dir = '/config/auth'
@@ -191,7 +191,7 @@ def install_ssh_key(name, public_key, private_key, passphrase=None):
 
 def install_keypair(name, key_type, private_key=None, public_key=None, passphrase=None, prompt=True):
     # Show/install conf commands for key-pair
-    
+
     config_paths = []
 
     if public_key:
diff --git a/src/op_mode/storage.py b/src/op_mode/storage.py
index 9704a9cf5..6bc3d3a2d 100755
--- a/src/op_mode/storage.py
+++ b/src/op_mode/storage.py
@@ -43,7 +43,7 @@ def _get_system_storage(only_persistent=False):
 
 def _get_raw_data():
     from re import sub as re_sub
-    from vyos.util import human_to_bytes
+    from vyos.utils.convert import human_to_bytes
 
     out =  _get_system_storage(only_persistent=True)
     lines = out.splitlines()
diff --git a/src/op_mode/uptime.py b/src/op_mode/uptime.py
index 62908164e..d6adf6f4d 100755
--- a/src/op_mode/uptime.py
+++ b/src/op_mode/uptime.py
@@ -45,7 +45,7 @@ def _get_load_averages():
     return res
 
 def _get_raw_data():
-    from vyos.util import seconds_to_human
+    from vyos.utils.convert import seconds_to_human
 
     res = {}
     res["uptime_seconds"] = _get_uptime_seconds()