Reorganize the setEventReceiver code
This commit is to re-organise the code to make the
setEventReceiver optional when GetTID gets called.
Currently, it is being called on every GetTID command.
This is and OEM behaviour, which was implemented at -
https://gerrit.openbmc.org/c/openbmc/pldm/+/41779/36
Also, setEventReceiver is a command defined in the platform
Spec, so rightfully placing it under the platform handler.
Signed-off-by: Sagar Srinivas <sagar.srinivas@ibm.com>
Change-Id: Ib60e9d46a8eaf4806c5ec2e9575f4e219bc80eab
diff --git a/libpldmresponder/test/libpldmresponder_base_test.cpp b/libpldmresponder/test/libpldmresponder_base_test.cpp
index f056ec8..b1ca89d 100644
--- a/libpldmresponder/test/libpldmresponder_base_test.cpp
+++ b/libpldmresponder/test/libpldmresponder_base_test.cpp
@@ -17,12 +17,8 @@
class TestBaseCommands : public testing::Test
{
protected:
- TestBaseCommands() :
- instanceIdDb(), event(sdeventplus::Event::get_default())
- {}
+ TestBaseCommands() : event(sdeventplus::Event::get_default()) {}
- uint8_t mctpEid = 0;
- TestInstanceIdDb instanceIdDb;
sdeventplus::Event event;
};
@@ -32,7 +28,7 @@
auto request = reinterpret_cast<pldm_msg*>(requestPayload.data());
// payload length will be 0 in this case
size_t requestPayloadLength = 0;
- base::Handler handler(mctpEid, instanceIdDb, event, nullptr, nullptr);
+ base::Handler handler(event, nullptr);
auto response = handler.getPLDMTypes(request, requestPayloadLength);
// Need to support OEM type.
auto responsePtr = reinterpret_cast<pldm_msg*>(response.data());
@@ -49,7 +45,7 @@
requestPayload{};
auto request = reinterpret_cast<pldm_msg*>(requestPayload.data());
size_t requestPayloadLength = requestPayload.size() - sizeof(pldm_msg_hdr);
- base::Handler handler(mctpEid, instanceIdDb, event, nullptr, nullptr);
+ base::Handler handler(event, nullptr);
auto response = handler.getPLDMCommands(request, requestPayloadLength);
auto responsePtr = reinterpret_cast<pldm_msg*>(response.data());
uint8_t* payload_ptr = responsePtr->payload;
@@ -66,7 +62,7 @@
request->payload[0] = 0xFF;
size_t requestPayloadLength = requestPayload.size() - sizeof(pldm_msg_hdr);
- base::Handler handler(mctpEid, instanceIdDb, event, nullptr, nullptr);
+ base::Handler handler(event, nullptr);
auto response = handler.getPLDMCommands(request, requestPayloadLength);
auto responsePtr = reinterpret_cast<pldm_msg*>(response.data());
uint8_t* payload_ptr = responsePtr->payload;
@@ -91,7 +87,7 @@
ASSERT_EQ(0, rc);
- base::Handler handler(mctpEid, instanceIdDb, event, nullptr, nullptr);
+ base::Handler handler(event, nullptr);
auto response = handler.getPLDMVersion(request, requestPayloadLength);
auto responsePtr = reinterpret_cast<pldm_msg*>(response.data());
@@ -122,7 +118,7 @@
ASSERT_EQ(0, rc);
- base::Handler handler(mctpEid, instanceIdDb, event, nullptr, nullptr);
+ base::Handler handler(event, nullptr);
auto response = handler.getPLDMVersion(request, requestPayloadLength - 1);
auto responsePtr = reinterpret_cast<pldm_msg*>(response.data());
@@ -147,7 +143,7 @@
auto request = reinterpret_cast<pldm_msg*>(requestPayload.data());
size_t requestPayloadLength = 0;
- base::Handler handler(mctpEid, instanceIdDb, event, nullptr, nullptr);
+ base::Handler handler(event, nullptr);
auto response = handler.getTID(request, requestPayloadLength);
auto responsePtr = reinterpret_cast<pldm_msg*>(response.data());
diff --git a/libpldmresponder/test/libpldmresponder_pdr_effecter_test.cpp b/libpldmresponder/test/libpldmresponder_pdr_effecter_test.cpp
index 0c2b02a..6ef74b7 100644
--- a/libpldmresponder/test/libpldmresponder_pdr_effecter_test.cpp
+++ b/libpldmresponder/test/libpldmresponder_pdr_effecter_test.cpp
@@ -30,8 +30,9 @@
auto outPDRRepo = pldm_pdr_init();
Repo outRepo(outPDRRepo);
auto event = sdeventplus::Event::get_default();
- Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good", inPDRRepo,
- nullptr, nullptr, nullptr, nullptr, event);
+ Handler handler(&mockedUtils, 0, nullptr, "./pdr_jsons/state_effecter/good",
+ inPDRRepo, nullptr, nullptr, nullptr, nullptr, nullptr,
+ event);
Repo inRepo(inPDRRepo);
getRepoByType(inRepo, outRepo, PLDM_STATE_EFFECTER_PDR);
@@ -130,8 +131,9 @@
auto outPDRRepo = pldm_pdr_init();
Repo outRepo(outPDRRepo);
auto event = sdeventplus::Event::get_default();
- Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good", inPDRRepo,
- nullptr, nullptr, nullptr, nullptr, event);
+ Handler handler(&mockedUtils, 0, nullptr, "./pdr_jsons/state_effecter/good",
+ inPDRRepo, nullptr, nullptr, nullptr, nullptr, nullptr,
+ event);
Repo inRepo(inPDRRepo);
getRepoByType(inRepo, outRepo, PLDM_NUMERIC_EFFECTER_PDR);
@@ -177,8 +179,9 @@
auto outPDRRepo = pldm_pdr_init();
Repo outRepo(outPDRRepo);
auto event = sdeventplus::Event::get_default();
- Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good", inPDRRepo,
- nullptr, nullptr, nullptr, nullptr, event);
+ Handler handler(&mockedUtils, 0, nullptr, "./pdr_jsons/state_effecter/good",
+ inPDRRepo, nullptr, nullptr, nullptr, nullptr, nullptr,
+ event);
Repo inRepo(inPDRRepo);
getRepoByType(inRepo, outRepo, PLDM_STATE_EFFECTER_PDR);
@@ -199,8 +202,9 @@
auto inPDRRepo = pldm_pdr_init();
auto event = sdeventplus::Event::get_default();
- Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good", inPDRRepo,
- nullptr, nullptr, nullptr, nullptr, event);
+ Handler handler(&mockedUtils, 0, nullptr, "./pdr_jsons/state_effecter/good",
+ inPDRRepo, nullptr, nullptr, nullptr, nullptr, nullptr,
+ event);
uint16_t entityType = 33;
uint16_t entityInstance = 0;
uint16_t containerId = 0;
diff --git a/libpldmresponder/test/libpldmresponder_pdr_sensor_test.cpp b/libpldmresponder/test/libpldmresponder_pdr_sensor_test.cpp
index a600c71..ae1ed3a 100644
--- a/libpldmresponder/test/libpldmresponder_pdr_sensor_test.cpp
+++ b/libpldmresponder/test/libpldmresponder_pdr_sensor_test.cpp
@@ -34,8 +34,9 @@
auto outPDRRepo = pldm_pdr_init();
Repo outRepo(outPDRRepo);
auto event = sdeventplus::Event::get_default();
- Handler handler(&mockedUtils, "./pdr_jsons/state_sensor/good", inPDRRepo,
- nullptr, nullptr, nullptr, nullptr, event);
+ Handler handler(&mockedUtils, 0, nullptr, "./pdr_jsons/state_sensor/good",
+ inPDRRepo, nullptr, nullptr, nullptr, nullptr, nullptr,
+ event);
handler.getPDR(req, requestPayloadLength);
Repo inRepo(inPDRRepo);
getRepoByType(inRepo, outRepo, PLDM_STATE_SENSOR_PDR);
@@ -85,8 +86,9 @@
auto outPDRRepo = pldm_pdr_init();
Repo outRepo(outPDRRepo);
auto event = sdeventplus::Event::get_default();
- Handler handler(&mockedUtils, "./pdr_jsons/state_sensor/good", inPDRRepo,
- nullptr, nullptr, nullptr, nullptr, event);
+ Handler handler(&mockedUtils, 0, nullptr, "./pdr_jsons/state_sensor/good",
+ inPDRRepo, nullptr, nullptr, nullptr, nullptr, nullptr,
+ event);
handler.getPDR(req, requestPayloadLength);
Repo inRepo(inPDRRepo);
getRepoByType(inRepo, outRepo, PLDM_STATE_SENSOR_PDR);
diff --git a/libpldmresponder/test/libpldmresponder_platform_test.cpp b/libpldmresponder/test/libpldmresponder_platform_test.cpp
index 2d52987..1bc92d5 100644
--- a/libpldmresponder/test/libpldmresponder_platform_test.cpp
+++ b/libpldmresponder/test/libpldmresponder_platform_test.cpp
@@ -42,8 +42,9 @@
auto pdrRepo = pldm_pdr_init();
auto event = sdeventplus::Event::get_default();
- Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good", pdrRepo,
- nullptr, nullptr, nullptr, nullptr, event);
+ Handler handler(&mockedUtils, 0, nullptr, "./pdr_jsons/state_effecter/good",
+ pdrRepo, nullptr, nullptr, nullptr, nullptr, nullptr,
+ event);
Repo repo(pdrRepo);
ASSERT_EQ(repo.empty(), false);
auto response = handler.getPDR(req, requestPayloadLength);
@@ -80,8 +81,9 @@
auto pdrRepo = pldm_pdr_init();
auto event = sdeventplus::Event::get_default();
- Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good", pdrRepo,
- nullptr, nullptr, nullptr, nullptr, event);
+ Handler handler(&mockedUtils, 0, nullptr, "./pdr_jsons/state_effecter/good",
+ pdrRepo, nullptr, nullptr, nullptr, nullptr, nullptr,
+ event);
Repo repo(pdrRepo);
ASSERT_EQ(repo.empty(), false);
auto response = handler.getPDR(req, requestPayloadLength);
@@ -112,8 +114,9 @@
auto pdrRepo = pldm_pdr_init();
auto event = sdeventplus::Event::get_default();
- Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good", pdrRepo,
- nullptr, nullptr, nullptr, nullptr, event);
+ Handler handler(&mockedUtils, 0, nullptr, "./pdr_jsons/state_effecter/good",
+ pdrRepo, nullptr, nullptr, nullptr, nullptr, nullptr,
+ event);
Repo repo(pdrRepo);
ASSERT_EQ(repo.empty(), false);
auto response = handler.getPDR(req, requestPayloadLength);
@@ -142,8 +145,9 @@
auto pdrRepo = pldm_pdr_init();
auto event = sdeventplus::Event::get_default();
- Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good", pdrRepo,
- nullptr, nullptr, nullptr, nullptr, event);
+ Handler handler(&mockedUtils, 0, nullptr, "./pdr_jsons/state_effecter/good",
+ pdrRepo, nullptr, nullptr, nullptr, nullptr, nullptr,
+ event);
Repo repo(pdrRepo);
ASSERT_EQ(repo.empty(), false);
auto response = handler.getPDR(req, requestPayloadLength);
@@ -174,8 +178,9 @@
auto pdrRepo = pldm_pdr_init();
auto event = sdeventplus::Event::get_default();
- Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good", pdrRepo,
- nullptr, nullptr, nullptr, nullptr, event);
+ Handler handler(&mockedUtils, 0, nullptr, "./pdr_jsons/state_effecter/good",
+ pdrRepo, nullptr, nullptr, nullptr, nullptr, nullptr,
+ event);
Repo repo(pdrRepo);
ASSERT_EQ(repo.empty(), false);
auto response = handler.getPDR(req, requestPayloadLength);
@@ -234,8 +239,9 @@
auto outPDRRepo = pldm_pdr_init();
Repo outRepo(outPDRRepo);
auto event = sdeventplus::Event::get_default();
- Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good", inPDRRepo,
- nullptr, nullptr, nullptr, nullptr, event);
+ Handler handler(&mockedUtils, 0, nullptr, "./pdr_jsons/state_effecter/good",
+ inPDRRepo, nullptr, nullptr, nullptr, nullptr, nullptr,
+ event);
handler.getPDR(req, requestPayloadLength);
Repo inRepo(inPDRRepo);
getRepoByType(inRepo, outRepo, PLDM_STATE_EFFECTER_PDR);
@@ -281,8 +287,9 @@
auto outPDRRepo = pldm_pdr_init();
Repo outRepo(outPDRRepo);
auto event = sdeventplus::Event::get_default();
- Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good", inPDRRepo,
- nullptr, nullptr, nullptr, nullptr, event);
+ Handler handler(&mockedUtils, 0, nullptr, "./pdr_jsons/state_effecter/good",
+ inPDRRepo, nullptr, nullptr, nullptr, nullptr, nullptr,
+ event);
handler.getPDR(req, requestPayloadLength);
Repo inRepo(inPDRRepo);
getRepoByType(inRepo, outRepo, PLDM_STATE_EFFECTER_PDR);
@@ -327,8 +334,9 @@
auto numericEffecterPdrRepo = pldm_pdr_init();
Repo numericEffecterPDRs(numericEffecterPdrRepo);
auto event = sdeventplus::Event::get_default();
- Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good", inPDRRepo,
- nullptr, nullptr, nullptr, nullptr, event);
+ Handler handler(&mockedUtils, 0, nullptr, "./pdr_jsons/state_effecter/good",
+ inPDRRepo, nullptr, nullptr, nullptr, nullptr, nullptr,
+ event);
Repo inRepo(inPDRRepo);
getRepoByType(inRepo, numericEffecterPDRs, PLDM_NUMERIC_EFFECTER_PDR);
@@ -370,8 +378,9 @@
auto numericEffecterPdrRepo = pldm_pdr_init();
Repo numericEffecterPDRs(numericEffecterPdrRepo);
auto event = sdeventplus::Event::get_default();
- Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good", inPDRRepo,
- nullptr, nullptr, nullptr, nullptr, event);
+ Handler handler(&mockedUtils, 0, nullptr, "./pdr_jsons/state_effecter/good",
+ inPDRRepo, nullptr, nullptr, nullptr, nullptr, nullptr,
+ event);
Repo inRepo(inPDRRepo);
getRepoByType(inRepo, numericEffecterPDRs, PLDM_NUMERIC_EFFECTER_PDR);
@@ -406,8 +415,9 @@
auto numericEffecterPdrRepo = pldm_pdr_init();
Repo numericEffecterPDRs(numericEffecterPdrRepo);
auto event = sdeventplus::Event::get_default();
- Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good", inPDRRepo,
- nullptr, nullptr, nullptr, nullptr, event);
+ Handler handler(&mockedUtils, 0, nullptr, "./pdr_jsons/state_effecter/good",
+ inPDRRepo, nullptr, nullptr, nullptr, nullptr, nullptr,
+ event);
Repo inRepo(inPDRRepo);
getRepoByType(inRepo, numericEffecterPDRs, PLDM_NUMERIC_EFFECTER_PDR);
@@ -482,8 +492,9 @@
auto numericEffecterPdrRepo = pldm_pdr_init();
Repo numericEffecterPDRs(numericEffecterPdrRepo);
auto event = sdeventplus::Event::get_default();
- Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good", inPDRRepo,
- nullptr, nullptr, nullptr, nullptr, event);
+ Handler handler(&mockedUtils, 0, nullptr, "./pdr_jsons/state_effecter/good",
+ inPDRRepo, nullptr, nullptr, nullptr, nullptr, nullptr,
+ event);
Repo inRepo(inPDRRepo);
getRepoByType(inRepo, numericEffecterPDRs, PLDM_NUMERIC_EFFECTER_PDR);
@@ -661,8 +672,8 @@
Repo outRepo(outPDRRepo);
MockdBusHandler mockedUtils;
auto event = sdeventplus::Event::get_default();
- Handler handler(&mockedUtils, "", inPDRRepo, nullptr, nullptr, nullptr,
- nullptr, event);
+ Handler handler(&mockedUtils, 0, nullptr, "", inPDRRepo, nullptr, nullptr,
+ nullptr, nullptr, nullptr, event);
Repo inRepo(inPDRRepo);
getRepoByType(inRepo, outRepo, PLDM_TERMINUS_LOCATOR_PDR);
@@ -706,8 +717,9 @@
auto outPDRRepo = pldm_pdr_init();
Repo outRepo(outPDRRepo);
auto event = sdeventplus::Event::get_default();
- Handler handler(&mockedUtils, "./pdr_jsons/state_sensor/good", inPDRRepo,
- nullptr, nullptr, nullptr, nullptr, event);
+ Handler handler(&mockedUtils, 0, nullptr, "./pdr_jsons/state_sensor/good",
+ inPDRRepo, nullptr, nullptr, nullptr, nullptr, nullptr,
+ event);
Repo inRepo(inPDRRepo);
getRepoByType(inRepo, outRepo, PLDM_STATE_SENSOR_PDR);
pdr_utils::PdrEntry e;
@@ -753,8 +765,9 @@
auto outPDRRepo = pldm_pdr_init();
Repo outRepo(outPDRRepo);
auto event = sdeventplus::Event::get_default();
- Handler handler(&mockedUtils, "./pdr_jsons/state_sensor/good", inPDRRepo,
- nullptr, nullptr, nullptr, nullptr, event);
+ Handler handler(&mockedUtils, 0, nullptr, "./pdr_jsons/state_sensor/good",
+ inPDRRepo, nullptr, nullptr, nullptr, nullptr, nullptr,
+ event);
Repo inRepo(inPDRRepo);
getRepoByType(inRepo, outRepo, PLDM_STATE_SENSOR_PDR);
pdr_utils::PdrEntry e;