Fix health check command
This provides a fix for the health check command where issues with power
supplies have been omitted. The fru status command was also affected by
this bug.
Signed-off-by: Justin Thaler thalerj@us.ibm.com
diff --git a/thalerj/openbmctool.py b/thalerj/openbmctool.py
index 9af4a7f..c7b5bd2 100644
--- a/thalerj/openbmctool.py
+++ b/thalerj/openbmctool.py
@@ -456,7 +456,7 @@
frus[fruName] = {"compName": fruName, "Functional": boolToString(func), "Present":boolToString(present), "IsFru": boolToString(isFru), "selList": "None" }
else:
frus[fruName] = {"compName": fruName, "Functional": boolToString(func), "Present":boolToString(present), "IsFru": boolToString(isFru), "hasSEL": boolToString(hasSels) }
- elif "power_supply" in fruName:
+ elif "power_supply" in fruName or "powersupply" in fruName:
if component['Present'] ==1:
present = True
isFru = True
@@ -1552,10 +1552,9 @@
for key in frus:
if frus[key]["Functional"] == "No" and frus[key]["Present"] == "Yes":
hwStatus= "Degraded"
- if("power_supply" in key):
- gpuCount =0;
- frulist = json.loads(fruList(host, args, session))
- for comp in frulist:
+ if("power_supply" in key or "powersupply" in key):
+ gpuCount =0
+ for comp in frus:
if "gv100card" in comp:
gpuCount +=1
if gpuCount > 4: