Revert "Use AsyncResp in retrieveUriToDbusMap"
This reverts commit 9d832618c74052bd445d6e8b3461946f3c431ca3.
Reason for revert: Power schema should not be returned as reposponse to
POST request
Signed-off-by: Krzysztof Grobelny <krzysztof.grobelny@intel.com>
Change-Id: I01806a8c24c67f264dab4e9972497323c1499017
diff --git a/redfish-core/lib/metric_report_definition.hpp b/redfish-core/lib/metric_report_definition.hpp
index e0bbd9b..a0c4f1d 100644
--- a/redfish-core/lib/metric_report_definition.hpp
+++ b/redfish-core/lib/metric_report_definition.hpp
@@ -391,7 +391,7 @@
for (const auto& [chassis, sensorType] : chassisSensors)
{
retrieveUriToDbusMap(
- asyncResp, chassis, sensorType,
+ chassis, sensorType,
[asyncResp, addReportReq](
const boost::beast::http::status status,
const boost::container::flat_map<
diff --git a/redfish-core/lib/sensors.hpp b/redfish-core/lib/sensors.hpp
index d371378..f9d806b 100644
--- a/redfish-core/lib/sensors.hpp
+++ b/redfish-core/lib/sensors.hpp
@@ -2960,10 +2960,9 @@
* @param node Node (group) of sensors. See sensors::node for supported values
* @param mapComplete Callback to be called with retrieval result
*/
-inline void
- retrieveUriToDbusMap(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
- const std::string& chassis, const std::string& node,
- SensorsAsyncResp::DataCompleteCb&& mapComplete)
+inline void retrieveUriToDbusMap(const std::string& chassis,
+ const std::string& node,
+ SensorsAsyncResp::DataCompleteCb&& mapComplete)
{
auto pathIt = sensors::dbus::paths.find(node);
if (pathIt == sensors::dbus::paths.end())
@@ -2973,8 +2972,10 @@
return;
}
+ auto res = std::make_shared<crow::Response>();
+ auto asyncResp = std::make_shared<bmcweb::AsyncResp>(*res);
auto callback =
- [asyncResp, mapCompleteCb{std::move(mapComplete)}](
+ [res, asyncResp, mapCompleteCb{std::move(mapComplete)}](
const boost::beast::http::status status,
const boost::container::flat_map<std::string, std::string>&
uriToDbus) { mapCompleteCb(status, uriToDbus); };