Update JSON tag to follow camel case
JSON tag for post fail action has been modified to follow camel case.
Worker code has been modified accordingly.
Change-Id: I20960a2bdac13cca9f426d04e37247c5ebb62ddb
Signed-off-by: Sunny Srivastava <sunnsr25@in.ibm.com>
diff --git a/configuration/ibm/50001000.json b/configuration/ibm/50001000.json
index 8dbee4d..3e08269 100644
--- a/configuration/ibm/50001000.json
+++ b/configuration/ibm/50001000.json
@@ -2013,7 +2013,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT3_PRSNT_EN_RSVD",
@@ -2222,7 +2222,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT10_PRSNT_EN_RSVD",
@@ -2385,7 +2385,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT2_PRSNT_EN_RSVD",
@@ -2445,7 +2445,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT6_PRSNT_EN_RSVD",
@@ -2498,7 +2498,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT7_PRSNT_EN_RSVD",
@@ -2558,7 +2558,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT9_PRSNT_EN_RSVD",
@@ -2618,7 +2618,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT11_PRSNT_EN_RSVD",
@@ -2747,7 +2747,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT1_PRSNT_EN_RSVD",
@@ -2807,7 +2807,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT8_PRSNT_EN_RSVD",
diff --git a/configuration/ibm/50001000_v2.json b/configuration/ibm/50001000_v2.json
index ea66635..e02e2a2 100644
--- a/configuration/ibm/50001000_v2.json
+++ b/configuration/ibm/50001000_v2.json
@@ -2045,7 +2045,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT3_PRSNT_EN_RSVD",
@@ -2265,7 +2265,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT10_PRSNT_EN_RSVD",
@@ -2432,7 +2432,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT2_PRSNT_EN_RSVD",
@@ -2496,7 +2496,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT6_PRSNT_EN_RSVD",
@@ -2553,7 +2553,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT7_PRSNT_EN_RSVD",
@@ -2617,7 +2617,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT9_PRSNT_EN_RSVD",
@@ -2681,7 +2681,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT11_PRSNT_EN_RSVD",
@@ -2815,7 +2815,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT1_PRSNT_EN_RSVD",
@@ -2879,7 +2879,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT8_PRSNT_EN_RSVD",
diff --git a/configuration/ibm/50001001.json b/configuration/ibm/50001001.json
index 3755847..bb42dd3 100644
--- a/configuration/ibm/50001001.json
+++ b/configuration/ibm/50001001.json
@@ -982,7 +982,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "RUSSEL_FW_I2C_ENABLE_N",
@@ -1753,7 +1753,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT0_PRSNT_EN_RSVD",
@@ -1859,7 +1859,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT3_PRSNT_EN_RSVD",
@@ -1965,7 +1965,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT4_PRSNT_EN_RSVD",
@@ -2071,7 +2071,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT10_PRSNT_EN_RSVD",
@@ -2234,7 +2234,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT2_PRSNT_EN_RSVD",
@@ -2294,7 +2294,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT6_PRSNT_EN_RSVD",
@@ -2347,7 +2347,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT7_PRSNT_EN_RSVD",
@@ -2407,7 +2407,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT9_PRSNT_EN_RSVD",
@@ -2467,7 +2467,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT11_PRSNT_EN_RSVD",
@@ -2596,7 +2596,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT1_PRSNT_EN_RSVD",
@@ -2656,7 +2656,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT8_PRSNT_EN_RSVD",
diff --git a/configuration/ibm/50001002.json b/configuration/ibm/50001002.json
index 09ede7d..6b46905 100644
--- a/configuration/ibm/50001002.json
+++ b/configuration/ibm/50001002.json
@@ -812,7 +812,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "RUSSEL_FW_I2C_ENABLE_N",
@@ -1213,7 +1213,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT10_PRSNT_EN_RSVD",
@@ -1363,7 +1363,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT7_PRSNT_EN_RSVD",
@@ -1410,7 +1410,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT9_PRSNT_EN_RSVD",
@@ -1457,7 +1457,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT11_PRSNT_EN_RSVD",
@@ -1573,7 +1573,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "SLOT8_PRSNT_EN_RSVD",
diff --git a/configuration/ibm/50003000.json b/configuration/ibm/50003000.json
index 36f0cde..1d3f209 100644
--- a/configuration/ibm/50003000.json
+++ b/configuration/ibm/50003000.json
@@ -3025,7 +3025,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "presence-cable-card1",
@@ -3133,7 +3133,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "presence-cable-card2",
@@ -3243,7 +3243,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "presence-cable-card3",
@@ -3353,7 +3353,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "presence-cable-card4",
@@ -3463,7 +3463,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "presence-cable-card5",
@@ -3562,7 +3562,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "presence-cable-card6",
@@ -3637,7 +3637,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "presence-cable-card7",
@@ -3747,7 +3747,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "presence-cable-card8",
@@ -3842,7 +3842,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "presence-cable-card9",
@@ -3917,7 +3917,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "presence-cable-card10",
@@ -4027,7 +4027,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "presence-cable-card11",
diff --git a/configuration/ibm/50003000_v2.json b/configuration/ibm/50003000_v2.json
index ca3b548..7d7b6ec 100644
--- a/configuration/ibm/50003000_v2.json
+++ b/configuration/ibm/50003000_v2.json
@@ -2897,7 +2897,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "presence-cable-card1",
@@ -3005,7 +3005,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "presence-cable-card2",
@@ -3115,7 +3115,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "presence-cable-card3",
@@ -3225,7 +3225,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "presence-cable-card4",
@@ -3335,7 +3335,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "presence-cable-card5",
@@ -3434,7 +3434,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "presence-cable-card6",
@@ -3509,7 +3509,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "presence-cable-card7",
@@ -3619,7 +3619,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "presence-cable-card8",
@@ -3718,7 +3718,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "presence-cable-card9",
@@ -3793,7 +3793,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "presence-cable-card10",
@@ -3903,7 +3903,7 @@
}
}
},
- "PostFailAction": {
+ "postFailAction": {
"collection": {
"setGpio": {
"pin": "presence-cable-card11",
diff --git a/vpd-manager/include/utility/json_utility.hpp b/vpd-manager/include/utility/json_utility.hpp
index 3dab105..a43682c 100644
--- a/vpd-manager/include/utility/json_utility.hpp
+++ b/vpd-manager/include/utility/json_utility.hpp
@@ -203,7 +203,7 @@
return false;
}
- if (!(i_parsedConfigJson["frus"][i_vpdFilePath].at(0))["PostFailAction"]
+ if (!(i_parsedConfigJson["frus"][i_vpdFilePath].at(0))["postFailAction"]
.contains(i_flagToProcess))
{
logging::logMessage(
@@ -214,14 +214,14 @@
}
for (const auto& l_tags : (i_parsedConfigJson["frus"][i_vpdFilePath].at(
- 0))["PostFailAction"][i_flagToProcess]
+ 0))["postFailAction"][i_flagToProcess]
.items())
{
auto itrToFunction = funcionMap.find(l_tags.key());
if (itrToFunction != funcionMap.end())
{
if (!itrToFunction->second(i_parsedConfigJson, i_vpdFilePath,
- "PostFailAction", i_flagToProcess))
+ "postFailAction", i_flagToProcess))
{
return false;
}
diff --git a/vpd-manager/src/worker.cpp b/vpd-manager/src/worker.cpp
index bfea069..82ec973 100644
--- a/vpd-manager/src/worker.cpp
+++ b/vpd-manager/src/worker.cpp
@@ -1397,7 +1397,7 @@
{
// If post fail action is required, execute it.
if (jsonUtility::isActionRequired(m_parsedJson, i_vpdFilePath,
- "PostFailAction", "collection"))
+ "postFailAction", "collection"))
{
if (!jsonUtility::executePostFailAction(m_parsedJson, i_vpdFilePath,
"collection"))