From 5f1ba6038fe26d5c109ad04606da38aae241db33 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Thu, 7 Jul 2022 12:32:47 -0400
Subject: [PATCH] Add more info to SMM inventory output

Change-Id: Id2da97b6efad246a11153fa3bfdff3c7095530c0
---
 pyghmi/ipmi/oem/lenovo/handler.py   | 2 ++
 pyghmi/ipmi/oem/lenovo/nextscale.py | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/pyghmi/ipmi/oem/lenovo/handler.py b/pyghmi/ipmi/oem/lenovo/handler.py
index bcc6cebc..5993bea3 100755
--- a/pyghmi/ipmi/oem/lenovo/handler.py
+++ b/pyghmi/ipmi/oem/lenovo/handler.py
@@ -1342,6 +1342,8 @@ class OEMHandler(generic.OEMHandler):
                 else:
                     zerofru['UUID'] = util.decode_wireformat_uuid(
                         guiddata['data'])
+        if self.is_fpc:
+            self.smmhandler.augment_zerofru(zerofru, self._fpc_variant)
         return self.process_fru(zerofru)
 
     def get_ami_sensor_reading(self, sensorname):
diff --git a/pyghmi/ipmi/oem/lenovo/nextscale.py b/pyghmi/ipmi/oem/lenovo/nextscale.py
index e015a5a5..ae8a611d 100644
--- a/pyghmi/ipmi/oem/lenovo/nextscale.py
+++ b/pyghmi/ipmi/oem/lenovo/nextscale.py
@@ -599,6 +599,14 @@ class SMMClient(object):
         payload = struct.pack('<BH', baynum, int(val))
         self.ipmicmd.xraw_command(0x32, 0x9e, data=payload)
 
+    def augment_zerofru(self, zerofru, variant):
+        if variant & 0x20 != 0x20:
+            return
+        model = self.ipmicmd.xraw_command(
+            netfn=0x32, command=0xb0, data=[5, 11])['data'][2:]
+        zerofru['Product name'] = bytes(model).strip()
+        zerofru['Manufacturer'] = 'Lenovo'
+
     def set_bay_cap_active(self, baynum, val):
         currstate = self.ipmicmd.xraw_command(0x32, 0xa0, data=[baynum])
         currstate = currstate['data']