commit f65fca6a44ded566fa6e993b1b23b2e189a48703
author Ed Tanous <edtanous@google.com> Tue May 24 12:49:41 2022 -0700
committer Ed Tanous <ed@tanous.net> Wed Jun 01 16:21:42 2022 +0000
tree a5579e4adbfab8504294e2a732bee00a71a43fc5
parent 002d39b4a7a5ed7166e2acad84e0943c3def9492

Move redfish/v1 instantiation

Make /redfish/v1 get instantiated in the same place as the other redfish
routes, and not in main().

Tested:
curl -vvvv --insecure --user root:0penBmc https://192.168.7.2/redfish

returns the same value as previously.

Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: Icb93954c00a4cf41708f1b323ddbd83e61146e5d

redfish-core/include/redfish.hpp

diff --git a/redfish-core/include/redfish.hpp b/redfish-core/include/redfish.hpp
index a9704d6a..10c7161 100644
--- a/redfish-core/include/redfish.hpp
+++ b/redfish-core/include/redfish.hpp
@@ -34,6 +34,7 @@
 #include "../lib/power.hpp"
 #include "../lib/processor.hpp"
 #include "../lib/redfish_sessions.hpp"
+#include "../lib/redfish_v1.hpp"
 #include "../lib/roles.hpp"
 #include "../lib/sensors.hpp"
 #include "../lib/service_root.hpp"
@@ -212,6 +213,8 @@
         requestRoutesMetricReport(app);
         requestRoutesTriggerCollection(app);
         requestRoutesTrigger(app);
+
+        requestRoutesRedfish(app);
     }
 };
 

redfish-core/lib/redfish_v1.hpp

diff --git a/redfish-core/lib/redfish_v1.hpp b/redfish-core/lib/redfish_v1.hpp
index 52d8c76..9c24e21 100644
--- a/redfish-core/lib/redfish_v1.hpp
+++ b/redfish-core/lib/redfish_v1.hpp
@@ -19,10 +19,11 @@
     asyncResp->res.jsonValue["v1"] = "/redfish/v1/";
 }
 
-inline void requestRoutes(App& app)
+inline void requestRoutesRedfish(App& app)
 {
     BMCWEB_ROUTE(app, "/redfish/")
         .methods(boost::beast::http::verb::get)(
             std::bind_front(redfishGet, std::ref(app)));
 }
+
 } // namespace redfish

src/webserver_main.cpp

diff --git a/src/webserver_main.cpp b/src/webserver_main.cpp
index 9d2aa8a..f49b25d 100644
--- a/src/webserver_main.cpp
+++ b/src/webserver_main.cpp
@@ -16,7 +16,6 @@
 #include <openbmc_dbus_rest.hpp>
 #include <redfish.hpp>
 #include <redfish_aggregator.hpp>
-#include <redfish_v1.hpp>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/bus.hpp>
 #include <sdbusplus/server.hpp>
@@ -84,7 +83,6 @@
 #endif
 
 #ifdef BMCWEB_ENABLE_REDFISH
-    redfish::requestRoutes(app);
     redfish::RedfishService redfish(app);
 
     // Create HttpClient instance and initialize Config