commit 7d9a70608fe9e2cf23a0c6f1300544d5a346c1e0
author Rekha Aparna <vrekhaaparna@ibm.com> Tue Oct 07 04:14:42 2025 -0500
committer SunnySrivastava <sunnsr25@in.ibm.com> Mon Oct 13 07:12:28 2025 +0000
tree 883a0ee9be533d7c11928d7dcc5d16041117a2c1
parent f858736fb5887bfcb7fd04eb7cd06c88b263856b

Error handling for getkwVal API

This commit updates getKwVal APIs 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: I884dae49ebc56c57cb41f880dfc796ab53b47d16
Signed-off-by: Rekha Aparna <vrekhaaparna@ibm.com>

vpd-manager/include/utility/vpd_specific_utility.hpp

diff --git a/vpd-manager/include/utility/vpd_specific_utility.hpp b/vpd-manager/include/utility/vpd_specific_utility.hpp
index 520bf3a..acbc627 100644
--- a/vpd-manager/include/utility/vpd_specific_utility.hpp
+++ b/vpd-manager/include/utility/vpd_specific_utility.hpp
@@ -152,36 +152,32 @@
  *
  * @param[in] i_kwdValueMap - A map having Kwd value pair.
  * @param[in] i_kwd - keyword name.
+ * @param[out] o_errCode - To set error code in case of error.
  *
  * @return On success returns value of the keyword read from map, otherwise
  * returns empty string.
  */
 inline std::string getKwVal(const types::IPZKwdValueMap& i_kwdValueMap,
-                            const std::string& i_kwd) noexcept
+                            const std::string& i_kwd,
+                            uint16_t& o_errCode) noexcept
 {
     std::string l_kwdValue;
-    try
+    if (i_kwd.empty() || i_kwdValueMap.empty())
     {
-        if (i_kwd.empty())
-        {
-            throw std::runtime_error("Invalid parameters");
-        }
+        o_errCode = error_code::INVALID_INPUT_PARAMETER;
+        return l_kwdValue;
+    }
 
-        auto l_itrToKwd = i_kwdValueMap.find(i_kwd);
-        if (l_itrToKwd != i_kwdValueMap.end())
-        {
-            l_kwdValue = l_itrToKwd->second;
-        }
-        else
-        {
-            throw std::runtime_error("Keyword not found");
-        }
-    }
-    catch (const std::exception& l_ex)
+    auto l_itrToKwd = i_kwdValueMap.find(i_kwd);
+    if (l_itrToKwd != i_kwdValueMap.end())
     {
-        logging::logMessage("Failed to get value for keyword [" + i_kwd +
-                            "]. Error : " + l_ex.what());
+        l_kwdValue = l_itrToKwd->second;
     }
+    else
+    {
+        o_errCode = error_code::KEYWORD_NOT_FOUND;
+    }
+
     return l_kwdValue;
 }
 
@@ -378,19 +374,22 @@
         if (auto ipzVpdMap = std::get_if<types::IPZVpdMap>(&parsedVpdMap);
             ipzVpdMap && (*ipzVpdMap).find(recordName) != (*ipzVpdMap).end())
         {
+            uint16_t l_errCode = 0;
             auto itrToVCEN = (*ipzVpdMap).find(recordName);
-            firstKwdValue = getKwVal(itrToVCEN->second, kwd1);
+            firstKwdValue = getKwVal(itrToVCEN->second, kwd1, l_errCode);
             if (firstKwdValue.empty())
             {
                 throw std::runtime_error(
-                    "Failed to get value for keyword [" + kwd1 + "]");
+                    "Failed to get value for keyword [" + kwd1 +
+                    "], error : " + commonUtility::getErrCodeMsg(l_errCode));
             }
 
-            secondKwdValue = getKwVal(itrToVCEN->second, kwd2);
+            secondKwdValue = getKwVal(itrToVCEN->second, kwd2, l_errCode);
             if (secondKwdValue.empty())
             {
                 throw std::runtime_error(
-                    "Failed to get value for keyword [" + kwd2 + "]");
+                    "Failed to get value for keyword [" + kwd2 +
+                    "], error : " + commonUtility::getErrCodeMsg(l_errCode));
             }
         }
         else
@@ -556,12 +555,13 @@
                     "VINI record not found in parsed VPD. Can't find CCIN");
             }
 
-            std::string l_ccinFromVpd{
-                vpdSpecificUtility::getKwVal(l_itrToRec->second, "CC")};
+            uint16_t l_errCode = 0;
+            std::string l_ccinFromVpd{vpdSpecificUtility::getKwVal(
+                l_itrToRec->second, "CC", l_errCode)};
             if (l_ccinFromVpd.empty())
             {
-                throw DataException(
-                    "Empty CCIN value in VPD map. Can't find CCIN");
+                throw DataException("Can't find CCIN, error : " +
+                                    commonUtility::getErrCodeMsg(l_errCode));
             }
 
             transform(l_ccinFromVpd.begin(), l_ccinFromVpd.end(),