Merge pull request #545 from RekhaAparna01/pelsForWorkerClass1

PEL for Worker class

Author: SunnySrivastava1984

vpd-manager/include/worker.hpp

@@ -473,7 +473,10 @@ class Worker
      * @brief API to form asset tag string for the system.
      *
      * @param[in] i_parsedVpdMap - Parsed VPD map.
-     * @return - Formed asset tag string. Empty in case of any error.
+     *
+     * @throw std::runtime_error
+     *
+     * @return - Formed asset tag string.
      */
     std::string
         createAssetTagString(const types::VPDMapVariant& i_parsedVpdMap);

vpd-manager/src/worker.cpp

@@ -5,6 +5,7 @@
 #include "backup_restore.hpp"
 #include "configuration.hpp"
 #include "constants.hpp"
+#include "event_logger.hpp"
 #include "exceptions.hpp"
 #include "logger.hpp"
 #include "parser.hpp"
@@ -252,7 +253,7 @@ std::string Worker::getHWVersion(const types::IPZVpdMap& parsedVpd) const
 {
     if (parsedVpd.empty())
     {
-        throw std::runtime_error("Empty VPD map. Can't Extract IM value");
+        throw std::runtime_error("Empty VPD map. Can't Extract HW value");
     }
 
     const auto& itrToVINI = parsedVpd.find("VINI");
@@ -1150,43 +1151,33 @@ std::string
 {
     std::string l_assetTag;
 
-    try
+    // system VPD will be in IPZ format.
+    if (auto l_parsedVpdMap = std::get_if<types::IPZVpdMap>(&i_parsedVpdMap))
     {
-        // system VPD will be in IPZ format.
-        if (auto l_parsedVpdMap =
-                std::get_if<types::IPZVpdMap>(&i_parsedVpdMap))
+        auto l_itrToVsys = (*l_parsedVpdMap).find(constants::recVSYS);
+        if (l_itrToVsys != (*l_parsedVpdMap).end())
         {
-            auto l_itrToVsys = (*l_parsedVpdMap).find(constants::recVSYS);
-            if (l_itrToVsys != (*l_parsedVpdMap).end())
-            {
-                std::string l_tmKwdValue;
-                vpdSpecificUtility::getKwVal(l_itrToVsys->second,
-                                             constants::kwdTM, l_tmKwdValue);
+            std::string l_tmKwdValue;
+            vpdSpecificUtility::getKwVal(l_itrToVsys->second, constants::kwdTM,
+                                         l_tmKwdValue);
 
-                std::string l_seKwdValue;
-                vpdSpecificUtility::getKwVal(l_itrToVsys->second,
-                                             constants::kwdSE, l_seKwdValue);
+            std::string l_seKwdValue;
+            vpdSpecificUtility::getKwVal(l_itrToVsys->second, constants::kwdSE,
+                                         l_seKwdValue);
 
-                l_assetTag = std::string{"Server-"} + l_tmKwdValue +
-                             std::string{"-"} + l_seKwdValue;
-            }
-            else
-            {
-                throw std::runtime_error(
-                    "VSYS record not found in parsed VPD map to create Asset tag.");
-            }
+            l_assetTag = std::string{"Server-"} + l_tmKwdValue +
+                         std::string{"-"} + l_seKwdValue;
         }
         else
         {
             throw std::runtime_error(
-                "Invalid VPD type recieved to create Asset tag.");
+                "VSYS record not found in parsed VPD map to create Asset tag.");
         }
     }
-    catch (const std::exception& l_ex)
+    else
     {
-        // TODO:Log PEL with below description.
-        logging::logMessage("Asset tag can't be formed. Error = " +
-                            std::string(l_ex.what()));
+        throw std::runtime_error(
+            "Invalid VPD type recieved to create Asset tag.");
     }
 
     return l_assetTag;
@@ -1224,10 +1215,12 @@ void Worker::publishSystemVPD(const types::VPDMapVariant& parsedVpdMap)
         }
         catch (const std::exception& l_ex)
         {
-            // TODO Log PEL with below description
-            logging::logMessage(
+            EventLogger::createSyncPel(
+                types::ErrorType::InvalidVpdMessage,
+                types::SeverityType::Informational, __FILE__, __FUNCTION__, 0,
                 "Asset tag update failed with following error: " +
-                std::string(l_ex.what()));
+                    std::string(l_ex.what()),
+                std::nullopt, std::nullopt, std::nullopt, std::nullopt);
         }
 
         // Notify PIM
@@ -1557,6 +1550,8 @@ void Worker::performBackupAndRestore(types::VPDMapVariant& io_srcVpdMap)
             auto [l_srcVpdVariant,
                   l_dstVpdVariant] = l_backupAndRestoreObj.backupAndRestore();
 
+            throw std::runtime_error("Test error");
+
             // ToDo: Revisit is this check is required or not.
             if (auto l_srcVpdMap =
                     std::get_if<types::IPZVpdMap>(&l_srcVpdVariant);
@@ -1566,18 +1561,15 @@ void Worker::performBackupAndRestore(types::VPDMapVariant& io_srcVpdMap)
             }
         }
     }
-    catch (const std::exception& ex)
+    catch (const std::exception& l_ex)
     {
-        logging::logMessage(ex.what());
-        // ToDo: Uncomment when PEL implementation goes in.
-        /*std::string l_errorMsg(
-            "Exception caught while backup and restore VPD keyword's. Error: " +
-            std::string(ex.what()));
-        inventory::PelAdditionalData l_additionalData{};
-        l_additionalData.emplace("DESCRIPTION", l_errorMsg);
-        createPEL(l_additionalData,
-        PelSeverity::ERROR, errBackupAndRestore, nullptr);
-        */
+        EventLogger::createSyncPel(
+            types::ErrorType::InvalidVpdMessage,
+            types::SeverityType::Informational, __FILE__, __FUNCTION__, 0,
+            std::string(
+                "Exception caught while backup and restore VPD keyword's.") +
+                l_ex.what(),
+            std::nullopt, std::nullopt, std::nullopt, std::nullopt);
     }
 }
 
@@ -1643,9 +1635,7 @@ void Worker::deleteFruVpd(const std::string& i_dbusObjPath)
 
                 if (!dbusUtility::callPIM(std::move(l_objectMap)))
                 {
-                    throw std::runtime_error(
-                        "Can't process delete VPD for FRU [" + i_dbusObjPath +
-                        "] as unable to read present property");
+                    throw std::runtime_error("Call to PIM failed.");
                 }
 
                 if (jsonUtility::isActionRequired(m_parsedJson, l_fruPath,
@@ -1660,7 +1650,9 @@ void Worker::deleteFruVpd(const std::string& i_dbusObjPath)
         }
         else
         {
-            logging::logMessage("DBus read failed");
+            logging::logMessage("Can't process delete VPD for FRU [" +
+                                i_dbusObjPath +
+                                "] as unable to read present property");
             return;
         }