From 24f9747512490a812b44f30cb7e4a14e6d935742 Mon Sep 17 00:00:00 2001 From: Matt Spinler Date: Fri, 8 Sep 2023 11:23:17 -0500 Subject: 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 Change-Id: I07bb6523f60be0e56db5d85932da9193719c7406 --- .../p10bmc/ibm,everest_associations.json | 66 ---------------------- .../p10bmc/ibm,rainier-2u_associations.json | 38 ------------- .../p10bmc/ibm,rainier-4u_associations.json | 66 ---------------------- 3 files changed, 170 deletions(-) (limited to 'meta-ibm/recipes-phosphor/inventory') 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 @@ -287,24 +287,6 @@ "/xyz/openbmc_project/sensors/fan_tach/fan3_1" ] }, - { - "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": { @@ -418,18 +400,6 @@ "/xyz/openbmc_project/sensors/temperature/ps0_temp2" ] }, - { - "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": { @@ -486,18 +456,6 @@ "/xyz/openbmc_project/sensors/temperature/ps1_temp2" ] }, - { - "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": { @@ -554,18 +512,6 @@ "/xyz/openbmc_project/sensors/temperature/ps2_temp2" ] }, - { - "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": { @@ -622,18 +568,6 @@ "/xyz/openbmc_project/sensors/temperature/ps3_temp2" ] }, - { - "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": { 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 @@ -380,20 +380,6 @@ "/xyz/openbmc_project/sensors/fan_tach/fan5_1" ] }, - { - "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": { @@ -465,18 +451,6 @@ "/xyz/openbmc_project/sensors/temperature/ps0_temp2" ] }, - { - "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": { @@ -533,18 +507,6 @@ "/xyz/openbmc_project/sensors/temperature/ps1_temp2" ] }, - { - "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": { 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 @@ -382,24 +382,6 @@ "/xyz/openbmc_project/sensors/fan_tach/fan5_0" ] }, - { - "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": { @@ -471,18 +453,6 @@ "/xyz/openbmc_project/sensors/temperature/ps0_temp2" ] }, - { - "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": { @@ -539,18 +509,6 @@ "/xyz/openbmc_project/sensors/temperature/ps1_temp2" ] }, - { - "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": { @@ -607,18 +565,6 @@ "/xyz/openbmc_project/sensors/temperature/ps2_temp2" ] }, - { - "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": { @@ -675,18 +621,6 @@ "/xyz/openbmc_project/sensors/temperature/ps3_temp2" ] }, - { - "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": { -- cgit v1.2.3