commit d3662226ea3d25bae316acd4387c3ee26fcee3b9
author Rekha Aparna <vrekhaaparna@ibm.com> Tue Oct 14 10:33:17 2025 -0500
committer SunnySrivastava <sunnsr25@in.ibm.com> Fri Oct 24 05:48:58 2025 +0000
tree 635a56bcdbd7fa06de6818e9924b28d3d6d6a3d6
parent 2c04eeb2d58be0fdadd2ed28e797a4751e4591b5

Error code for insertorMerge API

This commit updates insertOrMerge API to set error code in case of
error. This helps the caller of API to take action based on the error
code returned from the API.

Change-Id: I4bd37c226a7f2f73076d811e641e39159eadf874
Signed-off-by: Rekha Aparna <vrekhaaparna@ibm.com>

wait-vpd-parser/src/prime_inventory.cpp

diff --git a/wait-vpd-parser/src/prime_inventory.cpp b/wait-vpd-parser/src/prime_inventory.cpp
index 67a6671..eee3a00 100644
--- a/wait-vpd-parser/src/prime_inventory.cpp
+++ b/wait-vpd-parser/src/prime_inventory.cpp
@@ -213,9 +213,17 @@
         }*/
     }
 
+    uint16_t l_errCode = 0;
+
     vpd::vpdSpecificUtility::insertOrMerge(
         l_interfaces, "xyz.openbmc_project.Inventory.Item",
-        move(l_propertyValueMap));
+        move(l_propertyValueMap), l_errCode);
+
+    if (l_errCode)
+    {
+        m_logger->logMessage("Failed to insert value into map, error : " +
+                             vpd::commonUtility::getErrCodeMsg(l_errCode));
+    }
 
     if (i_fruJsonObj.value("inherit", true) &&
         m_sysCfgJsonObj.contains("commonInterfaces"))
@@ -231,9 +239,16 @@
     vpd::types::PropertyMap l_fruCollectionProperty = {
         {"Status", vpd::constants::vpdCollectionNotStarted}};
 
+    l_errCode = 0;
     vpd::vpdSpecificUtility::insertOrMerge(
         l_interfaces, vpd::constants::vpdCollectionInterface,
-        std::move(l_fruCollectionProperty));
+        std::move(l_fruCollectionProperty), l_errCode);
+
+    if (l_errCode)
+    {
+        m_logger->logMessage("Failed to insert value into map, error : " +
+                             vpd::commonUtility::getErrCodeMsg(l_errCode));
+    }
 
     o_objectInterfaceMap.emplace(std::move(l_fruObjectPath),
                                  std::move(l_interfaces));
@@ -250,6 +265,7 @@
     {
         const std::string& l_interface = l_interfacesPropPair.key();
         vpd::types::PropertyMap l_propertyMap;
+        uint16_t l_errCode = 0;
 
         for (const auto& l_propValuePair : l_interfacesPropPair.value().items())
         {
@@ -275,7 +291,14 @@
                     vpd::vpdSpecificUtility::insertOrMerge(
                         io_interfaceMap,
                         std::string(vpd::constants::xyzLocationCodeInf),
-                        move(l_locCodeProperty));
+                        move(l_locCodeProperty), l_errCode);
+
+                    if (l_errCode)
+                    {
+                        m_logger->logMessage(
+                            "Failed to insert value into map, error : " +
+                            vpd::commonUtility::getErrCodeMsg(l_errCode));
+                    }
                 }
                 else
                 {
@@ -398,8 +421,15 @@
                 }
             }
         }
+        l_errCode = 0;
         vpd::vpdSpecificUtility::insertOrMerge(io_interfaceMap, l_interface,
-                                               move(l_propertyMap));
+                                               move(l_propertyMap), l_errCode);
+
+        if (l_errCode)
+        {
+            m_logger->logMessage("Failed to insert value into map, error : " +
+                                 vpd::commonUtility::getErrCodeMsg(l_errCode));
+        }
     }
 }
 
@@ -432,11 +462,18 @@
 
         // Implies value is not there in D-Bus. Populate it with default
         // value "true".
+        uint16_t l_errCode = 0;
         vpd::types::PropertyMap l_functionalProp;
         l_functionalProp.emplace("Functional", true);
         vpd::vpdSpecificUtility::insertOrMerge(
             io_interfaces, vpd::constants::operationalStatusInf,
-            move(l_functionalProp));
+            move(l_functionalProp), l_errCode);
+
+        if (l_errCode)
+        {
+            m_logger->logMessage("Failed to insert value into map, error : " +
+                                 vpd::commonUtility::getErrCodeMsg(l_errCode));
+        }
     }
 
     // if chassis is power on. Functional property should be there on D-Bus.
@@ -472,10 +509,18 @@
 
         // Implies value is not there in D-Bus. Populate it with default
         // value "true".
+        uint16_t l_errCode = 0;
         vpd::types::PropertyMap l_enabledProp;
         l_enabledProp.emplace("Enabled", true);
         vpd::vpdSpecificUtility::insertOrMerge(
-            io_interfaces, vpd::constants::enableInf, move(l_enabledProp));
+            io_interfaces, vpd::constants::enableInf, move(l_enabledProp),
+            l_errCode);
+
+        if (l_errCode)
+        {
+            m_logger->logMessage("Failed to insert value into map, error : " +
+                                 vpd::commonUtility::getErrCodeMsg(l_errCode));
+        }
     }
 
     // if chassis is power on. Enabled property should be there on D-Bus.