summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSunnySrivastava1984 <sunnsr25@in.ibm.com>2021-01-27 15:23:24 +0300
committerLakshmi Yadlapati <lakshmiy@us.ibm.com>2023-04-28 23:35:16 +0300
commit913e773241d66646eb7d292bc39e2067c08f11b1 (patch)
treeb1fc7ae13b005f458eeba7bca9c2198cdd62c2f9
parent727a046ccfa1d936ce984e30d6e257ea027ef587 (diff)
downloadbmcweb-913e773241d66646eb7d292bc39e2067c08f11b1.tar.xz
Add Asset information for PCIeDevice
This commit publishes inventory properties like SparePartNumber, Model, PartNumber, SerialNumber, Manufacturer for PCIe devices. Tested: Validator passed ``` "@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", "SparePartNumber": "03FL205" ``` Signed-off-by: Sunny Srivastava <sunnsr25@in.ibm.com> Change-Id: I850fe5eb2b3b3b9d47f4256ce0c4408bb1dd2bd1 Signed-off-by: Lakshmi Yadlapati <lakshmiy@us.ibm.com>
-rw-r--r--Redfish.md5
-rw-r--r--redfish-core/lib/pcie.hpp65
2 files changed, 70 insertions, 0 deletions
diff --git a/Redfish.md b/Redfish.md
index 65d405ff74..42039e2dca 100644
--- a/Redfish.md
+++ b/Redfish.md
@@ -837,6 +837,11 @@ other.
- Description
- Members
- Members@odata.count
+- Manufacturer
+- Model
+- PartNumber
+- SerialNumber
+- SparePartNumber
### /redfish/v1/Systems/system/PCIeDevices/{PCIeDevice}/
diff --git a/redfish-core/lib/pcie.hpp b/redfish-core/lib/pcie.hpp
index f38ab51267..a715acd016 100644
--- a/redfish-core/lib/pcie.hpp
+++ b/redfish-core/lib/pcie.hpp
@@ -223,6 +223,70 @@ inline std::optional<pcie_device::PCIeTypes>
return std::nullopt;
}
+inline void getPCIeDeviceAsset(const std::shared_ptr<bmcweb::AsyncResp>& aResp,
+ const std::string& pcieDevicePath,
+ const std::string& service)
+{
+ sdbusplus::asio::getAllProperties(
+ *crow::connections::systemBus, service, pcieDevicePath,
+ "xyz.openbmc_project.Inventory.Decorator.Asset",
+ [pcieDevicePath,
+ aResp{aResp}](const boost::system::error_code& ec,
+ const dbus::utility::DBusPropertiesMap& assetList) {
+ if (ec)
+ {
+ if (ec.value() != EBADR)
+ {
+ BMCWEB_LOG_ERROR << "DBUS response error for Properties"
+ << ec.value();
+ messages::internalError(aResp->res);
+ }
+ return;
+ }
+
+ const std::string* manufacturer = nullptr;
+ const std::string* model = nullptr;
+ const std::string* partNumber = nullptr;
+ const std::string* serialNumber = nullptr;
+ const std::string* sparePartNumber = nullptr;
+
+ const bool success = sdbusplus::unpackPropertiesNoThrow(
+ dbus_utils::UnpackErrorPrinter(), assetList, "Manufacturer",
+ manufacturer, "Model", model, "PartNumber", partNumber,
+ "SerialNumber", serialNumber, "SparePartNumber", sparePartNumber);
+
+ if (!success)
+ {
+ messages::internalError(aResp->res);
+ return;
+ }
+
+ if (manufacturer != nullptr)
+ {
+ aResp->res.jsonValue["Manufacturer"] = *manufacturer;
+ }
+ if (model != nullptr)
+ {
+ aResp->res.jsonValue["Model"] = *model;
+ }
+
+ if (partNumber != nullptr)
+ {
+ aResp->res.jsonValue["PartNumber"] = *partNumber;
+ }
+
+ if (serialNumber != nullptr)
+ {
+ aResp->res.jsonValue["SerialNumber"] = *serialNumber;
+ }
+
+ if (sparePartNumber != nullptr && !sparePartNumber->empty())
+ {
+ aResp->res.jsonValue["SparePartNumber"] = *sparePartNumber;
+ }
+ });
+}
+
inline void addPCIeDeviceProperties(
crow::Response& resp, const std::string& pcieDeviceId,
const dbus::utility::DBusPropertiesMap& pcieDevProperties)
@@ -341,6 +405,7 @@ inline void handlePCIeDeviceGet(App& app, const crow::Request& req,
[aResp, pcieDeviceId](const std::string& pcieDevicePath,
const std::string& service) {
addPCIeDeviceCommonProperties(aResp, pcieDeviceId);
+ getPCIeDeviceAsset(aResp, pcieDevicePath, service);
getPCIeDeviceProperties(
aResp, pcieDevicePath, service,
[aResp, pcieDeviceId](