From d1ca536da448749dff557f13ecae97b124026e96 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Fri, 14 Jul 2023 22:18:36 +0200
Subject: 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
---
 src/migration-scripts/interfaces/24-to-25 | 11 ++++++-----
 src/migration-scripts/interfaces/7-to-8   |  5 +++--
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'src/migration-scripts/interfaces')

diff --git a/src/migration-scripts/interfaces/24-to-25 b/src/migration-scripts/interfaces/24-to-25
index 4095f2a3e..f3a1dc464 100755
--- a/src/migration-scripts/interfaces/24-to-25
+++ b/src/migration-scripts/interfaces/24-to-25
@@ -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
@@ -19,6 +19,7 @@
 
 import os
 import sys
+
 from vyos.configtree import ConfigTree
 from vyos.pki import CERT_BEGIN
 from vyos.pki import load_certificate
@@ -29,7 +30,7 @@ from vyos.pki import encode_certificate
 from vyos.pki import encode_dh_parameters
 from vyos.pki import encode_private_key
 from vyos.pki import verify_crl
-from vyos.util import run
+from vyos.utils.process import run
 
 def wrapped_pem_to_config_value(pem):
     out = []
@@ -241,7 +242,7 @@ if config.exists(base):
                 config.set(pki_base + ['certificate', pki_name, 'private', 'key'], value=wrapped_pem_to_config_value(key_pem))
             else:
                 print(f'Failed to migrate private key on openvpn interface {interface}')
-                
+
             config.delete(x509_base + ['key-file'])
 
         if config.exists(x509_base + ['dh-file']):
@@ -276,7 +277,7 @@ base = ['interfaces', 'wireguard']
 if config.exists(base):
     for interface in config.list_nodes(base):
         private_key_path = base + [interface, 'private-key']
-        
+
         key_file = 'default'
         if config.exists(private_key_path):
             key_file = config.return_value(private_key_path)
@@ -375,7 +376,7 @@ if config.exists(base):
                 config.set(pki_base + ['certificate', pki_name, 'private', 'key'], value=wrapped_pem_to_config_value(key_pem))
             else:
                 print(f'Failed to migrate private key on eapol config for interface {interface}')
-                
+
             config.delete(x509_base + ['key-file'])
 
 try:
diff --git a/src/migration-scripts/interfaces/7-to-8 b/src/migration-scripts/interfaces/7-to-8
index a4051301f..9845098a7 100755
--- a/src/migration-scripts/interfaces/7-to-8
+++ b/src/migration-scripts/interfaces/7-to-8
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2020 VyOS maintainers and contributors
+# Copyright (C) 2020-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
@@ -21,7 +21,8 @@ import os
 
 from sys import exit, argv
 from vyos.configtree import ConfigTree
-from vyos.util import chown, chmod_750
+from vyos.utils.permission import chown
+from vyos.utils.permission import chmod_750
 
 def migrate_default_keys():
     kdir = r'/config/auth/wireguard'
-- 
cgit v1.2.3