commit 3adda95e795a9add9b4f011dfde23f2b5f7b31ef
author George Keishing <gkeishin@in.ibm.com> Thu Feb 11 13:23:51 2021 -0600
committer George Keishing <gkeishin@in.ibm.com> Thu Feb 11 13:36:32 2021 -0600
tree 518dc85e12ac5a12bd964f18bf36458fefe0929b
parent 3fb755825c171e56f437df0f53c0a755fda4b4c6

Fix conflicting "CurrentHostState" host state from hypervisor

Changes:
    Boot table look up "CurrentHostState" but from the host
    URL "/xyz/openbmc_project/state/host0". Skipping the
    hypervisor state from the state enumeration logic for
    checking the boot state.

"/xyz/openbmc_project/state/host0": {
   "CurrentHostState": "xyz.openbmc_project.State.Host.HostState.Running",

"/xyz/openbmc_project/state/hypervisor0": {
   "CurrentHostState": "xyz.openbmc_project.State.Host.HostState.TransitioningToRunning",

Change-Id: I77b8beb26a6b9949bdaff33094e1beb5b4d3daf7
Signed-off-by: George Keishing <gkeishin@in.ibm.com>

lib/state.py

diff --git a/lib/state.py b/lib/state.py
index 1071d06..3eb3473 100755
--- a/lib/state.py
+++ b/lib/state.py
@@ -662,6 +662,11 @@
 
             if int(state['rest']):
                 for url_path in ret_values:
+                    # Skip conflicting "CurrentHostState" URL from the enum
+                    # /xyz/openbmc_project/state/hypervisor0
+                    if "hypervisor0" in url_path:
+                        continue
+
                     for attr_name in ret_values[url_path]:
                         # Create a state key value based on the attr_name.
                         try: