diff options
| author | Ed Tanous <ed@tanous.net> | 2024-04-30 02:49:51 +0300 |
|---|---|---|
| committer | Ed Tanous <ed@tanous.net> | 2024-04-30 17:50:54 +0300 |
| commit | ccb05564803b01c16387ac604394afb8207cea3b (patch) | |
| tree | 7ae074c55c5b2ca3f3c5a46648b279c371d499f4 | |
| parent | e4b32753a7ce7ca436bf751f390ee01f02b9efd5 (diff) | |
| download | bmcweb-ccb05564803b01c16387ac604394afb8207cea3b.tar.xz | |
Fix bad merge conflict
nbd proxy and vm websocket options got reversed in
36c0f2a35e670a4b798b7b42fd18455085e9d9c0
Change them back.
Change-Id: I7c54e66f88aee956bd20f2139d110e64998a4ef5
Signed-off-by: Ed Tanous <ed@tanous.net>
| -rw-r--r-- | include/vm_websocket.hpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/include/vm_websocket.hpp b/include/vm_websocket.hpp index d61bbcac12..14672e59d8 100644 --- a/include/vm_websocket.hpp +++ b/include/vm_websocket.hpp @@ -509,15 +509,6 @@ inline void onMessage(crow::websocket::Connection& conn, std::string_view data, session->second->send(data, std::move(whenComplete)); } - -inline void requestRoutes(App& app) -{ - BMCWEB_ROUTE(app, "/nbd/<str>") - .websocket() - .onopen(onOpen) - .onclose(onClose) - .onmessageex(onMessage); -} } // namespace nbd_proxy namespace obmc_vm @@ -529,7 +520,7 @@ inline void requestRoutes(App& app) !(bmcwebVmWebsocket && bmcwebNbdProxy), "nbd proxy cannot be turned on at the same time as vm websocket."); - if constexpr (bmcwebVmWebsocket) + if constexpr (bmcwebNbdProxy) { BMCWEB_ROUTE(app, "/nbd/<str>") .privileges({{"ConfigureComponents", "ConfigureManager"}}) @@ -545,7 +536,7 @@ inline void requestRoutes(App& app) .onclose(nbd_proxy::onClose) .onmessageex(nbd_proxy::onMessage); } - if constexpr (bmcwebNbdProxy) + if constexpr (bmcwebVmWebsocket) { BMCWEB_ROUTE(app, "/vm/0/0") .privileges({{"ConfigureComponents", "ConfigureManager"}}) |