commit 1b0261197f0ddc30c3dc7aaabe9d8c3229249029
author Alpana Kumari <alpankum@in.ibm.com> Wed Mar 02 23:41:38 2022 -0600
committer Alpana Kumari <alpankum@in.ibm.com> Fri May 06 07:13:09 2022 -0500
tree 2feeff2a66898ae62b4cfa80ff90fd0f66216a23
parent 40d1c1968502d55b35252ede983eba7e4e0d4418

Modify get system json

We have some change in system json to support Everest Pass2 jsons.
To fetch that json we got some changes in vpd-parser also.

Test- Tested on Ever10 PASS2 system-
./ibm-read-vpd -f /sys/bus/i2c/drivers/at24/8-0050/eeprom

DBG:processing for IM - 50003000
DBG:HW from vpd - 0015
DBG:hw versions are-
DBG:"000A"
DBG:"000B"
DBG:"000C"
DBG:"0014"
DBG: hwKw not found in hw version set
DBG: json name- 50003000_v2.json

DBG:processing for IM - 50003000
DBG:HW from vpd - 0015
….
DBG: json name- 50003000_v2.json
DBG: systemType- 50003000_v2.json DeviceTree - conf-aspeed-bmc-ibm-everest.dtb

root@ever10bmc:/tmp# ls -ltr /var/lib/vpd/vpd_inventory.json
lrwxrwxrwx    1 root     root            31 May  6 11:30 /var/lib/vpd/vpd_inventory.json -> /usr/share/vpd/50003000_v2.json

==========================================================

Changed HW value using vpd-tool, to pickup PASS1 json-

./ibm-read-vpd -f /sys/bus/i2c/drivers/at24/8-0050/eeprom

DBG:processing for IM - 50003000
DBG:HW from vpd - 000A
DBG:hw versions are-
DBG:"000A"
DBG: hwKw matched in hw version set
DBG: json name- 50003000.json

DBG:processing for IM - 50003000
DBG:HW from vpd - 000A
. . . .
DBG: json name- 50003000.json
DBG: systemType- 50003000.json DeviceTree - conf-aspeed-bmc-ibm-everest.dtb

root@ever10bmc:/tmp# ls -ltr /var/lib/vpd/vpd_inventory.json
lrwxrwxrwx    1 root     root            28 May  6 12:07 /var/lib/vpd/vpd_inventory.json -> /usr/share/vpd/50003000.json

Signed-off-by: Alpana Kumari <alpankum@in.ibm.com>
Change-Id: I5301a47bff12d25f844e176be34bcb0edf722665

ibm_vpd_utils.cpp

diff --git a/ibm_vpd_utils.cpp b/ibm_vpd_utils.cpp
index 25960fc..4eb99cb 100644
--- a/ibm_vpd_utils.cpp
+++ b/ibm_vpd_utils.cpp
@@ -387,9 +387,12 @@
     {
         auto js = json::parse(systemJson);
 
-        const string hwKeyword = getHW(vpdMap);
+        string hwKeyword = getHW(vpdMap);
         const string imKeyword = getIM(vpdMap);
 
+        transform(hwKeyword.begin(), hwKeyword.end(), hwKeyword.begin(),
+                  ::toupper);
+
         if (js.find("system") == js.end())
         {
             throw runtime_error("Invalid systems Json");
@@ -405,9 +408,30 @@
 
         if ((js["system"][imKeyword].find("constraint") !=
              js["system"][imKeyword].end()) &&
-            (hwKeyword == js["system"][imKeyword]["constraint"]["HW"]))
+            js["system"][imKeyword]["constraint"].find("HW") !=
+                js["system"][imKeyword]["constraint"].end())
         {
-            jsonName = js["system"][imKeyword]["constraint"]["json"];
+            // collect hw versions from json, and check hwKeyword  is part of it
+            // if hwKeyword is found there then load respective json
+            // otherwise load default one.
+            for (const auto& hwVersion :
+                 js["system"][imKeyword]["constraint"]["HW"])
+            {
+                string hw = hwVersion;
+                transform(hw.begin(), hw.end(), hw.begin(), ::toupper);
+
+                if (hw == hwKeyword)
+                {
+                    jsonName = js["system"][imKeyword]["constraint"]["json"];
+                    break;
+                }
+            }
+
+            if (jsonName.empty() && js["system"][imKeyword].find("default") !=
+                                        js["system"][imKeyword].end())
+            {
+                jsonName = js["system"][imKeyword]["default"];
+            }
         }
         else if (js["system"][imKeyword].find("default") !=
                  js["system"][imKeyword].end())