commit 321804e948cef958fabea91d7c5b646463eec6eb
author Manojkiran Eda <manojkiran.eda@gmail.com> Thu Mar 03 12:36:54 2022 +0530
committer Manojkiran Eda <manojkiran.eda@gmail.com> Thu Mar 03 12:44:19 2022 +0530
tree 52420e772d1b1f3c363571ef5246b5244ccf8246
parent d0405c3555427c03b231c8d52958f8689b3fa114

Allow OEM Effecters & Sensors leverage json infrastructure

In the current flow, if the entity type is in the OEM range,
then in both the getStateSensorReadings & setStateEffecter handler
flow, we would trigger the oem functions rather than the generic
functions (which handles the PDR's in json format) - while this gives
a seperated infrastructure, this would also limit us from using the
json infrastructure for OEM entities.

This fix would basically allow defining the OEM entities in the standard
PDR json files, and also allow us to seperate out a new 11.json & 4.json
into the oem/ configuration folders.

Signed-off-by: Manojkiran Eda <manojkiran.eda@gmail.com>
Change-Id: I41c771f07b0cc7879488cb9c475d90cdb845ed4c

libpldmresponder/platform.cpp

diff --git a/libpldmresponder/platform.cpp b/libpldmresponder/platform.cpp
index 2d6ed21..707c9ff 100644
--- a/libpldmresponder/platform.cpp
+++ b/libpldmresponder/platform.cpp
@@ -283,7 +283,8 @@
 
     if (isOemStateEffecter(*this, effecterId, compEffecterCnt, entityType,
                            entityInstance, stateSetId) &&
-        oemPlatformHandler != nullptr)
+        oemPlatformHandler != nullptr &&
+        !effecterDbusObjMaps.contains(effecterId))
     {
         rc = oemPlatformHandler->oemSetStateEffecterStatesHandler(
             entityType, entityInstance, stateSetId, compEffecterCnt, stateField,
@@ -663,7 +664,7 @@
 
     if (isOemStateSensor(*this, sensorId, sensorRearmCount, comSensorCnt,
                          entityType, entityInstance, stateSetId) &&
-        oemPlatformHandler != nullptr)
+        oemPlatformHandler != nullptr && !sensorDbusObjMaps.contains(sensorId))
     {
         rc = oemPlatformHandler->getOemStateSensorReadingsHandler(
             entityType, entityInstance, stateSetId, comSensorCnt, stateField);