diff options
author | Lakshmi Yadlapati <lakshmiy@us.ibm.com> | 2023-01-28 00:12:23 +0300 |
---|---|---|
committer | Lakshmi Yadlapati <lakshmiy@us.ibm.com> | 2023-02-16 06:39:36 +0300 |
commit | 53ffeca5ae50e522338b9e167e5840bf967a429b (patch) | |
tree | 5f4e08837165d30baad433297ce4a76e1f579c9e | |
parent | ee61a619da7f180a3148317d569d2dabd1cd9832 (diff) | |
download | bmcweb-53ffeca5ae50e522338b9e167e5840bf967a429b.tar.xz |
Add Location information for FabricAdapter
This commit is to add location information according to the Redfish
FabricAdapter schema. If the
`xyz.openbmc_project.Inventory.Decorator.LocationCode` interface does
not exist, the location information property is not displayed.
ref: http://redfish.dmtf.org/schemas/v1/FabricAdapter.v1_4_0.json
Tested: Validator passes
```
curl -k https://$bmc/redfish/v1/Systems/system/FabricAdapters/disk_backplane0
{
"@odata.id": "/redfish/v1/Systems/system/FabricAdapters/disk_backplane0",
"@odata.type": "#FabricAdapter.v1_4_0.FabricAdapter",
"Id": "disk_backplane0",
"Location": {
"PartLocation": {
"ServiceLabel": "U78DA.ND0.WZS0042-P1"
}
},
"Name": "Fabric Adapter"
}
```
Change-Id: I0dad37dce06e4727057d9821b5c40c71db004ee6
Signed-off-by: Lakshmi Yadlapati <lakshmiy@us.ibm.com>
-rw-r--r-- | Redfish.md | 2 | ||||
-rw-r--r-- | redfish-core/lib/fabric_adapters.hpp | 41 |
2 files changed, 38 insertions, 5 deletions
diff --git a/Redfish.md b/Redfish.md index 3739581c54..8d29ec0efb 100644 --- a/Redfish.md +++ b/Redfish.md @@ -676,6 +676,8 @@ other. #### FabricAdapter +- Location + ### /redfish/v1/Systems/system/LogServices/ #### LogServiceCollection diff --git a/redfish-core/lib/fabric_adapters.hpp b/redfish-core/lib/fabric_adapters.hpp index a1e273aae9..5cfd0b5a77 100644 --- a/redfish-core/lib/fabric_adapters.hpp +++ b/redfish-core/lib/fabric_adapters.hpp @@ -25,7 +25,7 @@ inline void handleAdapterError(const boost::system::error_code& ec, if (ec.value() == boost::system::errc::io_error) { - messages::resourceNotFound(res, "#FabricAdapter.v1_0_0.FabricAdapter", + messages::resourceNotFound(res, "#FabricAdapter.v1_4_0.FabricAdapter", adapterId); return; } @@ -34,18 +34,47 @@ inline void handleAdapterError(const boost::system::error_code& ec, messages::internalError(res); } +inline void + getFabricAdapterLocation(const std::shared_ptr<bmcweb::AsyncResp>& aResp, + const std::string& serviceName, + const std::string& fabricAdapterPath) +{ + sdbusplus::asio::getProperty<std::string>( + *crow::connections::systemBus, serviceName, fabricAdapterPath, + "xyz.openbmc_project.Inventory.Decorator.LocationCode", "LocationCode", + [aResp](const boost::system::error_code ec, + const std::string& property) { + if (ec) + { + if (ec.value() != EBADR) + { + BMCWEB_LOG_ERROR << "DBUS response error for Location"; + messages::internalError(aResp->res); + } + return; + } + + aResp->res.jsonValue["Location"]["PartLocation"]["ServiceLabel"] = + property; + }); +} + inline void doAdapterGet(const std::shared_ptr<bmcweb::AsyncResp>& aResp, const std::string& systemName, - const std::string& adapterId) + const std::string& adapterId, + const std::string& fabricAdapterPath, + const std::string& serviceName) { aResp->res.addHeader( boost::beast::http::field::link, "</redfish/v1/JsonSchemas/FabricAdapter/FabricAdapter.json>; rel=describedby"); - aResp->res.jsonValue["@odata.type"] = "#FabricAdapter.v1_0_0.FabricAdapter"; + aResp->res.jsonValue["@odata.type"] = "#FabricAdapter.v1_4_0.FabricAdapter"; aResp->res.jsonValue["Name"] = "Fabric Adapter"; aResp->res.jsonValue["Id"] = adapterId; aResp->res.jsonValue["@odata.id"] = crow::utility::urlFromPieces( "redfish", "v1", "Systems", systemName, "FabricAdapters", adapterId); + + getFabricAdapterLocation(aResp, serviceName, fabricAdapterPath); } inline bool checkFabricAdapterId(const std::string& adapterPath, @@ -107,8 +136,10 @@ inline void getValidFabricAdapterPath( adapterId, systemName, aResp, - [aResp, systemName, adapterId](const std::string&, const std::string&) { - doAdapterGet(aResp, systemName, adapterId); + [aResp, systemName, adapterId](const std::string& fabricAdapterPath, + const std::string& serviceName) { + doAdapterGet(aResp, systemName, adapterId, fabricAdapterPath, + serviceName); }); } |