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.hpp b/extensions/openpower-pels/data_interface.hpp
index dbc4874..396fc68 100644
--- a/extensions/openpower-pels/data_interface.hpp
+++ b/extensions/openpower-pels/data_interface.hpp
@@ -352,7 +352,7 @@
uint16_t node) const = 0;
/**
- * @brief Returns the inventory path for the FRU that the location
+ * @brief Returns the inventory paths for the FRU that the location
* code represents.
*
* @param[in] locationCode - If an expanded location code, then the
@@ -367,11 +367,11 @@
* @param[in] expanded - If the location code already has the relevent
* VPD fields embedded in it.
*
- * @return std::string - The inventory D-Bus object
+ * @return std::vector<std::string> - The inventory D-Bus objects
*/
- virtual std::string getInventoryFromLocCode(const std::string& LocationCode,
- uint16_t node,
- bool expanded) const = 0;
+ virtual std::vector<std::string>
+ getInventoryFromLocCode(const std::string& LocationCode, uint16_t node,
+ bool expanded) const = 0;
/**
* @brief Sets the Asserted property on the LED group passed in.
@@ -695,7 +695,7 @@
uint16_t node) const override;
/**
- * @brief Returns the inventory path for the FRU that the location
+ * @brief Returns the inventory paths for the FRU that the location
* code represents.
*
* @param[in] locationCode - If an expanded location code, then the
@@ -710,11 +710,11 @@
* @param[in] expanded - If the location code already has the relevent
* VPD fields embedded in it.
*
- * @return std::string - The inventory D-Bus object
+ * @return std::vector<std::string> - The inventory D-Bus objects
*/
- std::string getInventoryFromLocCode(const std::string& locationCode,
- uint16_t node,
- bool expanded) const override;
+ std::vector<std::string>
+ getInventoryFromLocCode(const std::string& locationCode, uint16_t node,
+ bool expanded) const override;
/**
* @brief Sets the Asserted property on the LED group passed in.