diff options
Diffstat (limited to 'redfish-core')
| -rw-r--r-- | redfish-core/include/redfish.hpp | 2 | ||||
| -rw-r--r-- | redfish-core/lib/chassis.hpp | 4 | ||||
| -rw-r--r-- | redfish-core/lib/pcie.hpp | 5 |
3 files changed, 3 insertions, 8 deletions
diff --git a/redfish-core/include/redfish.hpp b/redfish-core/include/redfish.hpp index 55c00f6619..b7dd3b3d79 100644 --- a/redfish-core/include/redfish.hpp +++ b/redfish-core/include/redfish.hpp @@ -31,7 +31,6 @@ #include "../lib/metric_report_definition.hpp" #include "../lib/network_protocol.hpp" #include "../lib/pcie.hpp" -#include "../lib/pcie_slots.hpp" #include "../lib/power.hpp" #include "../lib/processor.hpp" #include "../lib/redfish_sessions.hpp" @@ -81,7 +80,6 @@ class RedfishService requestRoutesManagerResetAction(app); requestRoutesManagerResetActionInfo(app); requestRoutesManagerResetToDefaultsAction(app); - requestRoutesPCIeSlots(app); requestRoutesChassisCollection(app); requestRoutesChassis(app); requestRoutesChassisResetAction(app); diff --git a/redfish-core/lib/chassis.hpp b/redfish-core/lib/chassis.hpp index 11c04b4cd7..724d5f344c 100644 --- a/redfish-core/lib/chassis.hpp +++ b/redfish-core/lib/chassis.hpp @@ -397,10 +397,6 @@ inline void requestRoutesChassis(App& app) "/redfish/v1/Chassis/" + chassisId + "/Sensors"; asyncResp->res.jsonValue["Status"]["State"] = "Enabled"; - asyncResp->res.jsonValue["PCIeSlots"]["@odata.id"] = - crow::utility::urlFromPieces("redfish", "v1", "Chassis", - chassisId, "PCIeSlots"); - nlohmann::json::array_t computerSystems; nlohmann::json::object_t system; system["@odata.id"] = "/redfish/v1/Systems/system"; diff --git a/redfish-core/lib/pcie.hpp b/redfish-core/lib/pcie.hpp index 8437f501fc..b4d64332b5 100644 --- a/redfish-core/lib/pcie.hpp +++ b/redfish-core/lib/pcie.hpp @@ -129,8 +129,9 @@ inline std::optional<std::string> { return "Gen5"; } - if (generationInUse == - "xyz.openbmc_project.Inventory.Item.PCIeSlot.Generations.Unknown") + if (generationInUse.empty() || + generationInUse == + "xyz.openbmc_project.Inventory.Item.PCIeSlot.Generations.Unknown") { return ""; } |