tree a306e3c4bfede76cd941c2a73976ec370928715f
parent 1f427c2407f7451ae42eb69d4cbcb0e145a1e14d
author Shounak Mitra <shounak@google.com> 1666030070 +0000
committer Zhikui Ren <zhikui.ren@intel.com> 1677882667 +0000

dbus-sensors: Associate PSU sensors correctly

PSUSensors associate sensors with the inventory item that defined its
config in EM. It also needs to associate the sensor with the containing
chassis. Today, it associates the sensor with the object that defined
the config *and* with any all objects that implement Inventory.System.
In the situation where the sensor is defined in a PowerSupply
configuration, this works because the PowerSupply itself is not a
chassis. As a result, the "chassis" <-> "all_sensors" association
pointing to the power supply inventory object is ignored. However, if
the power supply is itself a chassis, this sensor is now associated with
at least two different chassis, which results in it showing up in two
different Redfish resources in bmcweb (the defining chassis and the
system chassis).

This change uses the defining object as the chassis if it is actually a
chassis or board (i.e. represented as a Redfish Chassis resource). If it
is not, it uses the system chassis. This will not work correctly if
there is more than one chassis which also implements Inventory.System,
but we presently assume that there is only one system in a number of
places. This should be fixed when we add support for multiple Systems.

Tested: Sensors on PSUs that are also chassis have a single "chassis"
association:

busctl get-property \
xyz.openbmc_project.PSUSensor \
/xyz/openbmc_project/sensors/power/hotswap_in_Input_Power \
xyz.openbmc_project.Association.Definitions Associations
a(sss) 2 "inventory" "sensors" "/xyz/openbmc_project/inventory/system/board/psu_chassis" "chassis" "all_sensors" "/xyz/openbmc_project/inventory/system/board/psu_chassis"

Changed PSU to PowerSupply type:
busctl get-property \
xyz.openbmc_project.PSUSensor \
/xyz/openbmc_project/sensors/power/hotswap_in_Input_Power \
xyz.openbmc_project.Association.Definitions Associations
a(sss) 2 "inventory" "sensors" "/xyz/openbmc_project/inventory/system/powersupply/psu_chassis" "chassis" "all_sensors" "/xyz/openbmc_project/inventory/system/board/mainboard"

Change-Id: I8a9e4191c427b441d96f0ab53ba59825eccee997
Signed-off-by: Shounak Mitra <shounak@google.com>