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/validators/port-multi | 2 +-
 src/validators/port-range | 2 +-
 src/validators/script     | 6 +++---
 src/validators/timezone   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/validators')

diff --git a/src/validators/port-multi b/src/validators/port-multi
index bd6f0ef60..ed6ff6849 100755
--- a/src/validators/port-multi
+++ b/src/validators/port-multi
@@ -4,7 +4,7 @@ from sys import argv
 from sys import exit
 import re
 
-from vyos.util import read_file
+from vyos.utils.file import read_file
 
 services_file = '/etc/services'
 
diff --git a/src/validators/port-range b/src/validators/port-range
index 5468000a7..526c639ad 100755
--- a/src/validators/port-range
+++ b/src/validators/port-range
@@ -3,7 +3,7 @@
 import sys
 import re
 
-from vyos.util import read_file
+from vyos.utils.file import read_file
 
 services_file = '/etc/services'
 
diff --git a/src/validators/script b/src/validators/script
index 4ffdeb2a0..eb176d23b 100755
--- a/src/validators/script
+++ b/src/validators/script
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2018-2021 VyOS maintainers and contributors
+# Copyright (C) 2018-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
@@ -19,7 +19,7 @@ import os
 import sys
 import shlex
 
-import vyos.util
+from vyos.utils.file import file_is_persistent
 
 if __name__ == '__main__':
     if len(sys.argv) < 2:
@@ -35,7 +35,7 @@ if __name__ == '__main__':
         sys.exit(f'File {script} is not an executable file')
 
     # File outside the config dir is just a warning
-    if not vyos.util.file_is_persistent(script):
+    if not file_is_persistent(script):
         sys.exit(0)(
             f'Warning: file {script} is outside the "/config" directory\n'
             'It will not be automatically migrated to a new image on system update'
diff --git a/src/validators/timezone b/src/validators/timezone
index 107571181..e55af8d2a 100755
--- a/src/validators/timezone
+++ b/src/validators/timezone
@@ -17,7 +17,7 @@
 import argparse
 import sys
 
-from vyos.util import cmd
+from vyos.utils.process import cmd
 
 
 if __name__ == '__main__':
-- 
cgit v1.2.3