diff options
author | Brandon Wyman <bjwyman@gmail.com> | 2022-07-19 00:26:42 +0300 |
---|---|---|
committer | Adriana Kobylak <anoo@linux.ibm.com> | 2022-08-06 00:21:02 +0300 |
commit | 0806656254c02177d854d971ecf441257afb6d81 (patch) | |
tree | 11815ef71116617e1d6430626f6cc84ba3ecc39a /meta-ibm/recipes-phosphor | |
parent | f165a25304e28a7cbc315543f51a9ac8b7450fc2 (diff) | |
download | openbmc-0806656254c02177d854d971ecf441257afb6d81.tar.xz |
meta-ibm: Associations for input_history
The power supply INPUT_HISTORY is only supported on certain power
supplies. The power supplies that ship with Rainier 2S2U, Rainier 4U,
and Everest support the INPUT_HISTORY.
The MEX I/O drawer power supplies do not support INPUT_HISTORY.
Use associations from Rainier/Everest power supply inventory entries to
the input history aggregation interfaces to facilitate Redfish filtering
of PowerSupplyMetrics for input history.
Change-Id: I9afb2e57fefbf0cc10378bffe2efe4f4548920ca
Signed-off-by: Brandon Wyman <bjwyman@gmail.com>
Diffstat (limited to 'meta-ibm/recipes-phosphor')
3 files changed, 170 insertions, 0 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 7ad2c1a350..42aa5bca45 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 @@ -246,6 +246,24 @@ { "types": { + "rType": "chassis", + "fType": "input_history" + }, + "paths": + [ + "/org/open_power/sensors/aggregation/per_30s/powersupply0_input_power/average", + "/org/open_power/sensors/aggregation/per_30s/powersupply0_input_power/maximum", + "/org/open_power/sensors/aggregation/per_30s/powersupply1_input_power/average", + "/org/open_power/sensors/aggregation/per_30s/powersupply1_input_power/maximum", + "/org/open_power/sensors/aggregation/per_30s/powersupply2_input_power/average", + "/org/open_power/sensors/aggregation/per_30s/powersupply2_input_power/maximum", + "/org/open_power/sensors/aggregation/per_30s/powersupply3_input_power/average", + "/org/open_power/sensors/aggregation/per_30s/powersupply3_input_power/maximum" + ] + }, + { + "types": + { "rType": "inventory", "fType": "assembly" }, @@ -348,6 +366,18 @@ { "types": { + "rType": "inventory", + "fType": "input_history" + }, + "paths": + [ + "/org/open_power/sensors/aggregation/per_30s/powersupply0_input_power/average", + "/org/open_power/sensors/aggregation/per_30s/powersupply0_input_power/maximum" + ] + }, + { + "types": + { "rType": "fault_inventory_object", "fType": "fault_led_group" }, @@ -404,6 +434,18 @@ { "types": { + "rType": "inventory", + "fType": "input_history" + }, + "paths": + [ + "/org/open_power/sensors/aggregation/per_30s/powersupply1_input_power/average", + "/org/open_power/sensors/aggregation/per_30s/powersupply1_input_power/maximum" + ] + }, + { + "types": + { "rType": "fault_inventory_object", "fType": "fault_led_group" }, @@ -460,6 +502,18 @@ { "types": { + "rType": "inventory", + "fType": "input_history" + }, + "paths": + [ + "/org/open_power/sensors/aggregation/per_30s/powersupply2_input_power/average", + "/org/open_power/sensors/aggregation/per_30s/powersupply2_input_power/maximum" + ] + }, + { + "types": + { "rType": "fault_inventory_object", "fType": "fault_led_group" }, @@ -516,6 +570,18 @@ { "types": { + "rType": "inventory", + "fType": "input_history" + }, + "paths": + [ + "/org/open_power/sensors/aggregation/per_30s/powersupply3_input_power/average", + "/org/open_power/sensors/aggregation/per_30s/powersupply3_input_power/maximum" + ] + }, + { + "types": + { "rType": "fault_inventory_object", "fType": "fault_led_group" }, 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 6c474c52b7..7edcde5217 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 @@ -317,6 +317,20 @@ { "types": { + "rType": "chassis", + "fType": "input_history" + }, + "paths": + [ + "/org/open_power/sensors/aggregation/per_30s/powersupply0_input_power/average", + "/org/open_power/sensors/aggregation/per_30s/powersupply0_input_power/maximum", + "/org/open_power/sensors/aggregation/per_30s/powersupply1_input_power/average", + "/org/open_power/sensors/aggregation/per_30s/powersupply1_input_power/maximum" + ] + }, + { + "types": + { "rType": "inventory", "fType": "assembly" }, @@ -377,6 +391,18 @@ { "types": { + "rType": "inventory", + "fType": "input_history" + }, + "paths": + [ + "/org/open_power/sensors/aggregation/per_30s/powersupply0_input_power/average", + "/org/open_power/sensors/aggregation/per_30s/powersupply0_input_power/maximum" + ] + }, + { + "types": + { "rType": "fault_inventory_object", "fType": "fault_led_group" }, @@ -433,6 +459,18 @@ { "types": { + "rType": "inventory", + "fType": "input_history" + }, + "paths": + [ + "/org/open_power/sensors/aggregation/per_30s/powersupply1_input_power/average", + "/org/open_power/sensors/aggregation/per_30s/powersupply1_input_power/maximum" + ] + }, + { + "types": + { "rType": "fault_inventory_object", "fType": "fault_led_group" }, 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 5b407197ae..043b5210a4 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 @@ -319,6 +319,24 @@ { "types": { + "rType": "chassis", + "fType": "input_history" + }, + "paths": + [ + "/org/open_power/sensors/aggregation/per_30s/powersupply0_input_power/average", + "/org/open_power/sensors/aggregation/per_30s/powersupply0_input_power/maximum", + "/org/open_power/sensors/aggregation/per_30s/powersupply1_input_power/average", + "/org/open_power/sensors/aggregation/per_30s/powersupply1_input_power/maximum", + "/org/open_power/sensors/aggregation/per_30s/powersupply2_input_power/average", + "/org/open_power/sensors/aggregation/per_30s/powersupply2_input_power/maximum", + "/org/open_power/sensors/aggregation/per_30s/powersupply3_input_power/average", + "/org/open_power/sensors/aggregation/per_30s/powersupply3_input_power/maximum" + ] + }, + { + "types": + { "rType": "inventory", "fType": "assembly" }, @@ -379,6 +397,18 @@ { "types": { + "rType": "inventory", + "fType": "input_history" + }, + "paths": + [ + "/org/open_power/sensors/aggregation/per_30s/powersupply0_input_power/average", + "/org/open_power/sensors/aggregation/per_30s/powersupply0_input_power/maximum" + ] + }, + { + "types": + { "rType": "fault_inventory_object", "fType": "fault_led_group" }, @@ -435,6 +465,18 @@ { "types": { + "rType": "inventory", + "fType": "input_history" + }, + "paths": + [ + "/org/open_power/sensors/aggregation/per_30s/powersupply1_input_power/average", + "/org/open_power/sensors/aggregation/per_30s/powersupply1_input_power/maximum" + ] + }, + { + "types": + { "rType": "fault_inventory_object", "fType": "fault_led_group" }, @@ -491,6 +533,18 @@ { "types": { + "rType": "inventory", + "fType": "input_history" + }, + "paths": + [ + "/org/open_power/sensors/aggregation/per_30s/powersupply2_input_power/average", + "/org/open_power/sensors/aggregation/per_30s/powersupply2_input_power/maximum" + ] + }, + { + "types": + { "rType": "fault_inventory_object", "fType": "fault_led_group" }, @@ -547,6 +601,18 @@ { "types": { + "rType": "inventory", + "fType": "input_history" + }, + "paths": + [ + "/org/open_power/sensors/aggregation/per_30s/powersupply3_input_power/average", + "/org/open_power/sensors/aggregation/per_30s/powersupply3_input_power/maximum" + ] + }, + { + "types": + { "rType": "fault_inventory_object", "fType": "fault_led_group" }, |