diff options
author | Gunnar Mills <gmills@us.ibm.com> | 2023-02-10 23:21:55 +0300 |
---|---|---|
committer | Gunnar Mills <gmills@us.ibm.com> | 2023-02-10 23:54:52 +0300 |
commit | c6830d5f5ae53ea894fd034b0c4fa2e598fbf485 (patch) | |
tree | 3767907fccbc510cabdb72e1a3ad69187f6a64f8 /redfish-core/include/utils/sw_utils.hpp | |
parent | 7e0572f4c1bc5f13ee1a3bd40bb80bf6b9fbd751 (diff) | |
download | bmcweb-c6830d5f5ae53ea894fd034b0c4fa2e598fbf485.tar.xz |
Revert "Add the getAssociationEndPoints method"
This reverts commit 369ea3ffb0c76c33c7ccd0bbb0e8dcb0039cd285.
bmcweb bumps are failing romulus qemu CI tests.
This started with https://gerrit.openbmc.org/c/openbmc/openbmc/+/60786.
https://gerrit.openbmc.org/c/openbmc/openbmc/+/60756 passed.
Only 1 commit diff here.
The manager call is failing here:
```
curl -k -H "X-Auth-Token: $token" -X GET
https://${bmc}/redfish/v1/Managers/bmc
{
"@odata.id": "/redfish/v1/Managers/bmc",
"@odata.type": "#Manager.v1_14_0.Manager",
...
"UUID": "0623b376-dc4f-4a29-93e0-cc982bfb9aae",
"error": {
"@Message.ExtendedInfo": [
{
"@odata.type": "#Message.v1_1_1.Message",
"Message": "The request failed due to an internal service error.
The service is still operational.",
"MessageArgs": [],
"MessageId": "Base.1.13.0.InternalError",
"MessageSeverity": "Critical",
"Resolution": "Resubmit the request. If the problem persists,
consider resetting the service."
}
],
"code": "Base.1.13.0.InternalError",
"message": "The request failed due to an internal service error.
The service is still operational."
}
}
```
Let's get the bumps back to passing.
Change-Id: Ia27b1a5024b480786cc776c4ab9586bd75bf1242
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
Diffstat (limited to 'redfish-core/include/utils/sw_utils.hpp')
-rw-r--r-- | redfish-core/include/utils/sw_utils.hpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/redfish-core/include/utils/sw_utils.hpp b/redfish-core/include/utils/sw_utils.hpp index ef21ff643c..31c3ea38f6 100644 --- a/redfish-core/include/utils/sw_utils.hpp +++ b/redfish-core/include/utils/sw_utils.hpp @@ -47,11 +47,13 @@ inline void const bool populateLinkToImages) { // Used later to determine running (known on Redfish as active) Sw images - dbus::utility::getAssociationEndPoints( + sdbusplus::asio::getProperty<std::vector<std::string>>( + *crow::connections::systemBus, "xyz.openbmc_project.ObjectMapper", "/xyz/openbmc_project/software/functional", - [aResp, swVersionPurpose, activeVersionPropName, populateLinkToImages]( - const boost::system::error_code& ec, - const dbus::utility::MapperEndPoints& functionalSw) { + "xyz.openbmc_project.Association", "endpoints", + [aResp, swVersionPurpose, activeVersionPropName, + populateLinkToImages](const boost::system::error_code ec, + const std::vector<std::string>& functionalSw) { BMCWEB_LOG_DEBUG << "populateSoftwareInformation enter"; if (ec) { @@ -74,8 +76,9 @@ inline void // example functionalSw: // v as 2 "/xyz/openbmc_project/software/ace821ef" // "/xyz/openbmc_project/software/230fb078" - for (const auto& path : functionalSw) + for (const auto& sw : functionalSw) { + sdbusplus::message::object_path path(sw); std::string leaf = path.filename(); if (leaf.empty()) { |