From 19e3d749913794912841acbc47f320993d1ac6bd Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Fri, 15 Sep 2017 15:21:42 -0400
Subject: [PATCH] Skip FPGA when not supported

Some systems do not support reporting FPGA version,
for such systems that return 193, ignore the situation.

Change-Id: Ic6f967754741d1789bc293f9489fab0077faf033
---
 pyghmi/ipmi/oem/lenovo/imm.py | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/pyghmi/ipmi/oem/lenovo/imm.py b/pyghmi/ipmi/oem/lenovo/imm.py
index 921e5db9..5d107058 100644
--- a/pyghmi/ipmi/oem/lenovo/imm.py
+++ b/pyghmi/ipmi/oem/lenovo/imm.py
@@ -17,6 +17,7 @@
 from datetime import datetime
 import json
 import os.path
+import pyghmi.exceptions as pygexc
 import pyghmi.ipmi.private.session as ipmisession
 import pyghmi.ipmi.private.util as util
 import pyghmi.util.webclient as webclient
@@ -396,9 +397,14 @@ class IMMClient(object):
             'build': '/v2/bios/pending_build_id'})
         if bdata:
             yield ('UEFI Pending Update', bdata)
-        fpga = self.ipmicmd.xraw_command(netfn=0x3a, command=0x6b, data=(0,))
-        fpga = '{0}.{1}.{2}'.format(*[ord(x) for x in fpga['data']])
-        yield ('FPGA', {'version': fpga})
+        try:
+            fpga = self.ipmicmd.xraw_command(netfn=0x3a, command=0x6b,
+                                             data=(0,))
+            fpga = '{0}.{1}.{2}'.format(*[ord(x) for x in fpga['data']])
+            yield ('FPGA', {'version': fpga})
+        except pygexc.IpmiException as ie:
+            if ie.ipmicode != 193:
+                raise
         for firm in self.fetch_agentless_firmware():
             yield firm
 
@@ -528,9 +534,14 @@ class XCCClient(IMMClient):
         })
         if bdata:
             yield ('LXPM Linux Driver Bundle', bdata)
-        fpga = self.ipmicmd.xraw_command(netfn=0x3a, command=0x6b, data=(0,))
-        fpga = '{0}.{1}.{2}'.format(*[ord(x) for x in fpga['data']])
-        yield ('FPGA', {'version': fpga})
+        try:
+            fpga = self.ipmicmd.xraw_command(netfn=0x3a, command=0x6b,
+                                             data=(0,))
+            fpga = '{0}.{1}.{2}'.format(*[ord(x) for x in fpga['data']])
+            yield ('FPGA', {'version': fpga})
+        except pygexc.IpmiException as ie:
+            if ie.ipmicode != 193:
+                raise
         for firm in self.fetch_agentless_firmware():
             yield firm