commit c50c6cd75d56ec8a8e17b99c16577586f7972b9c
author Sridevi Ramesh <sridevra@in.ibm.com> Tue Jun 08 07:14:17 2021 -0500
committer ManojKiran Eda <manojkiran.eda@gmail.com> Fri Jun 11 03:34:23 2021 +0000
tree 710454cdcd00afbe8455c4e0638511ff7e8ca36c
parent 763b51ea109e905fda901d8761f30ab266a07ba3

Fix for pldmtool GetFruRecordTable command with oem-ibm disabled.

Tested on BMC environment with oem-ibm enabled & disabled.

Signed-off-by: Sridevi Ramesh <sridevra@in.ibm.com>
Change-Id: Ie8b43f7ea55a4255b74a46250dc9d15ec5949cad

pldmtool/pldm_fru_cmd.cpp

diff --git a/pldmtool/pldm_fru_cmd.cpp b/pldmtool/pldm_fru_cmd.cpp
index 8c466b1..6b3b399 100644
--- a/pldmtool/pldm_fru_cmd.cpp
+++ b/pldmtool/pldm_fru_cmd.cpp
@@ -109,7 +109,6 @@
             p += sizeof(pldm_fru_record_data_format) -
                  sizeof(pldm_fru_record_tlv);
 
-            auto isIPZ = false;
             std::map<uint8_t, std::string> FruFieldTypeMap;
             std::string fruFieldValue;
 
@@ -133,6 +132,14 @@
                         fruFieldValue =
                             fruFieldParserTimestamp(tlv->value, tlv->length);
                     }
+
+                    frudata["FRU Field Type"] =
+                        typeToString(FruFieldTypeMap, tlv->type);
+                    frudata["FRU Field Length"] = (int)(tlv->length);
+                    fruFieldValue =
+                        fruFieldValuestring(tlv->value, tlv->length);
+                    frudata["FRU Field Value"] = fruFieldValue;
+                    frufielddata.emplace_back(frudata);
                 }
                 else
                 {
@@ -145,7 +152,6 @@
                         if (populateMaps.find(oemIPZValue) !=
                             populateMaps.end())
                         {
-                            isIPZ = true;
                             const std::map<uint8_t, std::string> IPZTypes =
                                 populateMaps.at(oemIPZValue);
                             FruFieldTypeMap.insert(IPZTypes.begin(),
@@ -162,24 +168,24 @@
                         fruFieldValue =
                             fruFieldParserU32(tlv->value, tlv->length);
                     }
+                    else if (tlv->type != 2)
+                    {
+                        fruFieldValue =
+                            fruFieldIPZParser(tlv->value, tlv->length);
+                    }
+                    else
+                    {
+                        fruFieldValue =
+                            fruFieldValuestring(tlv->value, tlv->length);
+                    }
+                    frudata["FRU Field Type"] =
+                        typeToString(FruFieldTypeMap, tlv->type);
+                    frudata["FRU Field Length"] = (int)(tlv->length);
+                    frudata["FRU Field Value"] = fruFieldValue;
+                    frufielddata.emplace_back(frudata);
+
 #endif
                 }
-
-                if (isIPZ && (tlv->type != 2))
-                {
-                    fruFieldValue = fruFieldIPZParser(tlv->value, tlv->length);
-                }
-                else
-                {
-                    fruFieldValue =
-                        fruFieldValuestring(tlv->value, tlv->length);
-                }
-
-                frudata["FRU Field Type"] =
-                    typeToString(FruFieldTypeMap, tlv->type);
-                frudata["FRU Field Length"] = (int)(tlv->length);
-                frudata["FRU Field Value"] = fruFieldValue;
-                frufielddata.emplace_back(frudata);
                 p += sizeof(pldm_fru_record_tlv) - 1 + tlv->length;
             }
             frutable.emplace_back(frufielddata);