T5195: move boot_* helpers to vyos.utils.boot

4 files changed, 40 insertions, 26 deletions

diff --git a/python/vyos/configquery.py b/python/vyos/configquery.py
index 85fef8777..9260da568 100644
--- a/python/vyos/configquery.py
+++ b/python/vyos/configquery.py
@@ -1,4 +1,4 @@
-# Copyright 2021 VyOS maintainers and contributors <maintainers@vyos.io>
+# Copyright 2021-2023 VyOS maintainers and contributors <maintainers@vyos.io>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -21,7 +21,8 @@ settings from op mode, and execution of arbitrary op mode commands.
 import os
 from subprocess import STDOUT
 
-from  vyos.util import popen, boot_configuration_complete
+from vyos.util import popen
+from vyos.utils.boot import boot_configuration_complete
 from vyos.config import Config
 from vyos.configsource import ConfigSourceSession, ConfigSourceString
 from vyos.defaults import directories
diff --git a/python/vyos/configsource.py b/python/vyos/configsource.py
index 510b5b65a..f582bdfab 100644
--- a/python/vyos/configsource.py
+++ b/python/vyos/configsource.py
@@ -1,5 +1,5 @@
 
-# Copyright 2020 VyOS maintainers and contributors <maintainers@vyos.io>
+# Copyright 2020-2023 VyOS maintainers and contributors <maintainers@vyos.io>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -19,7 +19,7 @@ import re
 import subprocess
 
 from vyos.configtree import ConfigTree
-from vyos.util import boot_configuration_complete
+from vyos.utils.boot import boot_configuration_complete
 
 class VyOSError(Exception):
     """
diff --git a/python/vyos/util.py b/python/vyos/util.py
index ed651fdc3..bd47940bb 100644
--- a/python/vyos/util.py
+++ b/python/vyos/util.py
@@ -1130,28 +1130,6 @@ def is_wwan_connected(interface):
     # return True/False if interface is in connected state
     return dict_search('modem.generic.state', tmp) == 'connected'
 
-def boot_configuration_complete() -> bool:
-    """ Check if the boot config loader has completed
-    """
-    from vyos.defaults import config_status
-
-    if os.path.isfile(config_status):
-        return True
-    return False
-
-def boot_configuration_success() -> bool:
-    from vyos.defaults import config_status
-
-    try:
-        with open(config_status) as f:
-            res = f.read().strip()
-    except FileNotFoundError:
-        return False
-
-    if int(res) == 0:
-        return True
-    return False
-
 def sysctl_read(name):
     """ Read and return current value of sysctl() option """
     tmp = cmd(f'sysctl {name}')
diff --git a/python/vyos/utils/boot.py b/python/vyos/utils/boot.py
new file mode 100644
index 000000000..3aecbec64
--- /dev/null
+++ b/python/vyos/utils/boot.py
@@ -0,0 +1,35 @@
+# Copyright 2023 VyOS maintainers and contributors <maintainers@vyos.io>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+
+def boot_configuration_complete() -> bool:
+    """ Check if the boot config loader has completed
+    """
+    from vyos.defaults import config_status
+    if os.path.isfile(config_status):
+        return True
+    return False
+
+def boot_configuration_success() -> bool:
+    from vyos.defaults import config_status
+    try:
+        with open(config_status) as f:
+            res = f.read().strip()
+    except FileNotFoundError:
+        return False
+    if int(res) == 0:
+        return True
+    return False