Remove "Manufacturer" from PCIeDevice interface
Remove Manufacturer from the PCIeDevice's PCIeInterface and fix the
following Redfish validator error:
ERROR - Manufacturer not defined in Complex PCIeInterface
PCIeDevice.v1_3_0.PCIeInterface (check version, spelling and casing)
This error is because there is no ["PCIeInterface"]["Manufacturer"] at
https://redfish.dmtf.org/schemas/v1/PCIeDevice.v1_11_0.json.
"Manufacturer" is already part of the root PCIeDevice and is
implemented on line 219.
On the backend "Manufacturer" is already part of Asset interface so
remove it from PCIeDevice interface in peci-pcie and
phosphor-dbus-interface.
phosphor-dbus-interfaces commit:
https://gerrit.openbmc.org/c/openbmc/phosphor-dbus-interfaces/+/61738
peci-pcie commit:
https://gerrit.openbmc.org/c/openbmc/peci-pcie/+/62256
Tested:
```
curl -k https://$bmc/redfish/v1/Systems/system/PCIeDevices/pcie_card10
{
"@odata.id": "/redfish/v1/Systems/system/PCIeDevices/pcie_card10",
"@odata.type": "#PCIeDevice.v1_9_0.PCIeDevice",
"Id": "pcie_card10",
"Manufacturer": "",
"Model": "6B87",
"Name": "PCIe Device",
"PCIeFunctions": {
"@odata.id": "/redfish/v1/Systems/system/PCIeDevices/pcie_card10/PCIeFunctions"
},
"PCIeInterface": {
"LanesInUse": 16,
"PCIeType": "Gen4"
},
"PartNumber": "03FL204",
"SerialNumber": "YA31UF07200Z",
"Slot": {
"Location": {
"PartLocation": {
"ServiceLabel": "U78DA.ND0.WZS003T-P0-C10"
}
}
},
"SparePartNumber": "03FL205"
}
```
Change-Id: I860bf60f6fa3cc5d6b57f945d781e7dcafc17d7f
Signed-off-by: Lakshmi Yadlapati <lakshmiy@us.ibm.com>
diff --git a/redfish-core/lib/pcie.hpp b/redfish-core/lib/pcie.hpp
index 4ea2dbc..45625f7 100644
--- a/redfish-core/lib/pcie.hpp
+++ b/redfish-core/lib/pcie.hpp
@@ -285,7 +285,6 @@
crow::Response& resp, const std::string& pcieDeviceId,
const dbus::utility::DBusPropertiesMap& pcieDevProperties)
{
- const std::string* manufacturer = nullptr;
const std::string* deviceType = nullptr;
const std::string* generationInUse = nullptr;
const int64_t* lanesInUse = nullptr;
@@ -293,7 +292,7 @@
const bool success = sdbusplus::unpackPropertiesNoThrow(
dbus_utils::UnpackErrorPrinter(), pcieDevProperties, "DeviceType",
deviceType, "GenerationInUse", generationInUse, "LanesInUse",
- lanesInUse, "Manufacturer", manufacturer);
+ lanesInUse);
if (!success)
{
@@ -330,11 +329,6 @@
resp.jsonValue["PCIeInterface"]["LanesInUse"] = *lanesInUse;
}
- if (manufacturer != nullptr)
- {
- resp.jsonValue["PCIeInterface"]["Manufacturer"] = *manufacturer;
- }
-
resp.jsonValue["PCIeFunctions"]["@odata.id"] = crow::utility::urlFromPieces(
"redfish", "v1", "Systems", "system", "PCIeDevices", pcieDeviceId,
"PCIeFunctions");