commit ac713eec8b97954133fc500056fa394a6d7a7384
author Archana Kakani <archana.kakani@ibm.com> Mon May 20 01:27:53 2024 -0500
committer Archana Kakani <archana.kakani@ibm.com> Mon Jun 10 12:07:51 2024 +0000
tree 216e6d9c089fcc15f038f07db17e423c6bea23bb
parent 1e5c81e0a8a0f2b7d8b18fcf7500c50221fc39ae

pldm: Add bios configuration in single json file

Currently bios attributes are added in three json configuration
files based on the attribute type(integer, string, enum).
Combining all the attributes in single bios attribute json file
to organize the attributes based on the usage pattern.

Tested:
BMC powered on successfully
Unit tests passed

Change-Id: I42cc7c2394918e48d27dca2041f8ce00509c565a
Signed-off-by: Archana Kakani <archana.kakani@ibm.com>

libpldmresponder/bios_config.cpp

diff --git a/libpldmresponder/bios_config.cpp b/libpldmresponder/bios_config.cpp
index 1d4733d..82b3dfe 100644
--- a/libpldmresponder/bios_config.cpp
+++ b/libpldmresponder/bios_config.cpp
@@ -31,9 +31,7 @@
 using BIOSConfigManager =
     sdbusplus::xyz::openbmc_project::BIOSConfig::server::Manager;
 
-constexpr auto enumJsonFile = "enum_attrs.json";
-constexpr auto stringJsonFile = "string_attrs.json";
-constexpr auto integerJsonFile = "integer_attrs.json";
+constexpr auto attributesJsonFile = "bios_attrs.json";
 
 constexpr auto stringTableFile = "stringTable";
 constexpr auto attrTableFile = "attributeTable";
@@ -535,15 +533,22 @@
 
 void BIOSConfig::constructAttributes()
 {
-    info("Bios Attribute file path: {PATH}", "PATH", (jsonDir / sysType));
-    load(jsonDir / sysType / stringJsonFile, [this](const Json& entry) {
-        constructAttribute<BIOSStringAttribute>(entry);
-    });
-    load(jsonDir / sysType / integerJsonFile, [this](const Json& entry) {
-        constructAttribute<BIOSIntegerAttribute>(entry);
-    });
-    load(jsonDir / sysType / enumJsonFile, [this](const Json& entry) {
-        constructAttribute<BIOSEnumAttribute>(entry);
+    info("Bios Attribute file path: {PATH}", "PATH",
+         (jsonDir / sysType / attributesJsonFile));
+    load(jsonDir / sysType / attributesJsonFile, [this](const Json& entry) {
+        std::string attrType = entry.at("attribute_type");
+        if (attrType == "string")
+        {
+            constructAttribute<BIOSStringAttribute>(entry);
+        }
+        else if (attrType == "integer")
+        {
+            constructAttribute<BIOSIntegerAttribute>(entry);
+        }
+        else if (attrType == "enum")
+        {
+            constructAttribute<BIOSEnumAttribute>(entry);
+        }
     });
 }
 
@@ -619,18 +624,19 @@
 std::optional<Table> BIOSConfig::buildAndStoreStringTable()
 {
     std::set<std::string> strings;
-    auto handler = [&strings](const Json& entry) {
-        strings.emplace(entry.at("attribute_name"));
-    };
-
-    load(jsonDir / sysType / stringJsonFile, handler);
-    load(jsonDir / sysType / integerJsonFile, handler);
-    load(jsonDir / sysType / enumJsonFile, [&strings](const Json& entry) {
-        strings.emplace(entry.at("attribute_name"));
-        auto possibleValues = entry.at("possible_values");
-        for (auto& pv : possibleValues)
+    load(jsonDir / sysType / attributesJsonFile, [&strings](const Json& entry) {
+        if (entry.at("attribute_type") == "enum")
         {
-            strings.emplace(pv);
+            strings.emplace(entry.at("attribute_name"));
+            auto possibleValues = entry.at("possible_values");
+            for (auto& pv : possibleValues)
+            {
+                strings.emplace(pv);
+            }
+        }
+        else
+        {
+            strings.emplace(entry.at("attribute_name"));
         }
     });