pldmd: Migrate instance ID allocation to pldm::InstanceIdDb
This removes use of `pldm::dbus_api::Requester` from around the
code-base. This makes progress towards removing the DBus API entirely
once all its consumers are converted to the libpldm instance ID APIs.
There was never a good reason for the code using the class to have
knowledge that it was related to DBus anyway, so this is, in-effect, a
double clean up improving separation of concerns.
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Change-Id: I2d9397cae1b3c8c251c32e36ca520aad9c9b8cf6
diff --git a/libpldmresponder/test/libpldmresponder_base_test.cpp b/libpldmresponder/test/libpldmresponder_base_test.cpp
index f1ecfc3..8931f0c 100644
--- a/libpldmresponder/test/libpldmresponder_base_test.cpp
+++ b/libpldmresponder/test/libpldmresponder_base_test.cpp
@@ -18,14 +18,11 @@
{
protected:
TestBaseCommands() :
- instanceIdDb(), requester(pldm::utils::DBusHandler::getBus(),
- "/abc/def", this->instanceIdDb),
- event(sdeventplus::Event::get_default())
+ instanceIdDb(), event(sdeventplus::Event::get_default())
{}
uint8_t mctpEid = 0;
TestInstanceIdDb instanceIdDb;
- Requester requester;
sdeventplus::Event event;
};
@@ -35,7 +32,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, requester, event, nullptr, nullptr);
+ base::Handler handler(mctpEid, instanceIdDb, event, nullptr, nullptr);
auto response = handler.getPLDMTypes(request, requestPayloadLength);
// Need to support OEM type.
auto responsePtr = reinterpret_cast<pldm_msg*>(response.data());
@@ -52,7 +49,7 @@
requestPayload{};
auto request = reinterpret_cast<pldm_msg*>(requestPayload.data());
size_t requestPayloadLength = requestPayload.size() - sizeof(pldm_msg_hdr);
- base::Handler handler(mctpEid, requester, event, nullptr, nullptr);
+ base::Handler handler(mctpEid, instanceIdDb, event, nullptr, nullptr);
auto response = handler.getPLDMCommands(request, requestPayloadLength);
auto responsePtr = reinterpret_cast<pldm_msg*>(response.data());
uint8_t* payload_ptr = responsePtr->payload;
@@ -69,7 +66,7 @@
request->payload[0] = 0xFF;
size_t requestPayloadLength = requestPayload.size() - sizeof(pldm_msg_hdr);
- base::Handler handler(mctpEid, requester, event, nullptr, nullptr);
+ base::Handler handler(mctpEid, instanceIdDb, event, nullptr, nullptr);
auto response = handler.getPLDMCommands(request, requestPayloadLength);
auto responsePtr = reinterpret_cast<pldm_msg*>(response.data());
uint8_t* payload_ptr = responsePtr->payload;
@@ -94,7 +91,7 @@
ASSERT_EQ(0, rc);
- base::Handler handler(mctpEid, requester, event, nullptr, nullptr);
+ base::Handler handler(mctpEid, instanceIdDb, event, nullptr, nullptr);
auto response = handler.getPLDMVersion(request, requestPayloadLength);
auto responsePtr = reinterpret_cast<pldm_msg*>(response.data());
@@ -125,7 +122,7 @@
ASSERT_EQ(0, rc);
- base::Handler handler(mctpEid, requester, event, nullptr, nullptr);
+ base::Handler handler(mctpEid, instanceIdDb, event, nullptr, nullptr);
auto response = handler.getPLDMVersion(request, requestPayloadLength - 1);
auto responsePtr = reinterpret_cast<pldm_msg*>(response.data());
@@ -150,7 +147,7 @@
auto request = reinterpret_cast<pldm_msg*>(requestPayload.data());
size_t requestPayloadLength = 0;
- base::Handler handler(mctpEid, requester, event, nullptr, nullptr);
+ base::Handler handler(mctpEid, instanceIdDb, event, nullptr, nullptr);
auto response = handler.getTID(request, requestPayloadLength);
auto responsePtr = reinterpret_cast<pldm_msg*>(response.data());