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

25 files changed, 32 insertions, 35 deletions

diff --git a/src/conf_mode/https.py b/src/conf_mode/https.py
index 26f515d1c..010490c7e 100755
--- a/src/conf_mode/https.py
+++ b/src/conf_mode/https.py
@@ -30,7 +30,7 @@ from vyos.pki import wrap_private_key
 from vyos.template import render
 from vyos.utils.process import call
 from vyos.utils.network import check_port_availability
-from vyos.util import is_listen_port_bind_service
+from vyos.utils.network import is_listen_port_bind_service
 from vyos.utils.file import write_file
 
 from vyos import airbag
diff --git a/src/conf_mode/interfaces-l2tpv3.py b/src/conf_mode/interfaces-l2tpv3.py
index ca321e01d..6efeac302 100755
--- a/src/conf_mode/interfaces-l2tpv3.py
+++ b/src/conf_mode/interfaces-l2tpv3.py
@@ -28,7 +28,7 @@ from vyos.configverify import verify_mtu_ipv6
 from vyos.configverify import verify_mirror_redirect
 from vyos.configverify import verify_bond_bridge_member
 from vyos.ifconfig import L2TPv3If
-from vyos.util import check_kmod
+from vyos.utils.kernel import check_kmod
 from vyos.validate import is_addr_assigned
 from vyos import ConfigError
 from vyos import airbag
diff --git a/src/conf_mode/interfaces-openvpn.py b/src/conf_mode/interfaces-openvpn.py
index b447e0a67..607a19385 100755
--- a/src/conf_mode/interfaces-openvpn.py
+++ b/src/conf_mode/interfaces-openvpn.py
@@ -52,7 +52,7 @@ from vyos.template import is_ipv4
 from vyos.template import is_ipv6
 from vyos.utils.dict import dict_search
 from vyos.utils.dict import dict_search_args
-from vyos.util import is_list_equal
+from vyos.utils.list import is_list_equal
 from vyos.utils.file import makedir
 from vyos.utils.file import read_file
 from vyos.utils.file import write_file
diff --git a/src/conf_mode/interfaces-wireguard.py b/src/conf_mode/interfaces-wireguard.py
index 490751bb4..a02baba82 100755
--- a/src/conf_mode/interfaces-wireguard.py
+++ b/src/conf_mode/interfaces-wireguard.py
@@ -27,7 +27,7 @@ from vyos.configverify import verify_mtu_ipv6
 from vyos.configverify import verify_mirror_redirect
 from vyos.configverify import verify_bond_bridge_member
 from vyos.ifconfig import WireGuardIf
-from vyos.util import check_kmod
+from vyos.utils.kernel import check_kmod
 from vyos.utils.network import check_port_availability
 from vyos import ConfigError
 from vyos import airbag
diff --git a/src/conf_mode/load-balancing-haproxy.py b/src/conf_mode/load-balancing-haproxy.py
index 151d9bcbc..2fb0edf8e 100755
--- a/src/conf_mode/load-balancing-haproxy.py
+++ b/src/conf_mode/load-balancing-haproxy.py
@@ -23,7 +23,7 @@ from vyos.config import Config
 from vyos.configdict import dict_merge
 from vyos.utils.process import call
 from vyos.utils.network import check_port_availability
-from vyos.util import is_listen_port_bind_service
+from vyos.utils.network import is_listen_port_bind_service
 from vyos.pki import wrap_certificate
 from vyos.pki import wrap_private_key
 from vyos.template import render
diff --git a/src/conf_mode/nat.py b/src/conf_mode/nat.py
index e17dee835..5f4b658f8 100755
--- a/src/conf_mode/nat.py
+++ b/src/conf_mode/nat.py
@@ -28,7 +28,7 @@ from vyos.config import Config
 from vyos.configdict import dict_merge
 from vyos.template import render
 from vyos.template import is_ip_network
-from vyos.util import check_kmod
+from vyos.utils.kernel import check_kmod
 from vyos.utils.dict import dict_search
 from vyos.utils.dict import dict_search_args
 from vyos.utils.process import cmd
diff --git a/src/conf_mode/nat66.py b/src/conf_mode/nat66.py
index 12d503ef9..25f625b84 100755
--- a/src/conf_mode/nat66.py
+++ b/src/conf_mode/nat66.py
@@ -26,7 +26,7 @@ from vyos.config import Config
 from vyos.configdict import dict_merge
 from vyos.template import render
 from vyos.utils.process import cmd
-from vyos.util import check_kmod
+from vyos.utils.kernel import check_kmod
 from vyos.utils.dict import dict_search
 from vyos.template import is_ipv6
 from vyos.xml import defaults
diff --git a/src/conf_mode/system_lcd.py b/src/conf_mode/system_lcd.py
index 582933069..eb88224d1 100755
--- a/src/conf_mode/system_lcd.py
+++ b/src/conf_mode/system_lcd.py
@@ -20,7 +20,7 @@ from sys import exit
 
 from vyos.config import Config
 from vyos.utils.process import call
-from vyos.util import find_device_file
+from vyos.utils.system import find_device_file
 from vyos.template import render
 from vyos import ConfigError
 from vyos import airbag
diff --git a/src/conf_mode/vpn_l2tp.py b/src/conf_mode/vpn_l2tp.py
index 0645854c9..6232ce64a 100755
--- a/src/conf_mode/vpn_l2tp.py
+++ b/src/conf_mode/vpn_l2tp.py
@@ -27,9 +27,9 @@ from vyos.config import Config
 from vyos.template import is_ipv4
 from vyos.template import render
 from vyos.utils.process import call
-from vyos.util import get_half_cpus
+from vyos.utils.system import get_half_cpus
 from vyos.utils.network import check_port_availability
-from vyos.util import is_listen_port_bind_service
+from vyos.utils.network import is_listen_port_bind_service
 from vyos import ConfigError
 
 from vyos import airbag
diff --git a/src/conf_mode/vpn_openconnect.py b/src/conf_mode/vpn_openconnect.py
index 71cd9040a..e82862fa3 100755
--- a/src/conf_mode/vpn_openconnect.py
+++ b/src/conf_mode/vpn_openconnect.py
@@ -26,7 +26,7 @@ from vyos.template import render
 from vyos.utils.process import call
 from vyos.utils.network import check_port_availability
 from vyos.utils.process import is_systemd_service_running
-from vyos.util import is_listen_port_bind_service
+from vyos.utils.network import is_listen_port_bind_service
 from vyos.utils.dict import dict_search
 from vyos.xml import defaults
 from vyos import ConfigError
diff --git a/src/conf_mode/vpn_pptp.py b/src/conf_mode/vpn_pptp.py
index e209d674a..d542f57fe 100755
--- a/src/conf_mode/vpn_pptp.py
+++ b/src/conf_mode/vpn_pptp.py
@@ -23,7 +23,7 @@ from sys import exit
 
 from vyos.config import Config
 from vyos.template import render
-from vyos.util import get_half_cpus
+from vyos.utils.system import get_half_cpus
 from vyos.utils.process import call
 from vyos import ConfigError
 
diff --git a/src/conf_mode/vpn_sstp.py b/src/conf_mode/vpn_sstp.py
index 5a1e7da87..e98d8385b 100755
--- a/src/conf_mode/vpn_sstp.py
+++ b/src/conf_mode/vpn_sstp.py
@@ -28,7 +28,7 @@ from vyos.template import render
 from vyos.utils.process import call
 from vyos.utils.network import check_port_availability
 from vyos.utils.dict import dict_search
-from vyos.util import is_listen_port_bind_service
+from vyos.utils.network import is_listen_port_bind_service
 from vyos.utils.file import write_file
 from vyos import ConfigError
 from vyos import airbag
diff --git a/src/helpers/vyos-interface-rescan.py b/src/helpers/vyos-interface-rescan.py
index 1ac1810e0..012357259 100755
--- a/src/helpers/vyos-interface-rescan.py
+++ b/src/helpers/vyos-interface-rescan.py
@@ -24,7 +24,7 @@ import netaddr
 
 from vyos.configtree import ConfigTree
 from vyos.defaults import directories
-from vyos.util import get_cfg_group_id
+from vyos.utils.permission import get_cfg_group_id
 
 debug = False
 
diff --git a/src/helpers/vyos-sudo.py b/src/helpers/vyos-sudo.py
index 3e4c196d9..75dd7f29d 100755
--- a/src/helpers/vyos-sudo.py
+++ b/src/helpers/vyos-sudo.py
@@ -18,7 +18,7 @@
 import os
 import sys
 
-from vyos.util import is_admin
+from vyos.utils.permission import is_admin
 
 
 if __name__ == '__main__':
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()
diff --git a/src/services/api/graphql/generate/schema_from_op_mode.py b/src/services/api/graphql/generate/schema_from_op_mode.py
index 229ccf90f..ab7cb691f 100755
--- a/src/services/api/graphql/generate/schema_from_op_mode.py
+++ b/src/services/api/graphql/generate/schema_from_op_mode.py
@@ -27,7 +27,7 @@ from jinja2 import Template
 from vyos.defaults import directories
 from vyos.opmode import _is_op_mode_function_name as is_op_mode_function_name
 from vyos.opmode import _get_literal_values as get_literal_values
-from vyos.util import load_as_module
+from vyos.utils.system import load_as_module
 if __package__ is None or __package__ == '':
     sys.path.append(os.path.join(directories['services'], 'api'))
     from graphql.libs.op_mode import is_show_function_name
diff --git a/src/services/api/graphql/libs/op_mode.py b/src/services/api/graphql/libs/op_mode.py
index e91d8bd0f..5022f7d4e 100644
--- a/src/services/api/graphql/libs/op_mode.py
+++ b/src/services/api/graphql/libs/op_mode.py
@@ -20,7 +20,7 @@ from typing import Union, Tuple, Optional
 from humps import decamelize
 
 from vyos.defaults import directories
-from vyos.util import load_as_module
+from vyos.utils.system import load_as_module
 from vyos.opmode import _normalize_field_names
 from vyos.opmode import _is_literal_type, _get_literal_values
 
diff --git a/src/tests/test_find_device_file.py b/src/tests/test_find_device_file.py
index 43c80dc76..f18043d65 100755
--- a/src/tests/test_find_device_file.py
+++ b/src/tests/test_find_device_file.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from unittest import TestCase
-from vyos.util import find_device_file
+from vyos.utils.system import find_device_file
 
 class TestDeviceFile(TestCase):
     """ used to find USB devices on target """
diff --git a/src/tests/test_util.py b/src/tests/test_util.py
index 2e8f1b6cc..66c27e824 100644
--- a/src/tests/test_util.py
+++ b/src/tests/test_util.py
@@ -17,7 +17,7 @@
 from unittest import TestCase
 
 class TestVyOSUtil(TestCase):
-    def test_key_mangline(self):
+    def test_key_mangling(self):
         from vyos.util import mangle_dict_keys
         data = {"foo-bar": {"baz-quux": None}}
         expected_data = {"foo_bar": {"baz_quux": None}}