IBM:IPZ:VPD: template change for UTIL:D0

UTIL:D0 changed to VSYS:MM
updated the tool for UTIL:D0
corrected the tool for UTIL:D1

Change-Id: Ic1a5d067fe4951bfe7f51bef53919a931c79d314
Signed-off-by: Jinu Joy Thomas <jinu.joy.thomas@in.ibm.com>
diff --git a/vpd-manager/include/constants.hpp b/vpd-manager/include/constants.hpp
index fea5b63..9708beb 100644
--- a/vpd-manager/include/constants.hpp
+++ b/vpd-manager/include/constants.hpp
@@ -130,7 +130,7 @@
 constexpr auto vsbpInf = "com.ibm.ipzvpd.VSBP";
 constexpr auto kwdCCIN = "CC";
 constexpr auto kwdRG = "RG";
-constexpr auto kwdAMM = "D0";
+constexpr auto kwdAMM = "MM";
 constexpr auto kwdClearNVRAM_CreateLPAR = "BA";
 constexpr auto kwdKeepAndClear = "BA";
 constexpr auto kwdFC = "FC";
diff --git a/vpd-manager/src/bios_handler.cpp b/vpd-manager/src/bios_handler.cpp
index d9a0a20..0a4386b 100644
--- a/vpd-manager/src/bios_handler.cpp
+++ b/vpd-manager/src/bios_handler.cpp
@@ -265,7 +265,7 @@
             if (constants::FAILURE ==
                 m_manager->updateKeyword(
                     SYSTEM_VPD_FILE_PATH,
-                    types::IpzData("VSYS", constants::kwdRG,
+                    types::IpzData(constants::vsysInf, constants::kwdRG,
                                    l_biosValInVpdFormat)))
             {
                 logging::logMessage(
@@ -318,7 +318,7 @@
     // Read existing value.
     auto l_kwdValueVariant = dbusUtility::readDbusProperty(
         constants::pimServiceName, constants::systemVpdInvPath,
-        constants::utilInf, constants::kwdAMM);
+        constants::vsysInf, constants::kwdAMM);
 
     if (auto l_pVal = std::get_if<types::BinaryVector>(&l_kwdValueVariant))
     {
@@ -337,7 +337,8 @@
         if (constants::FAILURE ==
             m_manager->updateKeyword(
                 SYSTEM_VPD_FILE_PATH,
-                types::IpzData("UTIL", constants::kwdAMM, l_valToUpdateInVpd)))
+                types::IpzData(constants::vsysInf, constants::kwdAMM,
+                               l_valToUpdateInVpd)))
         {
             logging::logMessage(
                 "Failed to update " + std::string(constants::kwdAMM) +
@@ -379,7 +380,7 @@
 {
     auto l_kwdValueVariant = dbusUtility::readDbusProperty(
         constants::pimServiceName, constants::systemVpdInvPath,
-        constants::utilInf, constants::kwdAMM);
+        constants::vsysInf, constants::kwdAMM);
 
     if (auto pVal = std::get_if<types::BinaryVector>(&l_kwdValueVariant))
     {
diff --git a/vpd-tool/src/vpd_tool.cpp b/vpd-tool/src/vpd_tool.cpp
index c275509..0c6c434 100644
--- a/vpd-tool/src/vpd_tool.cpp
+++ b/vpd-tool/src/vpd_tool.cpp
@@ -16,10 +16,10 @@
 // position, enabled value, disabled value}
 // Note: we do not care about min/max value for the BIOS attribute here.
 const types::BiosAttributeKeywordMap VpdTool::m_biosAttributeVpdKeywordMap = {
-    {{"UTIL", "D0"},
+    {{"VSYS", "MM"},
      {{"hb_memory_mirror_mode", constants::VALUE_8, std::nullopt,
        constants::VALUE_2, constants::VALUE_1}}},
-    {{"UTIL", "D1"},
+    {{"VSYS", "BA"},
      {{"pvm_keep_and_clear", constants::VALUE_1, constants::VALUE_0,
        constants::VALUE_1, constants::VALUE_0},
       {"pvm_create_default_lpar", constants::VALUE_1, constants::VALUE_1,