From 7e27b041d27dbe1abca753d74f82d9fc08f28021 Mon Sep 17 00:00:00 2001 From: Matthew Barth Date: Wed, 12 Jun 2019 10:07:05 -0500 Subject: Remove `witherspoon` from recipe file names Remove `witherspoon` from recipe file names, which includes the directory containing the policy configuration files. Tested: Built witherspoon phosphor-dbus-monitor resulting in no image change (From meta-ibm rev: c8562bc0066f8657d2fbb5c1962826e686a7f652) Change-Id: I7d7d247865bc2f8432e01a46caa43cc8770ae100 Signed-off-by: Matthew Barth Signed-off-by: Brad Bishop --- .../recipes-phosphor/power/power-supply-policy.bb | 17 ++ .../power-supply-policy/power-supply-policy.yaml | 215 +++++++++++++++++++++ .../power/witherspoon-power-supply-policy.bb | 17 -- .../power-supply-policy.yaml | 215 --------------------- 4 files changed, 232 insertions(+), 232 deletions(-) create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/power/power-supply-policy.bb create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/power/power-supply-policy/power-supply-policy.yaml delete mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy.bb delete mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy/power-supply-policy.yaml (limited to 'meta-ibm/meta-witherspoon/recipes-phosphor/power') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-supply-policy.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-supply-policy.bb new file mode 100644 index 0000000000..7746266913 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-supply-policy.bb @@ -0,0 +1,17 @@ +SUMMARY = "Power supply policy for Witherspoon" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + +inherit allarch +inherit phosphor-dbus-monitor + +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" + +SRC_URI += "file://power-supply-policy.yaml" + +do_install() { + install -D ${WORKDIR}/power-supply-policy.yaml ${D}${config_dir}/power-supply-policy.yaml +} + +FILES_${PN} += "${config_dir}/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 new file mode 100644 index 0000000000..20141c9c30 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-supply-policy/power-supply-policy.yaml @@ -0,0 +1,215 @@ +# 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 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy.bb deleted file mode 100644 index 7746266913..0000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Power supply policy for Witherspoon" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit allarch -inherit phosphor-dbus-monitor - -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" - -SRC_URI += "file://power-supply-policy.yaml" - -do_install() { - install -D ${WORKDIR}/power-supply-policy.yaml ${D}${config_dir}/power-supply-policy.yaml -} - -FILES_${PN} += "${config_dir}/power-supply-policy.yaml" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy/power-supply-policy.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy/power-supply-policy.yaml deleted file mode 100644 index 20141c9c30..0000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-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