commit 22db1728d5fdcac0a257976afa99034ae189c753
author Ed Tanous <edtanous@google.com> Wed Jun 09 10:53:51 2021 -0700
committer Ed Tanous <ed@tanous.net> Thu Jun 10 19:05:09 2021 +0000
tree 65b725207a9ad5da8429bdaa9311e8415c15ce77
parent 864d6a17eb80fbe3ca23042bdb91a057e5075b6b

Remove Node class from NBD proxy

This was broken as part of the recent Node removal.  Although this code
is currently dead, it would be good if at least was able to be built, so
if someone was inclined to upstream the backend for it, they could
without too much trouble.

Because of this move in code, clang-tidy can now see this code and found
a number of failures, so this is combined with a couple of relatively
trivial clang-tidy changes that are low impact and mechanical in nature.

Tested:
Commented in the option in meson_options.txt, and built.  Code builds.

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

redfish-core/include/redfish.hpp

diff --git a/redfish-core/include/redfish.hpp b/redfish-core/include/redfish.hpp
index 47d4848..e4d732c 100644
--- a/redfish-core/include/redfish.hpp
+++ b/redfish-core/include/redfish.hpp
@@ -21,6 +21,7 @@
 #include "../lib/chassis.hpp"
 #include "../lib/ethernet.hpp"
 #include "../lib/event_service.hpp"
+#include "../lib/hypervisor_system.hpp"
 #include "../lib/log_services.hpp"
 #include "../lib/managers.hpp"
 #include "../lib/memory.hpp"
@@ -41,10 +42,7 @@
 #include "../lib/telemetry_service.hpp"
 #include "../lib/thermal.hpp"
 #include "../lib/update_service.hpp"
-#ifdef BMCWEB_ENABLE_VM_NBDPROXY
 #include "../lib/virtual_media.hpp"
-#endif // BMCWEB_ENABLE_VM_NBDPROXY
-#include "../lib/hypervisor_system.hpp"
 
 namespace redfish
 {
@@ -148,13 +146,11 @@
         requestRoutesSystemResetActionInfo(app);
         requestRoutesBiosService(app);
         requestRoutesBiosReset(app);
+
 #ifdef BMCWEB_ENABLE_VM_NBDPROXY
-        nodes.emplace_back(std::make_unique<VirtualMedia>(app));
-        nodes.emplace_back(std::make_unique<VirtualMediaCollection>(app));
-        nodes.emplace_back(
-            std::make_unique<VirtualMediaActionInsertMedia>(app));
-        nodes.emplace_back(std::make_unique<VirtualMediaActionEjectMedia>(app));
+        requestNBDVirtualMediaRoutes(app);
 #endif // BMCWEB_ENABLE_VM_NBDPROXY
+
 #ifdef BMCWEB_ENABLE_REDFISH_DBUS_LOG_ENTRIES
         requestRoutesDBusLogServiceActionsClear(app);
         requestRoutesDBusEventLogEntryCollection(app);