PEL: Handle multiple inv paths per loc code
DataInterface::getInventoryFromLocCode() was only returning a single
inventory path from GetFRUsByExpandedLocationCode() even though multiple
paths may have been returned.
Mostly that was fine, except when a processor on a DCM was called out.
That would lead to only one processor on the DCM being set to not
functional by service_indicators.cpp, so on the web UI the actual CPU
called out may not have been marked as unhealthy (health status critical
in Redfish).
This commit changes getInventoryFromLocCode() to return all the paths
that GetFRUsByExpandedLocationCode() returns, and then makes the
corresponding changes in service_indicators.cpp to be able to handle
multiple inventory paths per location code when setting them to not
functional and creating a critical association.
The other code that was calling this function can just use the first
path returned, since in those cases it's just needed to get the VPD
information for the PEL, and all the paths would return the same info
anyway since they had the same location code.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: Ia16f50881e4a4f84c171ae20b7a99eddcc98ad4f
diff --git a/extensions/openpower-pels/data_interface.cpp b/extensions/openpower-pels/data_interface.cpp
index 0e31b0e..901fea3 100644
--- a/extensions/openpower-pels/data_interface.cpp
+++ b/extensions/openpower-pels/data_interface.cpp
@@ -500,7 +500,7 @@
return expandedLocationCode;
}
-std::string
+std::vector<std::string>
DataInterface::getInventoryFromLocCode(const std::string& locationCode,
uint16_t node, bool expanded) const
{
@@ -531,21 +531,13 @@
std::vector<sdbusplus::message::object_path> entries;
reply.read(entries);
- // Get the shortest entry from the paths received, as this
- // would be the path furthest up the inventory hierarchy so
- // would be the parent FRU. There is guaranteed to at least
- // be one entry if the call didn't fail.
- std::string shortest{entries[0]};
+ std::vector<std::string> paths;
+ // Note: The D-Bus method will fail if nothing found.
std::for_each(entries.begin(), entries.end(),
- [&shortest](const auto& path) {
- if (path.str.size() < shortest.size())
- {
- shortest = path;
- }
- });
+ [&paths](const auto& path) { paths.push_back(path); });
- return shortest;
+ return paths;
}
void DataInterface::assertLEDGroup(const std::string& ledGroup,