commit cb68e061d07bebd8ed39b6afcb45113d90ef9a95
author Justin Thaler <thalerj@us.ibm.com> Tue Mar 26 19:04:52 2019 -0500
committer Andrew Geissler <geissonator@yahoo.com> Mon Apr 01 17:31:50 2019 +0000
tree 5a9896947f08383111707a41e6a742a9e05c0f52
parent ba3fb502b7ef5f5f8cb4f8d5bffea0679ac98820

Fix FW list command

This provides a fix for issue #48 where the firmware list command failed
when an image needed to be activated. These images now properly appear
in the "Needs Activated" section.

Signed-off-by: Justin Thaler <thalerj@us.ibm.com>
Change-Id: Idab7e417d6a127f890d6b5cb154bc0c3aa48d075

thalerj/openbmctool.py

diff --git a/thalerj/openbmctool.py b/thalerj/openbmctool.py
index 6647e1d..dded2c7 100755
--- a/thalerj/openbmctool.py
+++ b/thalerj/openbmctool.py
@@ -2343,12 +2343,15 @@
                 fwActivated = True
             else:
                 fwActivated = False
-            if firmwareDict['data'][key]['Priority'] == 0:
-                firmwareInfoDict['Functional'].update(getFWInventoryAttributes(firmwareDict['data'][key], id))
-            elif firmwareDict['data'][key]['Priority'] >= 0 and fwActivated:
-                firmwareInfoDict['Activated'].update(getFWInventoryAttributes(firmwareDict['data'][key], id))
+            if 'Priority' in firmwareDict['data'][key]:
+                if firmwareDict['data'][key]['Priority'] == 0:
+                    firmwareInfoDict['Functional'].update(getFWInventoryAttributes(firmwareDict['data'][key], id))
+                elif firmwareDict['data'][key]['Priority'] >= 0 and fwActivated:
+                    firmwareInfoDict['Activated'].update(getFWInventoryAttributes(firmwareDict['data'][key], id))
+                else:
+                    firmwareInfoDict['NeedsActivated'].update(getFWInventoryAttributes(firmwareDict['data'][key], id))
             else:
-                firmwareInfoDict['Activated'].update(getFWInventoryAttributes(firmwareDict['data'][key], id))
+                firmwareInfoDict['NeedsActivated'].update(getFWInventoryAttributes(firmwareDict['data'][key], id))
     emptySections = []
     for key in firmwareInfoDict:
         if len(firmwareInfoDict[key])<=0: