diff options
Diffstat (limited to 'redfish-core/lib/managers.hpp')
| -rw-r--r-- | redfish-core/lib/managers.hpp | 87 |
1 files changed, 47 insertions, 40 deletions
diff --git a/redfish-core/lib/managers.hpp b/redfish-core/lib/managers.hpp index 592bbd8642..e6f42bea8c 100644 --- a/redfish-core/lib/managers.hpp +++ b/redfish-core/lib/managers.hpp @@ -1945,7 +1945,7 @@ inline void requestRoutesManager(App& app) asyncResp->res.jsonValue["EthernetInterfaces"]["@odata.id"] = "/redfish/v1/Managers/bmc/EthernetInterfaces"; - if constexpr (bmcwebNbdProxy) + if constexpr (BMCWEB_VM_NBDPROXY) { asyncResp->res.jsonValue["VirtualMedia"]["@odata.id"] = "/redfish/v1/Managers/bmc/VirtualMedia"; @@ -1998,15 +1998,18 @@ inline void requestRoutesManager(App& app) asyncResp->res.jsonValue["SerialConsole"]["MaxConcurrentSessions"] = 15; asyncResp->res.jsonValue["SerialConsole"]["ConnectTypesSupported"] = nlohmann::json::array_t({"IPMI", "SSH"}); -#ifdef BMCWEB_ENABLE_KVM - // Fill in GraphicalConsole info - asyncResp->res.jsonValue["GraphicalConsole"]["ServiceEnabled"] = true; - asyncResp->res.jsonValue["GraphicalConsole"]["MaxConcurrentSessions"] = - 4; - asyncResp->res.jsonValue["GraphicalConsole"]["ConnectTypesSupported"] = - nlohmann::json::array_t({"KVMIP"}); -#endif // BMCWEB_ENABLE_KVM - if constexpr (!bmcwebEnableMultiHost) + if constexpr (BMCWEB_KVM) + { + // Fill in GraphicalConsole info + asyncResp->res.jsonValue["GraphicalConsole"]["ServiceEnabled"] = + true; + asyncResp->res + .jsonValue["GraphicalConsole"]["MaxConcurrentSessions"] = 4; + asyncResp->res + .jsonValue["GraphicalConsole"]["ConnectTypesSupported"] = + nlohmann::json::array_t({"KVMIP"}); + } + if constexpr (!BMCWEB_EXPERIMENTAL_REDFISH_MULTI_COMPUTER_SYSTEM) { asyncResp->res.jsonValue["Links"]["ManagerForServers@odata.count"] = 1; @@ -2031,10 +2034,11 @@ inline void requestRoutesManager(App& app) managerDiagnosticData["@odata.id"] = "/redfish/v1/Managers/bmc/ManagerDiagnosticData"; -#ifdef BMCWEB_ENABLE_REDFISH_OEM_MANAGER_FAN_DATA - auto pids = std::make_shared<GetPIDValues>(asyncResp); - pids->run(); -#endif + if constexpr (BMCWEB_REDFISH_OEM_MANAGER_FAN_DATA) + { + auto pids = std::make_shared<GetPIDValues>(asyncResp); + pids->run(); + } getMainChassisId(asyncResp, [](const std::string& chassisId, @@ -2217,36 +2221,39 @@ inline void requestRoutesManager(App& app) if (pidControllers || fanControllers || fanZones || stepwiseControllers || profile) { -#ifdef BMCWEB_ENABLE_REDFISH_OEM_MANAGER_FAN_DATA - std::vector< - std::pair<std::string, std::optional<nlohmann::json::object_t>>> - configuration; - if (pidControllers) - { - configuration.emplace_back("PidControllers", - std::move(pidControllers)); - } - if (fanControllers) - { - configuration.emplace_back("FanControllers", - std::move(fanControllers)); - } - if (fanZones) + if constexpr (BMCWEB_REDFISH_OEM_MANAGER_FAN_DATA) { - configuration.emplace_back("FanZones", std::move(fanZones)); + std::vector<std::pair<std::string, + std::optional<nlohmann::json::object_t>>> + configuration; + if (pidControllers) + { + configuration.emplace_back("PidControllers", + std::move(pidControllers)); + } + if (fanControllers) + { + configuration.emplace_back("FanControllers", + std::move(fanControllers)); + } + if (fanZones) + { + configuration.emplace_back("FanZones", std::move(fanZones)); + } + if (stepwiseControllers) + { + configuration.emplace_back("StepwiseControllers", + std::move(stepwiseControllers)); + } + auto pid = std::make_shared<SetPIDValues>( + asyncResp, std::move(configuration), profile); + pid->run(); } - if (stepwiseControllers) + else { - configuration.emplace_back("StepwiseControllers", - std::move(stepwiseControllers)); + messages::propertyUnknown(asyncResp->res, "Oem"); + return; } - auto pid = std::make_shared<SetPIDValues>( - asyncResp, std::move(configuration), profile); - pid->run(); -#else - messages::propertyUnknown(asyncResp->res, "Oem"); - return; -#endif } if (activeSoftwareImageOdataId) |