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>
diff --git a/include/dbus_utility.hpp b/include/dbus_utility.hpp
index eac3099..e953a9f 100644
--- a/include/dbus_utility.hpp
+++ b/include/dbus_utility.hpp
@@ -18,7 +18,6 @@
#include "dbus_singleton.hpp"
#include <boost/system/error_code.hpp> // IWYU pragma: keep
-#include <sdbusplus/asio/property.hpp>
#include <sdbusplus/message/native_types.hpp>
#include <array>
@@ -95,7 +94,6 @@
std::vector<std::pair<std::string, std::vector<std::string>>>>>;
using MapperGetSubTreePathsResponse = std::vector<std::string>;
-using MapperEndPoints = std::vector<sdbusplus::message::object_path>;
inline void escapePathForDbus(std::string& path)
{
@@ -195,15 +193,5 @@
"xyz.openbmc_project.ObjectMapper", "GetObject", path, interfaces);
}
-inline void getAssociationEndPoints(
- const std::string& path,
- std::function<void(const boost::system::error_code&,
- const MapperEndPoints&)>&& callback)
-{
- sdbusplus::asio::getProperty<MapperEndPoints>(
- *crow::connections::systemBus, "xyz.openbmc_project.ObjectMapper", path,
- "xyz.openbmc_project.Association", "endpoints", std::move(callback));
-}
-
} // namespace utility
} // namespace dbus
diff --git a/redfish-core/include/utils/sw_utils.hpp b/redfish-core/include/utils/sw_utils.hpp
index ef21ff6..31c3ea3 100644
--- a/redfish-core/include/utils/sw_utils.hpp
+++ b/redfish-core/include/utils/sw_utils.hpp
@@ -47,11 +47,13 @@
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 @@
// 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())
{