Add chassis association for total_power sensor
Currently all power and temperatures sensors have an all_sensors chassis
association.
The total system power sensor is used in bmcweb, but had the sensor path
hardcoded. To prevent users from having to hardcode the sensor path this
commit will add a total_power association to the chassis.
Tested on Rainier:
'''
a{sv} 1 "Associations" a(sss) 2 "chassis" "all_sensors" "/xyz/openbmc_project/inventory/system/chassis" "chassis" "total_power" "/xyz/openbmc_project/inventory/system/chassis"
as 1 "/xyz/openbmc_project/sensors/power/total_power"
d 366
'''
Change-Id: I11b82e439de6b9d7a9e9e46eee26bb5e22502283
Signed-off-by: Chris Cain <cjcain@us.ibm.com>
diff --git a/occ_manager.cpp b/occ_manager.cpp
index 308c67e..7823111 100644
--- a/occ_manager.cpp
+++ b/occ_manager.cpp
@@ -1186,7 +1186,7 @@
if (existingSensors.find(objectPath) == existingSensors.end())
{
dbus::OccDBusSensors::getOccDBus().setChassisAssociation(
- objectPath);
+ objectPath, {"all_sensors"});
}
existingSensors[objectPath] = occInstance;
@@ -1290,8 +1290,15 @@
if (existingSensors.find(sensorPath) == existingSensors.end())
{
+ std::vector<int> occs;
+ std::vector<std::string> fTypeList = {"all_sensors"};
+ if (iter->second == "total_power")
+ {
+ // Total system power has its own chassis association
+ fTypeList.push_back("total_power");
+ }
dbus::OccDBusSensors::getOccDBus().setChassisAssociation(
- sensorPath);
+ sensorPath, fTypeList);
}
existingSensors[sensorPath] = id;