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/src/worker.cpp

diff --git a/vpd-manager/src/worker.cpp b/vpd-manager/src/worker.cpp
index 0c8f8f7..f81a9c1 100644
--- a/vpd-manager/src/worker.cpp
+++ b/vpd-manager/src/worker.cpp
@@ -836,8 +836,9 @@
                 return;
             }
 
-            const std::string pgKeywordValue{
-                vpdSpecificUtility::getKwVal(itrToRec->second, "PG")};
+            uint16_t l_errCode = 0;
+            const std::string pgKeywordValue{vpdSpecificUtility::getKwVal(
+                itrToRec->second, "PG", l_errCode)};
 
             if (!pgKeywordValue.empty())
             {
@@ -849,8 +850,10 @@
             }
             else
             {
-                throw DataException(std::string(__FUNCTION__) +
-                                    "Failed to get value for keyword PG");
+                throw DataException(
+                    std::string(__FUNCTION__) +
+                    "Failed to get value for keyword PG, error : " +
+                    commonUtility::getErrCodeMsg(l_errCode));
             }
         }
     }
@@ -909,11 +912,14 @@
             return false;
         }
 
+        uint16_t l_errCode = 0;
         std::string ccinFromVpd{
-            vpdSpecificUtility::getKwVal(itrToRec->second, "CC")};
+            vpdSpecificUtility::getKwVal(itrToRec->second, "CC", l_errCode)};
 
         if (ccinFromVpd.empty())
         {
+            logging::logMessage("Failed to get CCIN kwd value, error : " +
+                                commonUtility::getErrCodeMsg(l_errCode));
             return false;
         }
 
@@ -1091,26 +1097,29 @@
         auto l_itrToVsys = (*l_parsedVpdMap).find(constants::recVSYS);
         if (l_itrToVsys != (*l_parsedVpdMap).end())
         {
+            uint16_t l_errCode = 0;
             const std::string l_tmKwdValue{vpdSpecificUtility::getKwVal(
-                l_itrToVsys->second, constants::kwdTM)};
+                l_itrToVsys->second, constants::kwdTM, l_errCode)};
 
             if (l_tmKwdValue.empty())
             {
                 throw std::runtime_error(
                     std::string("Failed to get value for keyword [") +
                     constants::kwdTM +
-                    std::string("] while creating Asset tag."));
+                    std::string("] while creating Asset tag. Error : " +
+                                commonUtility::getErrCodeMsg(l_errCode)));
             }
 
             const std::string l_seKwdValue{vpdSpecificUtility::getKwVal(
-                l_itrToVsys->second, constants::kwdSE)};
+                l_itrToVsys->second, constants::kwdSE, l_errCode)};
 
             if (l_seKwdValue.empty())
             {
                 throw std::runtime_error(
                     std::string("Failed to get value for keyword [") +
                     constants::kwdSE +
-                    std::string("] while creating Asset tag."));
+                    std::string("] while creating Asset tag. Error : " +
+                                commonUtility::getErrCodeMsg(l_errCode)));
             }
 
             l_assetTag = std::string{"Server-"} + l_tmKwdValue +