diff options
author | Matt Spinler <spinler@us.ibm.com> | 2023-09-08 19:23:17 +0300 |
---|---|---|
committer | Adriana Kobylak <anoo@linux.ibm.com> | 2023-09-13 00:00:13 +0300 |
commit | 24f9747512490a812b44f30cb7e4a14e6d935742 (patch) | |
tree | 8986997481852d21362bbff6dffd900a56154533 /meta-ibm/recipes-phosphor/inventory | |
parent | 8bf199c065ca59497bbb249bfbecf23f4c88255b (diff) | |
download | openbmc-24f9747512490a812b44f30cb7e4a14e6d935742.tar.xz |
meta-ibm: Remove PS input_history associations
On Rainier and Everest the code to put the power supply input history
maximum and average values on D-Bus is being removed and replaced with a
single peak input power sensor.
Remove the associations to them since they are no longer around.
Note: The associations for the new sensor will be handled by the
psu-monitor application.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: I07bb6523f60be0e56db5d85932da9193719c7406
Diffstat (limited to 'meta-ibm/recipes-phosphor/inventory')
3 files changed, 0 insertions, 170 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 dd197c1b8a..c4acef031b 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 @@ -290,24 +290,6 @@ { "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" }, @@ -421,18 +403,6 @@ { "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_identified_by", "fType": "fault_identifying" }, @@ -489,18 +459,6 @@ { "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_identified_by", "fType": "fault_identifying" }, @@ -557,18 +515,6 @@ { "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_identified_by", "fType": "fault_identifying" }, @@ -625,18 +571,6 @@ { "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_identified_by", "fType": "fault_identifying" }, 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 2b85f9deff..a43134ed9b 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 @@ -383,20 +383,6 @@ { "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" }, @@ -468,18 +454,6 @@ { "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_identified_by", "fType": "fault_identifying" }, @@ -536,18 +510,6 @@ { "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_identified_by", "fType": "fault_identifying" }, 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 a43ee5fa62..8ecb9e7015 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 @@ -385,24 +385,6 @@ { "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" }, @@ -474,18 +456,6 @@ { "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_identified_by", "fType": "fault_identifying" }, @@ -542,18 +512,6 @@ { "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_identified_by", "fType": "fault_identifying" }, @@ -610,18 +568,6 @@ { "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_identified_by", "fType": "fault_identifying" }, @@ -678,18 +624,6 @@ { "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_identified_by", "fType": "fault_identifying" }, |