diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2020-04-22 21:06:02 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-04-27 19:52:12 +0300 |
commit | e161514219e0dc8a957dabbb8529fb9fcac4e115 (patch) | |
tree | 5de46006517d690f5793eec41281d60611228ecd /meta-ibm/recipes-phosphor/inventory | |
parent | a3f54c8b8cbd50bc86efdc52cfb7d348d8c19d21 (diff) | |
download | openbmc-e161514219e0dc8a957dabbb8529fb9fcac4e115.tar.xz |
meta-ibm: move all meta-witherspoon metadata
The metadata common to all IBM systems is confusingly split between
meta-ibm and meta-witherspoon. Move everything to meta-ibm.
The meta-ibm README is re-written to more accurately reflect the scope
of the layer.
Allow the configuration samples (bblayers.conf.sample,
local.conf.sample) to be sourced from either meta-ibm or
meta-witherspoon until such a time that any workflows and tooling have
had the opportunity to move to meta-ibm.
(From meta-ibm rev: 6e05ef2e90b214eaf4e43ee7027bbbb1d8d09442)
Change-Id: I3ec890d5300f9649c974ea6b9dca93a2e8a889ab
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-ibm/recipes-phosphor/inventory')
5 files changed, 1702 insertions, 0 deletions
diff --git a/meta-ibm/recipes-phosphor/inventory/inventory-cleanup.bb b/meta-ibm/recipes-phosphor/inventory/inventory-cleanup.bb new file mode 100644 index 000000000..0c4b56f72 --- /dev/null +++ b/meta-ibm/recipes-phosphor/inventory/inventory-cleanup.bb @@ -0,0 +1,17 @@ +SUMMARY = "Copy the inventory cleanup yaml 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 + +S = "${WORKDIR}" + +SRC_URI = "file://inventory-cleanup.yaml" + +do_install() { + install -D inventory-cleanup.yaml ${D}${base_datadir}/events.d/inventory-cleanup.yaml +} + +FILES_${PN} += "${base_datadir}/events.d/inventory-cleanup.yaml" diff --git a/meta-ibm/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml b/meta-ibm/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml new file mode 100644 index 000000000..a2ff9d177 --- /dev/null +++ b/meta-ibm/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml @@ -0,0 +1,16 @@ +description: > + Swift inventory fixups + +events: + - name: Add Chassis interface + description: > + Add the chassis interface on the chassis inventory path + type: startup + actions: + - name: createObjects + objs: + /system/chassis: + xyz.openbmc_project.Inventory.Item.Chassis: + Type: + value: "RackMount" + type: string diff --git a/meta-ibm/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml b/meta-ibm/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml new file mode 100644 index 000000000..a363bda8d --- /dev/null +++ b/meta-ibm/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml @@ -0,0 +1,51 @@ +description: > + Witherspoon inventory fixups + +events: + - name: Remove power_supplies + description: > + Remove the deprecated 'power_supply' objects + type: startup + actions: + - name: destroyObjects + paths: + - /system/chassis/power_supply0 + - /system/chassis/power_supply1 + - /system/chassis/powersupply0 + - /system/chassis/powersupply1 + + - name: Remove fan1 + description: > + Remove all fan1 associated objects and have fan presence and + fan monitor create it based on cooling type. + type: startup + filters: + - name: propertyIs + service: xyz.openbmc_project.Inventory.Manager + path: /system/chassis + interface: xyz.openbmc_project.Inventory.Decorator.CoolingType + property: WaterCooled + value: + value: true + type: boolean + dbusMember: "sdbusplus::xyz::openbmc_project::Inventory::\ + Decorator::server::CoolingType" + actions: + - name: destroyObjects + paths: + - /system/chassis/motherboard/fan1/fan1_0 + - /system/chassis/motherboard/fan1/fan1_1 + - /system/chassis/motherboard/fan1 + + - name: Add Chassis interface + description: > + Add the chassis interface on the chassis inventory path + type: startup + actions: + - name: createObjects + objs: + /system/chassis: + xyz.openbmc_project.Inventory.Item.Chassis: + Type: + value: "RackMount" + type: string diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json new file mode 100644 index 000000000..accf38b18 --- /dev/null +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json @@ -0,0 +1,1607 @@ +[ + { + "path": "system/chassis/motherboard/powersupply0", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/power/ps0_input_power", + "/xyz/openbmc_project/sensors/voltage/ps0_input_voltage", + "/xyz/openbmc_project/sensors/current/ps0_output_current", + "/xyz/openbmc_project/sensors/voltage/ps0_output_voltage" + ] + }, + { + "types": + { + "rType": "inventory", + "fType": "leds" + }, + "paths": + [ + "/xyz/openbmc_project/led/physical/cffps1_69" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/powersupply1", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/power/ps1_input_power", + "/xyz/openbmc_project/sensors/voltage/ps1_input_voltage", + "/xyz/openbmc_project/sensors/current/ps1_output_current", + "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage" + ] + }, + { + "types": + { + "rType": "inventory", + "fType": "leds" + }, + "paths": + [ + "/xyz/openbmc_project/led/physical/cffps1_68" + ] + } + + ] + }, + { + "path": "system/chassis/motherboard/fan0", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "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/fan0" + ] + } + ] + }, + { + "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/fan1" + ] + } + ] + }, + { + "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/fan2" + ] + } + ] + }, + { + "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/fan3" + ] + } + ] + }, + { + "path": "system/chassis/motherboard", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/ambient", + "/xyz/openbmc_project/sensors/temperature/pcie", + + "/xyz/openbmc_project/sensors/voltage/p0_vdd_voltage", + "/xyz/openbmc_project/sensors/voltage/p0_vcs_voltage", + "/xyz/openbmc_project/sensors/voltage/p0_vddr_voltage", + "/xyz/openbmc_project/sensors/voltage/p0_vdn_voltage", + "/xyz/openbmc_project/sensors/voltage/p1_vcs_voltage", + "/xyz/openbmc_project/sensors/voltage/p1_vdd_voltage", + "/xyz/openbmc_project/sensors/voltage/p1_vddr_voltage", + "/xyz/openbmc_project/sensors/voltage/p1_vdn_voltage", + + "/xyz/openbmc_project/sensors/power/p0_vdd_power", + "/xyz/openbmc_project/sensors/power/p0_vcs_power", + "/xyz/openbmc_project/sensors/power/p0_vddr_power", + "/xyz/openbmc_project/sensors/power/p0_vdn_power", + "/xyz/openbmc_project/sensors/power/p1_vdd_power", + "/xyz/openbmc_project/sensors/power/p1_vcs_power", + "/xyz/openbmc_project/sensors/power/p1_vddr_power", + "/xyz/openbmc_project/sensors/power/p1_vdn_power", + + "/xyz/openbmc_project/sensors/temperature/p0_vddr_temp", + "/xyz/openbmc_project/sensors/temperature/p0_vcs_temp", + "/xyz/openbmc_project/sensors/temperature/p0_vdd_temp", + "/xyz/openbmc_project/sensors/temperature/p0_vdn_temp", + "/xyz/openbmc_project/sensors/temperature/p1_vddr_temp", + "/xyz/openbmc_project/sensors/temperature/p1_vcs_temp", + "/xyz/openbmc_project/sensors/temperature/p1_vdd_temp", + "/xyz/openbmc_project/sensors/temperature/p1_vdn_temp", + + "/xyz/openbmc_project/sensors/current/p0_vcs_current", + "/xyz/openbmc_project/sensors/current/p0_vddr_current", + "/xyz/openbmc_project/sensors/current/p0_vdd_current", + "/xyz/openbmc_project/sensors/current/p0_vdn_current", + "/xyz/openbmc_project/sensors/current/p1_vcs_current", + "/xyz/openbmc_project/sensors/current/p1_vddr_current", + "/xyz/openbmc_project/sensors/current/p1_vdd_current", + "/xyz/openbmc_project/sensors/current/p1_vdn_current", + + "/xyz/openbmc_project/sensors/power/fan_disk_power", + "/xyz/openbmc_project/sensors/power/io_power", + "/xyz/openbmc_project/sensors/power/total_power", + "/xyz/openbmc_project/sensors/power/p0_io_power", + "/xyz/openbmc_project/sensors/power/p0_mem_power", + "/xyz/openbmc_project/sensors/power/p0_power", + "/xyz/openbmc_project/sensors/power/p1_io_power", + "/xyz/openbmc_project/sensors/power/p1_mem_power", + "/xyz/openbmc_project/sensors/power/p1_power" + + ] + } + ] + }, + { + "path": "system/chassis/motherboard/gv100card0", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/gpu0_core_temp", + "/xyz/openbmc_project/sensors/temperature/gpu0_mem_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/gv100card1", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/gpu1_core_temp", + "/xyz/openbmc_project/sensors/temperature/gpu1_mem_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/gv100card2", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/gpu2_core_temp", + "/xyz/openbmc_project/sensors/temperature/gpu2_mem_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/gv100card3", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/gpu3_core_temp", + "/xyz/openbmc_project/sensors/temperature/gpu3_mem_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/gv100card4", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/gpu4_core_temp", + "/xyz/openbmc_project/sensors/temperature/gpu4_mem_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/gv100card5", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/gpu5_core_temp", + "/xyz/openbmc_project/sensors/temperature/gpu5_mem_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core0", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core0_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core1", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core1_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core2", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core2_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core3", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core3_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core4", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core4_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core5", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core5_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core6", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core6_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core7", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core7_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core8", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core8_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core9", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core9_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core10", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core10_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core11", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core11_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core12", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core12_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core13", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core13_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core14", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core14_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core15", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core15_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core16", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core16_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core17", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core17_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core18", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core18_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core19", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core19_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core20", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core20_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core21", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core21_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core22", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core22_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu0/core23", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p0_core23_temp" + ] + } + ] + }, + + { + "path": "system/chassis/motherboard/cpu1/core0", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core0_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core1", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core1_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core2", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core2_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core3", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core3_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core4", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core4_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core5", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core5_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core6", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core6_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core7", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core7_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core8", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core8_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core9", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core9_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core10", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core10_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core11", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core11_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core12", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core12_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core13", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core13_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core14", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core14_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core15", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core15_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core16", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core16_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core17", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core17_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core18", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core18_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core19", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core19_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core20", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core20_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core21", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core21_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core22", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core22_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/cpu1/core23", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/p1_core23_temp" + ] + } + ] + }, + + { + "path": "system/chassis/motherboard/dimm0", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm0_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm1", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm1_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm2", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm2_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm3", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm3_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm4", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm4_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm5", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm5_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm6", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm6_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm7", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm7_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm8", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm8_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm9", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm9_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm10", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm10_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm11", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm11_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm12", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm12_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm13", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm13_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm14", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm14_temp" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm15", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/temperature/dimm15_temp" + ] + } + ] + }, + { + "path": "system/chassis", + "endpoints": + [ + { + "types": + { + "rType": "chassis", + "fType": "all_sensors" + }, + "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/temperature/ambient", + "/xyz/openbmc_project/sensors/temperature/pcie", + + "/xyz/openbmc_project/sensors/temperature/gpu0_core_temp", + "/xyz/openbmc_project/sensors/temperature/gpu0_mem_temp", + "/xyz/openbmc_project/sensors/temperature/gpu1_core_temp", + "/xyz/openbmc_project/sensors/temperature/gpu1_mem_temp", + "/xyz/openbmc_project/sensors/temperature/gpu2_core_temp", + "/xyz/openbmc_project/sensors/temperature/gpu2_mem_temp", + "/xyz/openbmc_project/sensors/temperature/gpu3_core_temp", + "/xyz/openbmc_project/sensors/temperature/gpu3_mem_temp", + "/xyz/openbmc_project/sensors/temperature/gpu4_core_temp", + "/xyz/openbmc_project/sensors/temperature/gpu4_mem_temp", + "/xyz/openbmc_project/sensors/temperature/gpu5_core_temp", + "/xyz/openbmc_project/sensors/temperature/gpu5_mem_temp", + + "/xyz/openbmc_project/sensors/temperature/p0_core0_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core1_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core2_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core3_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core4_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core5_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core6_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core7_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core8_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core9_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core10_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core11_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core12_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core13_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core14_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core15_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core16_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core17_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core18_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core19_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core20_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core21_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core22_temp", + "/xyz/openbmc_project/sensors/temperature/p0_core23_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core0_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core1_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core2_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core3_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core4_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core5_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core6_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core7_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core8_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core9_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core10_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core11_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core12_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core13_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core14_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core15_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core16_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core17_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core18_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core19_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core20_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core21_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core22_temp", + "/xyz/openbmc_project/sensors/temperature/p1_core23_temp", + + "/xyz/openbmc_project/sensors/temperature/dimm0_temp", + "/xyz/openbmc_project/sensors/temperature/dimm1_temp", + "/xyz/openbmc_project/sensors/temperature/dimm2_temp", + "/xyz/openbmc_project/sensors/temperature/dimm3_temp", + "/xyz/openbmc_project/sensors/temperature/dimm4_temp", + "/xyz/openbmc_project/sensors/temperature/dimm5_temp", + "/xyz/openbmc_project/sensors/temperature/dimm6_temp", + "/xyz/openbmc_project/sensors/temperature/dimm7_temp", + "/xyz/openbmc_project/sensors/temperature/dimm8_temp", + "/xyz/openbmc_project/sensors/temperature/dimm9_temp", + "/xyz/openbmc_project/sensors/temperature/dimm10_temp", + "/xyz/openbmc_project/sensors/temperature/dimm11_temp", + "/xyz/openbmc_project/sensors/temperature/dimm12_temp", + "/xyz/openbmc_project/sensors/temperature/dimm13_temp", + "/xyz/openbmc_project/sensors/temperature/dimm14_temp", + "/xyz/openbmc_project/sensors/temperature/dimm15_temp", + + "/xyz/openbmc_project/sensors/voltage/p0_vdd_voltage", + "/xyz/openbmc_project/sensors/voltage/p0_vcs_voltage", + "/xyz/openbmc_project/sensors/voltage/p0_vddr_voltage", + "/xyz/openbmc_project/sensors/voltage/p0_vdn_voltage", + "/xyz/openbmc_project/sensors/voltage/p1_vcs_voltage", + "/xyz/openbmc_project/sensors/voltage/p1_vdd_voltage", + "/xyz/openbmc_project/sensors/voltage/p1_vddr_voltage", + "/xyz/openbmc_project/sensors/voltage/p1_vdn_voltage", + + "/xyz/openbmc_project/sensors/power/p0_vdd_power", + "/xyz/openbmc_project/sensors/power/p0_vcs_power", + "/xyz/openbmc_project/sensors/power/p0_vddr_power", + "/xyz/openbmc_project/sensors/power/p0_vdn_power", + "/xyz/openbmc_project/sensors/power/p1_vdd_power", + "/xyz/openbmc_project/sensors/power/p1_vcs_power", + "/xyz/openbmc_project/sensors/power/p1_vddr_power", + "/xyz/openbmc_project/sensors/power/p1_vdn_power", + + "/xyz/openbmc_project/sensors/temperature/p0_vcs_temp", + "/xyz/openbmc_project/sensors/temperature/p0_vddr_temp", + "/xyz/openbmc_project/sensors/temperature/p0_vdd_temp", + "/xyz/openbmc_project/sensors/temperature/p0_vdn_temp", + "/xyz/openbmc_project/sensors/temperature/p1_vcs_temp", + "/xyz/openbmc_project/sensors/temperature/p1_vddr_temp", + "/xyz/openbmc_project/sensors/temperature/p1_vdd_temp", + "/xyz/openbmc_project/sensors/temperature/p1_vdn_temp", + + "/xyz/openbmc_project/sensors/current/p0_vcs_current", + "/xyz/openbmc_project/sensors/current/p0_vddr_current", + "/xyz/openbmc_project/sensors/current/p0_vdd_current", + "/xyz/openbmc_project/sensors/current/p0_vdn_current", + "/xyz/openbmc_project/sensors/current/p1_vcs_current", + "/xyz/openbmc_project/sensors/current/p1_vddr_current", + "/xyz/openbmc_project/sensors/current/p1_vdd_current", + "/xyz/openbmc_project/sensors/current/p1_vdn_current", + + "/xyz/openbmc_project/sensors/power/fan_disk_power", + "/xyz/openbmc_project/sensors/power/io_power", + "/xyz/openbmc_project/sensors/power/total_power", + "/xyz/openbmc_project/sensors/power/p0_io_power", + "/xyz/openbmc_project/sensors/power/p0_mem_power", + "/xyz/openbmc_project/sensors/power/p0_power", + "/xyz/openbmc_project/sensors/power/p1_io_power", + "/xyz/openbmc_project/sensors/power/p1_mem_power", + "/xyz/openbmc_project/sensors/power/p1_power", + + "/xyz/openbmc_project/sensors/voltage/ps0_input_voltage", + "/xyz/openbmc_project/sensors/voltage/ps0_output_voltage", + "/xyz/openbmc_project/sensors/voltage/ps1_input_voltage", + "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage", + + "/xyz/openbmc_project/sensors/power/ps0_input_power", + "/xyz/openbmc_project/sensors/power/ps1_input_power", + + "/xyz/openbmc_project/sensors/current/ps0_output_current", + "/xyz/openbmc_project/sensors/current/ps1_output_current" + ] + } + ] + } +] diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend new file mode 100644 index 000000000..bdc3912d5 --- /dev/null +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend @@ -0,0 +1,11 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +PACKAGECONFIG_append_ibm-ac-server = " associations" +SRC_URI_append_ibm-ac-server = " file://associations.json" + + +DEPENDS_append_ibm-ac-server = " inventory-cleanup" + +do_install_append_ibm-ac-server() { + install -d ${D}${base_datadir} + install -m 0755 ${WORKDIR}/associations.json ${D}${base_datadir}/associations.json +} |