Make bmcweb image upload compatible with upstream.
This change moves the image upload logic out of the intel oem
namespace, and makes it 1:1 compatible with phosphor rest dbus. This
is to allow a seamless transition in the future.
Change-Id: I243237357a672934c05bf072e7ff1a5955af0f5e
diff --git a/src/webserver_main.cpp b/src/webserver_main.cpp
index eaaca94..93b3aa6 100644
--- a/src/webserver_main.cpp
+++ b/src/webserver_main.cpp
@@ -1,7 +1,7 @@
#include <systemd/sd-daemon.h>
#include <dbus_monitor.hpp>
#include <dbus_singleton.hpp>
-#include <intel_oem.hpp>
+#include <image_upload.hpp>
#include <openbmc_dbus_rest.hpp>
#include <persistent_data_middleware.hpp>
#include <redfish_v1.hpp>
@@ -43,7 +43,7 @@
}
int main(int argc, char** argv) {
- crow::logger::setLogLevel(crow::LogLevel::DEBUG);
+ crow::logger::setLogLevel(crow::LogLevel::DEBUG);
auto io = std::make_shared<boost::asio::io_service>();
crow::PersistentData::session_store =
@@ -67,7 +67,7 @@
crow::kvm::request_routes(app);
crow::redfish::request_routes(app);
crow::dbus_monitor::request_routes(app);
- crow::intel_oem::request_routes(app);
+ crow::image_upload::requestRoutes(app);
crow::openbmc_mapper::request_routes(app);
CROW_LOG_INFO << "bmcweb (" << __DATE__ << ": " << __TIME__ << ')';
@@ -80,4 +80,5 @@
app.run();
io->run();
+ crow::connections::system_bus.reset();
}