diff options
32 files changed, 176 insertions, 175 deletions
diff --git a/redfish-core/include/query.hpp b/redfish-core/include/query.hpp index 1f7774f729..4c7e2f4651 100644 --- a/redfish-core/include/query.hpp +++ b/redfish-core/include/query.hpp @@ -12,7 +12,8 @@ namespace redfish // handled by redfish-core/lib codes, then default query parameter handler won't // process these parameters. [[nodiscard]] inline bool setUpRedfishRouteWithDelegation( - crow::App& app, const crow::Request& req, crow::Response& res, + crow::App& app, const crow::Request& req, + const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, query_param::Query& delegated, const query_param::QueryCapabilities& queryCapabilities) { @@ -25,14 +26,14 @@ namespace redfish std::string_view odataHeader = req.getHeaderValue("OData-Version"); if (!odataHeader.empty() && odataHeader != "4.0") { - messages::preconditionFailed(res); + messages::preconditionFailed(asyncResp->res); return false; } - res.addHeader("OData-Version", "4.0"); + asyncResp->res.addHeader("OData-Version", "4.0"); std::optional<query_param::Query> queryOpt = - query_param::parseParameters(req.urlView.params(), res); + query_param::parseParameters(req.urlView.params(), asyncResp->res); if (queryOpt == std::nullopt) { return false; @@ -46,8 +47,8 @@ namespace redfish delegated = query_param::delegate(queryCapabilities, *queryOpt); std::function<void(crow::Response&)> handler = - res.releaseCompleteRequestHandler(); - res.setCompleteRequestHandler( + asyncResp->res.releaseCompleteRequestHandler(); + asyncResp->res.setCompleteRequestHandler( [&app, handler(std::move(handler)), query{*queryOpt}](crow::Response& res) mutable { processAllParams(app, query, handler, res); @@ -56,13 +57,13 @@ namespace redfish } // Sets up the Redfish Route. All parameters are handled by the default handler. -[[nodiscard]] inline bool setUpRedfishRoute(crow::App& app, - const crow::Request& req, - crow::Response& res) +[[nodiscard]] inline bool + setUpRedfishRoute(crow::App& app, const crow::Request& req, + const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { // This route |delegated| is never used query_param::Query delegated; - return setUpRedfishRouteWithDelegation(app, req, res, delegated, + return setUpRedfishRouteWithDelegation(app, req, asyncResp, delegated, query_param::QueryCapabilities{}); } } // namespace redfish diff --git a/redfish-core/lib/account_service.hpp b/redfish-core/lib/account_service.hpp index 3d14015704..553d41e4ad 100644 --- a/redfish-core/lib/account_service.hpp +++ b/redfish-core/lib/account_service.hpp @@ -1247,7 +1247,7 @@ inline void requestAccountServiceRoutes(App& app) [&app]( const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) -> void { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1365,7 +1365,7 @@ inline void requestAccountServiceRoutes(App& app) [&app]( const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) -> void { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1487,7 +1487,7 @@ inline void requestAccountServiceRoutes(App& app) [&app]( const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) -> void { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1566,7 +1566,7 @@ inline void requestAccountServiceRoutes(App& app) [&app]( const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) -> void { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1682,7 +1682,7 @@ inline void requestAccountServiceRoutes(App& app) [&app]([[maybe_unused]] const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& accountName) -> void { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1848,7 +1848,7 @@ inline void requestAccountServiceRoutes(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& username) -> void { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1944,7 +1944,7 @@ inline void requestAccountServiceRoutes(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& username) -> void { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/bios.hpp b/redfish-core/lib/bios.hpp index 59cb2b30c2..6597075be9 100644 --- a/redfish-core/lib/bios.hpp +++ b/redfish-core/lib/bios.hpp @@ -14,7 +14,7 @@ inline void handleBiosServiceGet(crow::App& app, const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -50,7 +50,7 @@ inline void handleBiosResetPost(crow::App& app, const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/cable.hpp b/redfish-core/lib/cable.hpp index f9a48b4071..7389b4cd3f 100644 --- a/redfish-core/lib/cable.hpp +++ b/redfish-core/lib/cable.hpp @@ -106,7 +106,7 @@ inline void requestRoutesCable(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& cableId) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -169,7 +169,7 @@ inline void requestRoutesCableCollection(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/certificate_service.hpp b/redfish-core/lib/certificate_service.hpp index efd18ea1d7..c0ae4b34c8 100644 --- a/redfish-core/lib/certificate_service.hpp +++ b/redfish-core/lib/certificate_service.hpp @@ -49,7 +49,7 @@ inline void requestRoutesCertificateService(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -251,7 +251,7 @@ inline void requestRoutesCertificateActionGenerateCSR(App& app) .methods(boost::beast::http::verb::post)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -672,7 +672,7 @@ inline void requestRoutesCertificateActionsReplaceCertificate(App& app) .methods(boost::beast::http::verb::post)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -800,7 +800,7 @@ inline void requestRoutesHTTPSCertificate(App& app) get)([&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& param) -> void { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -836,7 +836,7 @@ inline void requestRoutesHTTPSCertificateCollection(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -884,7 +884,7 @@ inline void requestRoutesHTTPSCertificateCollection(App& app) .methods(boost::beast::http::verb::post)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -989,7 +989,7 @@ inline void requestRoutesCertificateLocations(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1030,7 +1030,7 @@ inline void requestRoutesLDAPCertificateCollection(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1079,7 +1079,7 @@ inline void requestRoutesLDAPCertificateCollection(App& app) .methods(boost::beast::http::verb::post)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1137,7 +1137,7 @@ inline void requestRoutesLDAPCertificate(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string&) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1168,7 +1168,7 @@ inline void requestRoutesTrustStoreCertificateCollection(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1215,7 +1215,7 @@ inline void requestRoutesTrustStoreCertificateCollection(App& app) .methods(boost::beast::http::verb::post)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1273,7 +1273,7 @@ inline void requestRoutesTrustStoreCertificate(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string&) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1303,7 +1303,7 @@ inline void requestRoutesTrustStoreCertificate(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& param) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/chassis.hpp b/redfish-core/lib/chassis.hpp index f92a7d8217..724d5f344c 100644 --- a/redfish-core/lib/chassis.hpp +++ b/redfish-core/lib/chassis.hpp @@ -142,7 +142,7 @@ inline void requestRoutesChassisCollection(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -211,7 +211,7 @@ inline void requestRoutesChassis(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& chassisId) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -450,7 +450,7 @@ inline void requestRoutesChassis(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& param) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -648,7 +648,7 @@ inline void requestRoutesChassisResetAction(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string&) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -687,7 +687,7 @@ inline void requestRoutesChassisResetActionInfo(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& chassisId) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/ethernet.hpp b/redfish-core/lib/ethernet.hpp index facc29b6bd..c3372f8a3e 100644 --- a/redfish-core/lib/ethernet.hpp +++ b/redfish-core/lib/ethernet.hpp @@ -1825,7 +1825,7 @@ inline void requestEthernetInterfacesRoutes(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1879,7 +1879,7 @@ inline void requestEthernetInterfacesRoutes(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& ifaceId) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1914,7 +1914,7 @@ inline void requestEthernetInterfacesRoutes(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& ifaceId) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2067,7 +2067,7 @@ inline void requestEthernetInterfacesRoutes(App& app) const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& parentIfaceId, const std::string& ifaceId) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2112,7 +2112,7 @@ inline void requestEthernetInterfacesRoutes(App& app) const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& parentIfaceId, const std::string& ifaceId) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2186,7 +2186,7 @@ inline void requestEthernetInterfacesRoutes(App& app) const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& parentIfaceId, const std::string& ifaceId) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2238,7 +2238,7 @@ inline void requestEthernetInterfacesRoutes(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& rootInterfaceName) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2300,7 +2300,7 @@ inline void requestEthernetInterfacesRoutes(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& rootInterfaceName) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/event_service.hpp b/redfish-core/lib/event_service.hpp index d0fa0a66e3..29175abe58 100644 --- a/redfish-core/lib/event_service.hpp +++ b/redfish-core/lib/event_service.hpp @@ -52,7 +52,7 @@ inline void requestRoutesEventService(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -97,7 +97,7 @@ inline void requestRoutesEventService(App& app) .methods(boost::beast::http::verb::patch)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -166,7 +166,7 @@ inline void requestRoutesSubmitTestEvent(App& app) .methods(boost::beast::http::verb::post)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -187,7 +187,7 @@ inline void requestRoutesEventDestinationCollection(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -217,7 +217,7 @@ inline void requestRoutesEventDestinationCollection(App& app) .methods(boost::beast::http::verb::post)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -488,7 +488,7 @@ inline void requestRoutesEventDestination(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& param) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -540,7 +540,7 @@ inline void requestRoutesEventDestination(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& param) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -616,7 +616,7 @@ inline void requestRoutesEventDestination(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& param) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/hypervisor_system.hpp b/redfish-core/lib/hypervisor_system.hpp index 1edece78ec..34227618d1 100644 --- a/redfish-core/lib/hypervisor_system.hpp +++ b/redfish-core/lib/hypervisor_system.hpp @@ -729,7 +729,7 @@ inline void requestRoutesHypervisorSystems(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -779,7 +779,7 @@ inline void requestRoutesHypervisorSystems(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -837,7 +837,7 @@ inline void requestRoutesHypervisorSystems(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& id) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -869,7 +869,7 @@ inline void requestRoutesHypervisorSystems(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& ifaceId) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -985,7 +985,7 @@ inline void requestRoutesHypervisorSystems(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1051,7 +1051,7 @@ inline void requestRoutesHypervisorSystems(App& app) .methods(boost::beast::http::verb::post)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/log_services.hpp b/redfish-core/lib/log_services.hpp index 4f6e85b782..be909861e3 100644 --- a/redfish-core/lib/log_services.hpp +++ b/redfish-core/lib/log_services.hpp @@ -888,7 +888,7 @@ inline void requestRoutesSystemLogServiceCollection(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -968,7 +968,7 @@ inline void requestRoutesEventLogService(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1006,7 +1006,7 @@ inline void requestRoutesJournalEventLogClear(App& app) .methods(boost::beast::http::verb::post)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1149,7 +1149,7 @@ inline void requestRoutesJournalEventLogEntryCollection(App& app) }; query_param::Query delegatedQuery; if (!redfish::setUpRedfishRouteWithDelegation( - app, req, asyncResp->res, delegatedQuery, capabilities)) + app, req, asyncResp, delegatedQuery, capabilities)) { return; } @@ -1236,7 +1236,7 @@ inline void requestRoutesJournalEventLogEntry(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& param) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1300,7 +1300,7 @@ inline void requestRoutesDBusEventLogEntryCollection(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1456,7 +1456,7 @@ inline void requestRoutesDBusEventLogEntry(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& param) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1569,7 +1569,7 @@ inline void requestRoutesDBusEventLogEntry(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& entryId) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1606,7 +1606,7 @@ inline void requestRoutesDBusEventLogEntry(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& param) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1658,7 +1658,7 @@ inline void requestRoutesDBusEventLogEntryDownload(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& param) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1826,7 +1826,7 @@ inline void requestRoutesSystemHostLogger(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1856,7 +1856,7 @@ inline void requestRoutesSystemHostLoggerCollection(App& app) }; query_param::Query delegatedQuery; if (!redfish::setUpRedfishRouteWithDelegation( - app, req, asyncResp->res, delegatedQuery, capabilities)) + app, req, asyncResp, delegatedQuery, capabilities)) { return; } @@ -1925,7 +1925,7 @@ inline void requestRoutesSystemHostLoggerLogEntry(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& param) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1987,7 +1987,7 @@ inline void requestRoutesBMCLogServiceCollection(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2022,7 +2022,7 @@ inline void requestRoutesBMCJournalLogService(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2120,7 +2120,7 @@ inline void requestRoutesBMCJournalLogEntryCollection(App& app) }; query_param::Query delegatedQuery; if (!redfish::setUpRedfishRouteWithDelegation( - app, req, asyncResp->res, delegatedQuery, capabilities)) + app, req, asyncResp, delegatedQuery, capabilities)) { return; } @@ -2202,7 +2202,7 @@ inline void requestRoutesBMCJournalLogEntry(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& entryID) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2273,7 +2273,7 @@ inline void requestRoutesBMCDumpService(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2313,7 +2313,7 @@ inline void requestRoutesBMCDumpEntryCollection(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2338,7 +2338,7 @@ inline void requestRoutesBMCDumpEntry(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& param) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2351,7 +2351,7 @@ inline void requestRoutesBMCDumpEntry(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& param) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2368,7 +2368,7 @@ inline void requestRoutesBMCDumpCreate(App& app) .methods(boost::beast::http::verb::post)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2385,7 +2385,7 @@ inline void requestRoutesBMCDumpClear(App& app) .methods(boost::beast::http::verb::post)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2400,7 +2400,7 @@ inline void requestRoutesSystemDumpService(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2441,7 +2441,7 @@ inline void requestRoutesSystemDumpEntryCollection(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2467,7 +2467,7 @@ inline void requestRoutesSystemDumpEntry(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& param) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2481,7 +2481,7 @@ inline void requestRoutesSystemDumpEntry(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& param) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2498,7 +2498,7 @@ inline void requestRoutesSystemDumpCreate(App& app) .methods(boost::beast::http::verb::post)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2517,7 +2517,7 @@ inline void requestRoutesSystemDumpClear(App& app) const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2539,7 +2539,7 @@ inline void requestRoutesCrashdumpService(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2582,7 +2582,7 @@ void inline requestRoutesCrashdumpClear(App& app) .methods(boost::beast::http::verb::post)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2686,7 +2686,7 @@ inline void requestRoutesCrashdumpEntryCollection(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2749,7 +2749,7 @@ inline void requestRoutesCrashdumpEntry(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& param) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2770,7 +2770,7 @@ inline void requestRoutesCrashdumpFile(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& logID, const std::string& fileName) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2863,7 +2863,7 @@ inline void requestRoutesCrashdumpCollect(App& app) .methods(boost::beast::http::verb::post)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2984,7 +2984,7 @@ inline void requestRoutesDBusLogServiceActionsClear(App& app) .methods(boost::beast::http::verb::post)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -3024,7 +3024,7 @@ inline void requestRoutesPostCodesLogService(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -3063,7 +3063,7 @@ inline void requestRoutesPostCodesClear(App& app) .methods(boost::beast::http::verb::post)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -3340,7 +3340,7 @@ inline void requestRoutesPostCodesEntryCollection(App& app) }; query_param::Query delegatedQuery; if (!redfish::setUpRedfishRouteWithDelegation( - app, req, asyncResp->res, delegatedQuery, capabilities)) + app, req, asyncResp, delegatedQuery, capabilities)) { return; } @@ -3409,7 +3409,7 @@ inline void requestRoutesPostCodesEntryAdditionalData(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& postCodeID) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -3486,7 +3486,7 @@ inline void requestRoutesPostCodesEntry(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& targetID) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/managers.hpp b/redfish-core/lib/managers.hpp index 87fcae98b9..0a235e0118 100644 --- a/redfish-core/lib/managers.hpp +++ b/redfish-core/lib/managers.hpp @@ -115,7 +115,7 @@ inline void requestRoutesManagerResetAction(App& app) .methods(boost::beast::http::verb::post)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -175,7 +175,7 @@ inline void requestRoutesManagerResetToDefaultsAction(App& app) .methods(boost::beast::http::verb::post)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -236,7 +236,7 @@ inline void requestRoutesManagerResetActionInfo(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1948,7 +1948,7 @@ inline void requestRoutesManager(App& app) .methods(boost::beast::http::verb::get)( [&app, uuid](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2189,7 +2189,7 @@ inline void requestRoutesManager(App& app) .methods(boost::beast::http::verb::patch)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2273,7 +2273,7 @@ inline void requestRoutesManagerCollection(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/memory.hpp b/redfish-core/lib/memory.hpp index 2dc6afae40..fb2dac147b 100644 --- a/redfish-core/lib/memory.hpp +++ b/redfish-core/lib/memory.hpp @@ -881,7 +881,7 @@ inline void requestRoutesMemoryCollection(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -908,7 +908,7 @@ inline void requestRoutesMemory(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& dimmId) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/message_registries.hpp b/redfish-core/lib/message_registries.hpp index bd9b0903a8..189cd2e75c 100644 --- a/redfish-core/lib/message_registries.hpp +++ b/redfish-core/lib/message_registries.hpp @@ -32,7 +32,7 @@ inline void handleMessageRegistryFileCollectionGet( crow::App& app, const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -69,7 +69,7 @@ inline void handleMessageRoutesMessageRegistryFileGet( const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& registry) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -142,7 +142,7 @@ inline void handleMessageRegistryGet( const std::string& registry, const std::string& registryMatch) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/metric_report.hpp b/redfish-core/lib/metric_report.hpp index 3dd7181558..74636dda31 100644 --- a/redfish-core/lib/metric_report.hpp +++ b/redfish-core/lib/metric_report.hpp @@ -68,7 +68,7 @@ inline void requestRoutesMetricReportCollection(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -92,7 +92,7 @@ inline void requestRoutesMetricReport(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& id) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/metric_report_definition.hpp b/redfish-core/lib/metric_report_definition.hpp index b5f59bece8..ee8447d0e7 100644 --- a/redfish-core/lib/metric_report_definition.hpp +++ b/redfish-core/lib/metric_report_definition.hpp @@ -354,7 +354,7 @@ inline void requestRoutesMetricReportDefinitionCollection(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -376,7 +376,7 @@ inline void requestRoutesMetricReportDefinitionCollection(App& app) .methods(boost::beast::http::verb::post)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -427,7 +427,7 @@ inline void requestRoutesMetricReportDefinition(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& id) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -466,7 +466,7 @@ inline void requestRoutesMetricReportDefinition(App& app) const std::string& id) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/network_protocol.hpp b/redfish-core/lib/network_protocol.hpp index 3cf8e2d7ae..8e921d74b6 100644 --- a/redfish-core/lib/network_protocol.hpp +++ b/redfish-core/lib/network_protocol.hpp @@ -395,7 +395,7 @@ inline void requestRoutesNetworkProtocol(App& app) .methods(boost::beast::http::verb::patch)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -455,7 +455,7 @@ inline void requestRoutesNetworkProtocol(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/pcie.hpp b/redfish-core/lib/pcie.hpp index df01afd820..b4d64332b5 100644 --- a/redfish-core/lib/pcie.hpp +++ b/redfish-core/lib/pcie.hpp @@ -84,7 +84,7 @@ inline void requestRoutesSystemPCIeDeviceCollection(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -148,7 +148,7 @@ inline void requestRoutesSystemPCIeDevice(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& device) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -250,7 +250,7 @@ inline void requestRoutesSystemPCIeFunctionCollection(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& device) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -336,7 +336,7 @@ inline void requestRoutesSystemPCIeFunction(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& device, const std::string& function) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/power.hpp b/redfish-core/lib/power.hpp index 7b2a47ac7a..bc18157c50 100644 --- a/redfish-core/lib/power.hpp +++ b/redfish-core/lib/power.hpp @@ -121,7 +121,7 @@ inline void requestRoutesPower(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& chassisName) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -308,7 +308,7 @@ inline void requestRoutesPower(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& chassisName) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/processor.hpp b/redfish-core/lib/processor.hpp index e4dd77609e..1e04393e24 100644 --- a/redfish-core/lib/processor.hpp +++ b/redfish-core/lib/processor.hpp @@ -1053,7 +1053,7 @@ inline void requestRoutesOperatingConfigCollection(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& cpuName) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1117,7 +1117,7 @@ inline void requestRoutesOperatingConfig(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& cpuName, const std::string& configName) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1179,7 +1179,7 @@ inline void requestRoutesProcessorCollection(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1209,7 +1209,7 @@ inline void requestRoutesProcessor(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& processorId) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1227,7 +1227,7 @@ inline void requestRoutesProcessor(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& processorId) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/redfish_sessions.hpp b/redfish-core/lib/redfish_sessions.hpp index 05e7fdc735..035a9a8be8 100644 --- a/redfish-core/lib/redfish_sessions.hpp +++ b/redfish-core/lib/redfish_sessions.hpp @@ -49,7 +49,7 @@ inline void const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& sessionId) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -71,7 +71,7 @@ inline void const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& sessionId) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -125,7 +125,7 @@ inline void handleSessionCollectionGet( crow::App& app, const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -144,7 +144,7 @@ inline void handleSessionCollectionMembersGet( crow::App& app, const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -155,7 +155,7 @@ inline void handleSessionCollectionPost( crow::App& app, const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -233,7 +233,7 @@ inline void const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -255,7 +255,7 @@ inline void handleSessionServicePatch( crow::App& app, const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/redfish_v1.hpp b/redfish-core/lib/redfish_v1.hpp index 9c24e2132c..1b23d1c177 100644 --- a/redfish-core/lib/redfish_v1.hpp +++ b/redfish-core/lib/redfish_v1.hpp @@ -12,7 +12,7 @@ namespace redfish inline void redfishGet(App& app, const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/roles.hpp b/redfish-core/lib/roles.hpp index 67e54670b0..ef7b5f48a8 100644 --- a/redfish-core/lib/roles.hpp +++ b/redfish-core/lib/roles.hpp @@ -81,7 +81,7 @@ inline void requestRoutesRoles(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& roleId) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -113,7 +113,7 @@ inline void requestRoutesRoleCollection(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/sensors.hpp b/redfish-core/lib/sensors.hpp index 2f8f741feb..e647f0b502 100644 --- a/redfish-core/lib/sensors.hpp +++ b/redfish-core/lib/sensors.hpp @@ -3001,7 +3001,7 @@ inline void .canDelegateExpandLevel = 1, }; query_param::Query delegatedQuery; - if (!redfish::setUpRedfishRouteWithDelegation(app, req, aResp->res, + if (!redfish::setUpRedfishRouteWithDelegation(app, req, aResp, delegatedQuery, capabilities)) { return; @@ -3038,7 +3038,7 @@ inline void handleSensorGet(App& app, const crow::Request& req, const std::string& chassisId, const std::string& sensorName) { - if (!redfish::setUpRedfishRoute(app, req, aResp->res)) + if (!redfish::setUpRedfishRoute(app, req, aResp)) { return; } diff --git a/redfish-core/lib/service_root.hpp b/redfish-core/lib/service_root.hpp index eae6fd935f..387b6141cb 100644 --- a/redfish-core/lib/service_root.hpp +++ b/redfish-core/lib/service_root.hpp @@ -93,7 +93,7 @@ inline void requestRoutesServiceRoot(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/storage.hpp b/redfish-core/lib/storage.hpp index 36916d5004..282665a17a 100644 --- a/redfish-core/lib/storage.hpp +++ b/redfish-core/lib/storage.hpp @@ -33,7 +33,7 @@ inline void requestRoutesStorageCollection(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -239,7 +239,7 @@ inline void requestRoutesStorage(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -479,7 +479,7 @@ inline void requestRoutesDrive(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& driveId) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -585,7 +585,7 @@ void chassisDriveCollectionGet( const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& chassisId) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/systems.hpp b/redfish-core/lib/systems.hpp index 4d37f5ec8e..134c560be4 100644 --- a/redfish-core/lib/systems.hpp +++ b/redfish-core/lib/systems.hpp @@ -2623,7 +2623,7 @@ inline void requestRoutesSystemsCollection(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2698,7 +2698,7 @@ inline void requestRoutesSystemActionsReset(App& app) .methods(boost::beast::http::verb::post)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2825,7 +2825,7 @@ inline void requestRoutesSystems(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -2950,7 +2950,7 @@ inline void requestRoutesSystems(App& app) .methods(boost::beast::http::verb::patch)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -3072,7 +3072,7 @@ inline void requestRoutesSystemResetActionInfo(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/task.hpp b/redfish-core/lib/task.hpp index fc334a93a1..b1b1d22fb3 100644 --- a/redfish-core/lib/task.hpp +++ b/redfish-core/lib/task.hpp @@ -325,7 +325,7 @@ inline void requestRoutesTaskMonitor(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& strParam) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -366,7 +366,7 @@ inline void requestRoutesTask(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& strParam) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -432,7 +432,7 @@ inline void requestRoutesTaskCollection(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -464,7 +464,7 @@ inline void requestRoutesTaskService(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/telemetry_service.hpp b/redfish-core/lib/telemetry_service.hpp index a5cc4c7c5a..72a1e1d0b8 100644 --- a/redfish-core/lib/telemetry_service.hpp +++ b/redfish-core/lib/telemetry_service.hpp @@ -14,7 +14,7 @@ inline void handleTelemetryServiceGet( crow::App& app, const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/thermal.hpp b/redfish-core/lib/thermal.hpp index 021134b8d4..83f79af3ff 100644 --- a/redfish-core/lib/thermal.hpp +++ b/redfish-core/lib/thermal.hpp @@ -32,7 +32,7 @@ inline void requestRoutesThermal(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& chassisName) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -51,7 +51,7 @@ inline void requestRoutesThermal(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& chassisName) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/trigger.hpp b/redfish-core/lib/trigger.hpp index 1c5739ad6a..9955105280 100644 --- a/redfish-core/lib/trigger.hpp +++ b/redfish-core/lib/trigger.hpp @@ -286,7 +286,7 @@ inline void requestRoutesTriggerCollection(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -309,7 +309,7 @@ inline void requestRoutesTrigger(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& id) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -347,7 +347,7 @@ inline void requestRoutesTrigger(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& id) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/update_service.hpp b/redfish-core/lib/update_service.hpp index da9e1de49b..4ae7cdfea5 100644 --- a/redfish-core/lib/update_service.hpp +++ b/redfish-core/lib/update_service.hpp @@ -404,7 +404,7 @@ inline void requestRoutesUpdateServiceActionsSimpleUpdate(App& app) .methods(boost::beast::http::verb::post)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -523,7 +523,7 @@ inline void handleUpdateServicePost(App& app, const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -550,7 +550,7 @@ inline void requestRoutesUpdateService(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -626,7 +626,7 @@ inline void requestRoutesUpdateService(App& app) .methods(boost::beast::http::verb::patch)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -735,7 +735,7 @@ inline void requestRoutesSoftwareInventoryCollection(App& app) .methods(boost::beast::http::verb::get)( [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -824,7 +824,7 @@ inline void requestRoutesSoftwareInventory(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& param) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } diff --git a/redfish-core/lib/virtual_media.hpp b/redfish-core/lib/virtual_media.hpp index 31bc7b682c..f56069b75e 100644 --- a/redfish-core/lib/virtual_media.hpp +++ b/redfish-core/lib/virtual_media.hpp @@ -782,7 +782,7 @@ inline void requestNBDVirtualMediaRoutes(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& name, const std::string& resName) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -910,7 +910,7 @@ inline void requestNBDVirtualMediaRoutes(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& name, const std::string& resName) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -998,7 +998,7 @@ inline void requestNBDVirtualMediaRoutes(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& name) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } @@ -1044,7 +1044,7 @@ inline void requestNBDVirtualMediaRoutes(App& app) [&app](const crow::Request& req, const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& name, const std::string& resName) { - if (!redfish::setUpRedfishRoute(app, req, asyncResp->res)) + if (!redfish::setUpRedfishRoute(app, req, asyncResp)) { return; } |