From e6b1c1f572068535ea99ee39a2d66bd6bf7043d5 Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Wed, 8 Dec 2021 13:29:46 -0600
Subject: vyos.util: T4061: add function to check for completion of boot config

---
 python/vyos/configsource.py | 3 ++-
 python/vyos/defaults.py     | 2 ++
 python/vyos/util.py         | 9 +++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'python')

diff --git a/python/vyos/configsource.py b/python/vyos/configsource.py
index b0981d25e..a0f6a46b5 100644
--- a/python/vyos/configsource.py
+++ b/python/vyos/configsource.py
@@ -19,6 +19,7 @@ import re
 import subprocess
 
 from vyos.configtree import ConfigTree
+from vyos.util import boot_configuration_complete
 
 class VyOSError(Exception):
     """
@@ -117,7 +118,7 @@ class ConfigSourceSession(ConfigSource):
         # Running config can be obtained either from op or conf mode, it always succeeds
         # once the config system is initialized during boot;
         # before initialization, set to empty string
-        if os.path.isfile('/tmp/vyos-config-status'):
+        if boot_configuration_complete():
             try:
                 running_config_text = self._run([self._cli_shell_api, '--show-active-only', '--show-show-defaults', '--show-ignore-edit', 'showConfig'])
             except VyOSError:
diff --git a/python/vyos/defaults.py b/python/vyos/defaults.py
index 00b14a985..f355c4919 100644
--- a/python/vyos/defaults.py
+++ b/python/vyos/defaults.py
@@ -29,6 +29,8 @@ directories = {
   "vyos_udev_dir": "/run/udev/vyos"
 }
 
+config_status = '/tmp/vyos-config-status'
+
 cfg_group = 'vyattacfg'
 
 cfg_vintage = 'vyos'
diff --git a/python/vyos/util.py b/python/vyos/util.py
index 157b26bf7..954c6670d 100644
--- a/python/vyos/util.py
+++ b/python/vyos/util.py
@@ -979,3 +979,12 @@ 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
-- 
cgit v1.2.3