Remove PCIeInterface DeviceType
This code was added in 543f9a75a0819ca9e3541b2c48fe8b4d5cf6c4f7, which
in the description claimed to only be a refactor, but moved the
DeviceType record.
Because DeviceType is an enum in Redfish, and a string in PDI, some
amount of conversion is required, so this code can't be corrected
easily.
Remove the property for the moment.
Tested: Redfish Validator passes.
Change-Id: I60a68e45a69370112f454b1c520fde5b70ca8591
Signed-off-by: Ed Tanous <edtanous@google.com>
diff --git a/Redfish.md b/Redfish.md
index cd03a7c..3b5b7f8 100644
--- a/Redfish.md
+++ b/Redfish.md
@@ -879,7 +879,6 @@
- Model
- PartNumber
- PCIeInterface
- - DeviceType
- LanesInUse
- MaxLanes
- MaxPCIeType
diff --git a/redfish-core/lib/pcie.hpp b/redfish-core/lib/pcie.hpp
index 195ec87..e442c8e 100644
--- a/redfish-core/lib/pcie.hpp
+++ b/redfish-core/lib/pcie.hpp
@@ -416,16 +416,15 @@
const std::string& pcieDeviceId,
const dbus::utility::DBusPropertiesMap& pcieDevProperties)
{
- const std::string* deviceType = nullptr;
const std::string* generationInUse = nullptr;
const std::string* generationSupported = nullptr;
const size_t* lanesInUse = nullptr;
const size_t* maxLanes = nullptr;
const bool success = sdbusplus::unpackPropertiesNoThrow(
- dbus_utils::UnpackErrorPrinter(), pcieDevProperties, "DeviceType",
- deviceType, "GenerationInUse", generationInUse, "GenerationSupported",
- generationSupported, "LanesInUse", lanesInUse, "MaxLanes", maxLanes);
+ dbus_utils::UnpackErrorPrinter(), pcieDevProperties, "GenerationInUse",
+ generationInUse, "GenerationSupported", generationSupported,
+ "LanesInUse", lanesInUse, "MaxLanes", maxLanes);
if (!success)
{
@@ -433,11 +432,6 @@
return;
}
- if (deviceType != nullptr && !deviceType->empty())
- {
- asyncResp->res.jsonValue["PCIeInterface"]["DeviceType"] = *deviceType;
- }
-
if (generationInUse != nullptr)
{
std::optional<pcie_device::PCIeTypes> redfishGenerationInUse =