From 010850992a430a5c8b0a9032b949705a13566988 Mon Sep 17 00:00:00 2001 From: Nikita Kosenkov Date: Tue, 5 Jul 2022 13:34:02 +0300 Subject: phosphor-inventory-manager: add fans --- .../recipes-phosphor/interfaces/bmcweb_%.bbappend | 2 - .../inventory/phosphor-inventory-manager-fans.bb | 18 --- .../phosphor-inventory-manager-fans/fans.yaml | 18 --- .../phosphor-inventory-manager/associations.json | 164 ++------------------- .../phosphor-inventory-manager_%.bbappend | 1 - 5 files changed, 11 insertions(+), 192 deletions(-) delete mode 100644 meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-fans.bb delete mode 100644 meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-fans/fans.yaml diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend index a6059ecb83..d8a89e5e41 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -1,8 +1,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" EXTRA_OEMESON += "\ - -Dredfish-allow-deprecated-power-thermal=disabled \ - -Dredfish-new-powersubsystem-thermalsubsystem=enabled \ -Dredfish-host-logger=enabled \ -Dredfish-dump-log=enabled \ -Dvm-nbdproxy=enabled \ diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-fans.bb b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-fans.bb deleted file mode 100644 index ac120e773e..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-fans.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Add Dimm interface for inventory manager" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit allarch -inherit phosphor-inventory-manager - -PROVIDES += "virtual/phosphor-inventory-manager-fans" -S = "${WORKDIR}" - -SRC_URI = "file://fans.yaml" - -do_install() { - install -D fans.yaml ${D}${base_datadir}/events.d/fans.yaml -} - -FILES:${PN} += "${base_datadir}/events.d/fans.yaml" diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-fans/fans.yaml b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-fans/fans.yaml deleted file mode 100644 index 1992b6e6f8..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-fans/fans.yaml +++ /dev/null @@ -1,18 +0,0 @@ -events: - - name: Add Fans interface - description: > - Add the fan interface on the fan inventory path - type: startup - actions: - - name: createObjects - objs: - /system/chassis/motherboard/fan0: - xyz.openbmc_project.Inventory.Item.Fan: - /system/chassis/motherboard/fan1: - xyz.openbmc_project.Inventory.Item.Fan: - /system/chassis/motherboard/fan2: - xyz.openbmc_project.Inventory.Item.Fan: - /system/chassis/motherboard/fan3: - xyz.openbmc_project.Inventory.Item.Fan: - /system/chassis/motherboard/fan4: - xyz.openbmc_project.Inventory.Item.Fan: diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json index 0f3ffa3d21..c6d20245a3 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json @@ -94,7 +94,7 @@ ] }, { - "path": "system/chassis/motherboard/fan0", + "path": "system/chassis/motherboard/fan", "endpoints": [ { @@ -105,150 +105,11 @@ }, "paths": [ - "/xyz/openbmc_project/sensors/fan_tach/fan0_0", - "/xyz/openbmc_project/sensors/fan_tach/fan0_1" - ] - }, - { - "types": - { - "rType": "inventory", - "fType": "leds" - }, - "paths": - [ - "/xyz/openbmc_project/led/physical/front_fan" - ] - }, - { - "types": - { - "rType": "fru", - "fType": "fault_led_group" - }, - "paths": - [ - "/xyz/openbmc_project/led/groups/fan0_fault" - ] - } - ] - }, - { - "path": "system/chassis/motherboard/fan1", - "endpoints": - [ - { - "types": - { - "rType": "inventory", - "fType": "sensors" - }, - "paths": - [ - "/xyz/openbmc_project/sensors/fan_tach/fan1_0", - "/xyz/openbmc_project/sensors/fan_tach/fan1_1" - ] - }, - { - "types": - { - "rType": "inventory", - "fType": "leds" - }, - "paths": - [ - "/xyz/openbmc_project/led/physical/front_fan" - ] - }, - { - "types": - { - "rType": "fru", - "fType": "fault_led_group" - }, - "paths": - [ - "/xyz/openbmc_project/led/groups/fan1_fault" - ] - } - ] - }, - { - "path": "system/chassis/motherboard/fan2", - "endpoints": - [ - { - "types": - { - "rType": "inventory", - "fType": "sensors" - }, - "paths": - [ - "/xyz/openbmc_project/sensors/fan_tach/fan2_0", - "/xyz/openbmc_project/sensors/fan_tach/fan2_1" - ] - }, - { - "types": - { - "rType": "inventory", - "fType": "leds" - }, - "paths": - [ - "/xyz/openbmc_project/led/physical/front_fan" - ] - }, - { - "types": - { - "rType": "fru", - "fType": "fault_led_group" - }, - "paths": - [ - "/xyz/openbmc_project/led/groups/fan2_fault" - ] - } - ] - }, - { - "path": "system/chassis/motherboard/fan3", - "endpoints": - [ - { - "types": - { - "rType": "inventory", - "fType": "sensors" - }, - "paths": - [ - "/xyz/openbmc_project/sensors/fan_tach/fan3_0", - "/xyz/openbmc_project/sensors/fan_tach/fan3_1" - ] - }, - { - "types": - { - "rType": "inventory", - "fType": "leds" - }, - "paths": - [ - "/xyz/openbmc_project/led/physical/front_fan" - ] - }, - { - "types": - { - "rType": "fru", - "fType": "fault_led_group" - }, - "paths": - [ - "/xyz/openbmc_project/led/groups/fan3_fault" + "/xyz/openbmc_project/sensors/fan_tach/CPU1_Fan", + "/xyz/openbmc_project/sensors/fan_tach/CPU2_Fan", + "/xyz/openbmc_project/sensors/fan_tach/System_Fan_1", + "/xyz/openbmc_project/sensors/fan_tach/System_Fan_2", + "/xyz/openbmc_project/sensors/fan_tach/System_Fan_3" ] } ] @@ -1813,14 +1674,11 @@ }, "paths": [ - "/xyz/openbmc_project/sensors/fan_tach/fan0_0", - "/xyz/openbmc_project/sensors/fan_tach/fan0_1", - "/xyz/openbmc_project/sensors/fan_tach/fan1_0", - "/xyz/openbmc_project/sensors/fan_tach/fan1_1", - "/xyz/openbmc_project/sensors/fan_tach/fan2_0", - "/xyz/openbmc_project/sensors/fan_tach/fan2_1", - "/xyz/openbmc_project/sensors/fan_tach/fan3_0", - "/xyz/openbmc_project/sensors/fan_tach/fan3_1", + "/xyz/openbmc_project/sensors/fan_tach/CPU1_Fan", + "/xyz/openbmc_project/sensors/fan_tach/CPU2_Fan", + "/xyz/openbmc_project/sensors/fan_tach/System_Fan_1", + "/xyz/openbmc_project/sensors/fan_tach/System_Fan_2", + "/xyz/openbmc_project/sensors/fan_tach/System_Fan_3", "/xyz/openbmc_project/sensors/temperature/p0_core0_temp", "/xyz/openbmc_project/sensors/temperature/p0_core1_temp", diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend index 2ac4350e7d..8bfe4bce64 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend @@ -6,7 +6,6 @@ DEPENDS += " phosphor-inventory-manager-chassis" DEPENDS += " phosphor-inventory-manager-motherboard" DEPENDS += " phosphor-inventory-manager-cpu" DEPENDS += " phosphor-inventory-manager-dimm" -DEPENDS += " phosphor-inventory-manager-fans" do_install:append() { install -d ${D}${base_datadir} -- cgit v1.2.3