From aee3ae36b0dd8beaeb2aa4ca844716b645780c24 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Tue, 4 Oct 2016 10:18:20 -0400
Subject: [PATCH] Extend FPC status

FPC PSU status reporting requires OEM commands. Provide
OEM to pyghmi sensor model translation. to enable normal
applications to read it.

Change-Id: I63b950db7ffa5a5a2ba2ed3a2f2be33a53221b03
---
 pyghmi/ipmi/oem/lenovo/nextscale.py | 32 ++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/pyghmi/ipmi/oem/lenovo/nextscale.py b/pyghmi/ipmi/oem/lenovo/nextscale.py
index 44ca16d9..c1868a89 100644
--- a/pyghmi/ipmi/oem/lenovo/nextscale.py
+++ b/pyghmi/ipmi/oem/lenovo/nextscale.py
@@ -49,6 +49,29 @@ def fpc_read_psu_fan(ipmicmd, number):
     return struct.unpack_from('<H', rsp[:2])[0]
 
 
+def fpc_get_psustatus(ipmicmd, number):
+    rsp = ipmicmd.xraw_command(netfn=0x32, command=0x91)
+    mask = 1 << (number - 1)
+    statdata = bytearray(rsp['data'])
+    presence = statdata[3] & mask == mask
+    pwrgood = statdata[4] & mask == mask
+    throttle = (statdata[6] | statdata[2]) & mask == mask
+    health = pygconst.Health.Ok
+    states = []
+    if presence and not pwrgood:
+        health = pygconst.Health.Critical
+        states.append('Power input lost')
+    if throttle:
+        health = pygconst.Health.Critical
+        states.append('Throttled')
+    if presence:
+        states.append('Present')
+    else:
+        states.append('Absent')
+        health = pygconst.Health.Critical
+    return (health, states)
+
+
 def fpc_get_nodeperm(ipmicmd, number):
     rsp = ipmicmd.xraw_command(netfn=0x32, command=0xa7, data=(number,))
     perminfo = ord(rsp['data'][1])
@@ -97,11 +120,18 @@ fpc_sensors = {
     },
     'Node Power Permission': {
         'type': 'Management Subsystem Health',
-        'returns': 'dict',
+        'returns': 'tuple',
         'units': None,
         'provider': fpc_get_nodeperm,
         'elements': 12,
     },
+    'Power Supply': {
+        'type': 'Power Supply',
+        'returns': 'tuple',
+        'units': None,
+        'provider': fpc_get_psustatus,
+        'elements': 6,
+    }
 }