commit 5942d20b041c5d4b1cd5a843ff48d94da8727bc5
author George Keishing <gkeishin@in.ibm.com> Mon Oct 04 13:09:24 2021 -0500
committer George Keishing <gkeishin@in.ibm.com> Mon Oct 04 13:09:42 2021 -0500
tree ef03e6fb285dfbaf770cf42d6a5bec5070da9862
parent 9a77ac594292639ad190a93fa38df189c018acef

Add firmware redfish inventory support in FFDC collection

Change-Id: I8ced6c69ffb9719e8598e3ffa814a287b6a9b485
Signed-off-by: George Keishing <gkeishin@in.ibm.com>

lib/openbmc_ffdc_list.py

diff --git a/lib/openbmc_ffdc_list.py b/lib/openbmc_ffdc_list.py
index db5cda6..f107bb6 100755
--- a/lib/openbmc_ffdc_list.py
+++ b/lib/openbmc_ffdc_list.py
@@ -160,6 +160,7 @@
 
 REDFISH_BASE = '/redfish/v1/'
 REDFISH_ELOG = REDFISH_BASE + 'Systems/system/LogServices/EventLog/Entries'
+REDFISH_FIRMWARE = REDFISH_BASE + 'UpdateService/FirmwareInventory'
 
 # Add file name and corresponding Get Request
 FFDC_GET_REDFISH_REQUEST = {
@@ -188,6 +189,9 @@
         'Dump HB Files': 'SCP Dump HB Files',
         'PEL Files': 'Collect PEL Log',
         'Redfish Log': 'Enumerate Redfish Resources',
+        'Firmware Log': 'Enumerate Redfish Resources  '
+        + ' enum_uri=/redfish/v1/UpdateService/FirmwareInventory  '
+        + ' file_enum_name=redfish_FIRMWARE_list.txt',
         'Redfish OEM Log': 'Enumerate Redfish OEM Resources',
     },
 }

lib/openbmc_ffdc_methods.robot

diff --git a/lib/openbmc_ffdc_methods.robot b/lib/openbmc_ffdc_methods.robot
index bf43233..505836e 100755
--- a/lib/openbmc_ffdc_methods.robot
+++ b/lib/openbmc_ffdc_methods.robot
@@ -590,7 +590,8 @@
 Enumerate Redfish Resources
     [Documentation]  Enumerate /redfish/v1 resources and properties to
     ...              a file. Return a list which contains the file name.
-    [Arguments]  ${log_prefix_path}=${LOG_PREFIX}
+    [Arguments]  ${log_prefix_path}=${LOG_PREFIX}  ${enum_uri}=/redfish/v1
+    ...          ${file_enum_name}=redfish_resource_properties.txt
 
     # Description of argument(s):
     # log_prefix_path    The location specifying where to create FFDC file(s).
@@ -601,7 +602,7 @@
     Return From Keyword If   ${status} == ${False}
 
     # Get the Redfish resources and properties.
-    ${json_data}=  redfish_utils.Enumerate Request  /redfish/v1
+    ${json_data}=  redfish_utils.Enumerate Request  ${enum_uri}
     # Typical output:
     # {
     #  "@odata.id": "/redfish/v1",
@@ -620,8 +621,7 @@
     # }
 
     @{ffdc_file_list}=  Create List
-    ${logpath}=  Catenate  SEPARATOR=  ${log_prefix_path}
-    ...  redfish_resource_properties.txt
+    ${logpath}=  Catenate  SEPARATOR=  ${log_prefix_path}  ${file_enum_name}
     Create File  ${logpath}
     Write Data To File  "${\n}${json_data}${\n}"  ${logpath}