Move all ComputerSystem routes to bottom
Similar to what we've done elsewhere, consolidate all the BMCWEB_ROUTE
calls on the bottom of the file. This is a consolidation such that you
no longer have to hunt for all the entry points into these handlers.
Tested: Code compiles
Change-Id: I9f2a2c6772445048e9ade2bf9e95330d73bedb05
Signed-off-by: Ed Tanous <edtanous@google.com>
diff --git a/redfish-core/lib/systems.hpp b/redfish-core/lib/systems.hpp
index 8a6216e..51c5c9c 100644
--- a/redfish-core/lib/systems.hpp
+++ b/redfish-core/lib/systems.hpp
@@ -2865,23 +2865,6 @@
}
/**
- * SystemsCollection derived class for delivering ComputerSystems Collection
- * Schema
- */
-inline void requestRoutesSystemsCollection(App& app)
-{
- BMCWEB_ROUTE(app, "/redfish/v1/Systems/")
- .privileges(redfish::privileges::headComputerSystemCollection)
- .methods(boost::beast::http::verb::head)(
- std::bind_front(handleComputerSystemCollectionHead, std::ref(app)));
-
- BMCWEB_ROUTE(app, "/redfish/v1/Systems/")
- .privileges(redfish::privileges::getComputerSystemCollection)
- .methods(boost::beast::http::verb::get)(
- std::bind_front(handleComputerSystemCollectionGet, std::ref(app)));
-}
-
-/**
* Function transceives data with dbus directly.
*/
inline void doNMI(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp)
@@ -3059,22 +3042,6 @@
}
}
-/**
- * SystemActionsReset class supports handle POST method for Reset action.
- * The class retrieves and sends data directly to D-Bus.
- */
-inline void requestRoutesSystemActionsReset(App& app)
-{
- /**
- * Function handles POST method request.
- * Analyzes POST body message before sends Reset request data to D-Bus.
- */
- BMCWEB_ROUTE(app, "/redfish/v1/Systems/<str>/Actions/ComputerSystem.Reset/")
- .privileges(redfish::privileges::postComputerSystem)
- .methods(boost::beast::http::verb::post)(std::bind_front(
- handleComputerSystemResetActionPost, std::ref(app)));
-}
-
inline void handleComputerSystemHead(
App& app, const crow::Request& req,
const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
@@ -3415,28 +3382,6 @@
ipsExitUtil, ipsExitTime);
}
}
-/**
- * Systems derived class for delivering Computer Systems Schema.
- */
-inline void requestRoutesSystems(App& app)
-{
- BMCWEB_ROUTE(app, "/redfish/v1/Systems/<str>/")
- .privileges(redfish::privileges::headComputerSystem)
- .methods(boost::beast::http::verb::head)(
- std::bind_front(handleComputerSystemHead, std::ref(app)));
- /**
- * Functions triggers appropriate requests on DBus
- */
- BMCWEB_ROUTE(app, "/redfish/v1/Systems/<str>/")
- .privileges(redfish::privileges::getComputerSystem)
- .methods(boost::beast::http::verb::get)(
- std::bind_front(handleComputerSystemGet, std::ref(app)));
-
- BMCWEB_ROUTE(app, "/redfish/v1/Systems/<str>/")
- .privileges(redfish::privileges::patchComputerSystem)
- .methods(boost::beast::http::verb::patch)(
- std::bind_front(handleComputerSystemPatch, std::ref(app)));
-}
inline void handleSystemCollectionResetActionHead(
crow::App& app, const crow::Request& req,
@@ -3515,15 +3460,42 @@
* SystemResetActionInfo derived class for delivering Computer Systems
* ResetType AllowableValues using ResetInfo schema.
*/
-inline void requestRoutesSystemResetActionInfo(App& app)
+inline void requestRoutesSystems(App& app)
{
+ BMCWEB_ROUTE(app, "/redfish/v1/Systems/")
+ .privileges(redfish::privileges::headComputerSystemCollection)
+ .methods(boost::beast::http::verb::head)(
+ std::bind_front(handleComputerSystemCollectionHead, std::ref(app)));
+
+ BMCWEB_ROUTE(app, "/redfish/v1/Systems/")
+ .privileges(redfish::privileges::getComputerSystemCollection)
+ .methods(boost::beast::http::verb::get)(
+ std::bind_front(handleComputerSystemCollectionGet, std::ref(app)));
+
+ BMCWEB_ROUTE(app, "/redfish/v1/Systems/<str>/")
+ .privileges(redfish::privileges::headComputerSystem)
+ .methods(boost::beast::http::verb::head)(
+ std::bind_front(handleComputerSystemHead, std::ref(app)));
+
+ BMCWEB_ROUTE(app, "/redfish/v1/Systems/<str>/")
+ .privileges(redfish::privileges::getComputerSystem)
+ .methods(boost::beast::http::verb::get)(
+ std::bind_front(handleComputerSystemGet, std::ref(app)));
+
+ BMCWEB_ROUTE(app, "/redfish/v1/Systems/<str>/")
+ .privileges(redfish::privileges::patchComputerSystem)
+ .methods(boost::beast::http::verb::patch)(
+ std::bind_front(handleComputerSystemPatch, std::ref(app)));
+
+ BMCWEB_ROUTE(app, "/redfish/v1/Systems/<str>/Actions/ComputerSystem.Reset/")
+ .privileges(redfish::privileges::postComputerSystem)
+ .methods(boost::beast::http::verb::post)(std::bind_front(
+ handleComputerSystemResetActionPost, std::ref(app)));
+
BMCWEB_ROUTE(app, "/redfish/v1/Systems/<str>/ResetActionInfo/")
.privileges(redfish::privileges::headActionInfo)
.methods(boost::beast::http::verb::head)(std::bind_front(
handleSystemCollectionResetActionHead, std::ref(app)));
- /**
- * Functions triggers appropriate requests on DBus
- */
BMCWEB_ROUTE(app, "/redfish/v1/Systems/<str>/ResetActionInfo/")
.privileges(redfish::privileges::getActionInfo)
.methods(boost::beast::http::verb::get)(std::bind_front(