From 9c525870b9bc81cb91455cd7b051fda83f686209 Mon Sep 17 00:00:00 2001 From: Matthew Barth Date: Wed, 12 Jun 2019 10:18:39 -0500 Subject: Make dbus monitor policies machine specific Policy configurations will be loaded by machine within the system meta layer (in this case meta-witherspoon). This allows different machines to have different policies and/or different policy configurations. The .bbappend can be used to alter which policies are used on a machine. The thought here being that most machines within the same system meta layer would use the same policies. However these policies would likely have different configurations, this is where each machine would have its own policy configuration which would be loaded per the policy recipe. Tested: Built witherspoon phosphor-dbus-monitor resulting in no image change Built swift phosphor-dbus-monitor where no polices exist now (From meta-ibm rev: 6275fda44b3fd1a039f6aef55e920b542b8135ef) Change-Id: I9c86e9eb15756236e1e802f18345fb8c7ab5400a Signed-off-by: Matthew Barth Signed-off-by: Brad Bishop --- .../power-supply-policy/power-supply-policy.yaml | 215 --------------------- 1 file changed, 215 deletions(-) delete mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/power/power-supply-policy/power-supply-policy.yaml (limited to 'meta-ibm/meta-witherspoon/recipes-phosphor/power/power-supply-policy/power-supply-policy.yaml') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-supply-policy/power-supply-policy.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-supply-policy/power-supply-policy.yaml deleted file mode 100644 index 20141c9c3..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-supply-policy/power-supply-policy.yaml +++ /dev/null @@ -1,215 +0,0 @@ -# Witherspoon power supply policy for PDM. -# -# Create an error if a power supply is removed while the system is powered on - -- name: power supply0 - class: group - group: path - members: - - meta: POWER SUPPLY - path: /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0 - -- name: power supply1 - class: group - group: path - members: - - meta: POWER SUPPLY - path: /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1 - -- name: power supplies - description: > - 'A Witherspoon has two power supplies to monitor.' - class: group - group: path - members: - - meta: POWER SUPPLY - path: /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0 - - meta: POWER SUPPLY - path: /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1 - -- name: chassis state - description: > - 'A Witherspoon has a single chassis to monitor.' - class: group - group: path - members: - - meta: CHASSISSTATE - path: /xyz/openbmc_project/state/chassis0 - -- name: power supply present - description: > - 'Monitor the presence state of each power supply.' - class: group - group: property - type: boolean - members: - - interface: xyz.openbmc_project.Inventory.Item - meta: PRESENT - property: Present - -- name: chassis powered - description: > - 'Monitor the chassis power state.' - class: group - group: property - type: string - members: - - interface: xyz.openbmc_project.State.Chassis - meta: CHASSIS_STATE - property: CurrentPowerState - -- name: watch power supply present - description: > - 'Trigger logic on power supply presence state changes.' - class: watch - watch: property - paths: power supplies - properties: power supply present - callback: check power - -- name: watch chassis state - description: > - 'Trigger logic on chassis power state changes.' - class: watch - watch: property - paths: chassis state - properties: chassis powered - callback: check power - -- name: check power - description: > - 'If the chassis has power, check for power supplies.' - class: condition - condition: count - paths: chassis state - properties: chassis powered - callback: check power supplies - countop: '>' - countbound: 0 - op: '==' - bound: xyz.openbmc_project.State.Chassis.PowerState.On - -- name: check power supplies - description: > - 'Create an error if a power supply is not present.' - class: callback - callback: group - members: - - check power supply0 presence - - check power supply1 presence - -- name: check power supply0 presence - description: > - 'If this condition passes power supply0 has been unplugged for more than - 5 seconds. Count present power supplies rather than non-present - power supplies since the latter would pass if the power supply has not - been created for some reason. - - For a more detailed definition of unplugged, consult the documentation - of xyz.openbmc_project.Inventory.Item and/or the documentation - of the power supply inventory object implementation.' - class: condition - condition: count - paths: power supply0 - properties: power supply present - defer: 5000000us - callback: notpresent power supply0 error - countop: '<' - countbound: 1 - op: '==' - bound: true - -- name: check power supply1 presence - description: > - 'If this condition passes power supply1 has been unplugged for more than - 5 seconds.' - class: condition - condition: count - paths: power supply1 - properties: power supply present - defer: 5000000us - callback: notpresent power supply1 error - countop: '<' - countbound: 1 - op: '==' - bound: true - -- name: notpresent power supply0 error - class: callback - callback: elog - paths: power supply0 - properties: power supply present - error: xyz::openbmc_project::Inventory::Error::NotPresent - metadata: - - name: xyz::openbmc_project::Inventory::NotPresent::CALLOUT_INVENTORY_PATH - value: /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0 - type: string - -- name: notpresent power supply1 error - class: callback - callback: elog - paths: power supply1 - properties: power supply present - error: xyz::openbmc_project::Inventory::Error::NotPresent - metadata: - - name: xyz::openbmc_project::Inventory::NotPresent::CALLOUT_INVENTORY_PATH - value: /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1 - type: string - -- name: resolve power supply0 errors if present - description: > - 'If power supply0 is present, call the resolve ps0 errors callback.' - class: condition - condition: count - paths: power supply0 - properties: power supply present - callback: resolve power supply0 errors - countop: '>' - countbound: 0 - op: '==' - bound: true - -- name: resolve power supply1 errors if present - description: > - 'If power supply1 is present, call the resolve ps1 errors callback.' - class: condition - condition: count - paths: power supply1 - properties: power supply present - callback: resolve power supply1 errors - countop: '>' - countbound: 0 - op: '==' - bound: true - -- name: resolve power supply0 errors - class: callback - callback: resolve callout - paths: power supply0 - properties: power supply present - callout: /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0 - -- name: resolve power supply1 errors - class: callback - callback: resolve callout - paths: power supply1 - properties: power supply present - callout: /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1 - -- name: watch power supply0 present for resolving error logs - description: > - 'On supply present state changes, check if errors need to be resolved.' - class: watch - watch: property - paths: power supply0 - properties: power supply present - callback: resolve power supply0 errors if present - -- name: watch power supply1 present for resolving error logs - description: > - 'On supply present state changes, check if errors need to be resolved.' - class: watch - watch: property - paths: power supply1 - properties: power supply present - callback: resolve power supply1 errors if present -- cgit v1.2.3