diff options
| author | Matt Spinler <spinler@us.ibm.com> | 2022-02-05 01:21:59 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2022-02-07 23:58:53 +0300 |
| commit | ff916a657cf783752f0df985306f305f15cdb277 (patch) | |
| tree | 9a7d1009e65f9cc3772624ce7d3fee1cb0e79e83 /meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager | |
| parent | 2865b10bbfc59d8b928a82e558e0aa7048a3568e (diff) | |
| download | openbmc-ff916a657cf783752f0df985306f305f15cdb277.tar.xz | |
ibm:p10bmc: Add some sensor inventory assocs
Add the associations from the sensors on the panel and the sensors on
the motherboard to their parent FRUs in the inventory.
The chassis association isn't needed here because hwmontempsensor
already creates it.
The association will be used for sensor callouts.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: I4292646b0b101608f2bcd4c2d0f65e13f16d3d87
Diffstat (limited to 'meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager')
3 files changed, 106 insertions, 25 deletions
diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json index 8693e7d1d0..81ad07069a 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json @@ -1289,6 +1289,18 @@ [ "/xyz/openbmc_project/led/groups/planar_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/PCIE_0_Temp", + "/xyz/openbmc_project/sensors/temperature/PCIE_1_Temp" + ] } ] }, @@ -4344,33 +4356,48 @@ } ] }, - { + { "path": "system/chassis/motherboard/dasd_backplane/panel0", - "endpoints": - [ - { - "types": - { - "rType": "fault_inventory_object", - "fType": "fault_led_group" - }, - "paths": - [ + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ "/xyz/openbmc_project/led/groups/op_panel_base_fault" - ] - }, - { - "types": - { - "rType": "identify_inventory_object", - "fType": "identify_led_group" - }, - "paths": - [ + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ "/xyz/openbmc_project/led/groups/op_panel_base_identify" ] - } - ] + }, + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/Ambient_0_Temp", + "/xyz/openbmc_project/sensors/temperature/Ambient_1_Temp", + "/xyz/openbmc_project/sensors/temperature/Ambient_2_Temp", + "/xyz/openbmc_project/sensors/pressure/Station_Pressure", + "/xyz/openbmc_project/sensors/humidity/Relative_Humidity" + ] + } + ] } - ] -} + ] +} diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json index 2ea36bc672..9193d0f15f 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json @@ -442,6 +442,18 @@ [ "/xyz/openbmc_project/led/groups/planar_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/PCIE_0_Temp", + "/xyz/openbmc_project/sensors/temperature/PCIE_1_Temp" + ] } ] }, @@ -470,6 +482,21 @@ [ "/xyz/openbmc_project/led/groups/base_blyth_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/Ambient_0_Temp", + "/xyz/openbmc_project/sensors/temperature/Ambient_1_Temp", + "/xyz/openbmc_project/sensors/temperature/Ambient_2_Temp", + "/xyz/openbmc_project/sensors/pressure/Station_Pressure", + "/xyz/openbmc_project/sensors/humidity/Relative_Humidity" + ] } ] }, diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json index 6d9bc42f12..b08f1f3984 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json @@ -508,6 +508,18 @@ [ "/xyz/openbmc_project/led/groups/planar_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/PCIE_0_Temp", + "/xyz/openbmc_project/sensors/temperature/PCIE_1_Temp" + ] } ] }, @@ -536,6 +548,21 @@ [ "/xyz/openbmc_project/led/groups/base_blyth_identify" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/Ambient_0_Temp", + "/xyz/openbmc_project/sensors/temperature/Ambient_1_Temp", + "/xyz/openbmc_project/sensors/temperature/Ambient_2_Temp", + "/xyz/openbmc_project/sensors/pressure/Station_Pressure", + "/xyz/openbmc_project/sensors/humidity/Relative_Humidity" + ] } ] }, |