meta-ampere: redfish: remove Chassis chassis instance
The chassis instance when implementing sensor monitor using
dbus-sensor/entity-manager is /redfish/v1/Chassis/<name> where <name> is
defined from entity-manager configuration.
This commit removes /redfish/v1/Chassis/chassis which is redundant and
make incorrect link from other schema like ComputerSystem and BMC
Manager.
Tested:
1. Check no /redfish/v1/Chassis/chassis available.
2. Check all sensors are available in /redfish/v1/Chassis/Mt_Jade.
Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com>
Change-Id: I334a94bb65c3caa49d0bcb6ab03a42f7999728d5
diff --git a/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup.bb b/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup.bb
similarity index 100%
rename from meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup.bb
rename to meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup.bb
diff --git a/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml b/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml
similarity index 94%
rename from meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml
rename to meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml
index 3fa1908..23f54e3 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml
+++ b/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml
@@ -1,5 +1,5 @@
description: >
- Mt.Jade inventory fixups
+ Ampere inventory fixups
events:
- name: Add Chassis interface
diff --git a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json b/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json
deleted file mode 100644
index 5e535d5..0000000
--- a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json
+++ /dev/null
@@ -1,80 +0,0 @@
-[
- {
- "path": "system/chassis/motherboard/powersupply0",
- "endpoints":
- [
- {
- "types":
- {
- "rType": "inventory",
- "fType": "sensors"
- },
- "paths":
- [
- "/xyz/openbmc_project/sensors/fan_tach/PSU0_fan1",
- "/xyz/openbmc_project/sensors/temperature/PSU0_TEMP",
- "/xyz/openbmc_project/sensors/voltage/PSU0_VINPUT",
- "/xyz/openbmc_project/sensors/voltage/PSU0_VOUTPUT",
- "/xyz/openbmc_project/sensors/power/PSU0_PINPUT",
- "/xyz/openbmc_project/sensors/power/PSU0_POUTPUT",
- "/xyz/openbmc_project/sensors/current/PSU0_IINPUT",
- "/xyz/openbmc_project/sensors/current/PSU0_IOUTPUT"
- ]
- }
- ]
- },
- {
- "path": "system/chassis/motherboard/powersupply1",
- "endpoints":
- [
- {
- "types":
- {
- "rType": "inventory",
- "fType": "sensors"
- },
- "paths":
- [
- "/xyz/openbmc_project/sensors/fan_tach/PSU1_fan1",
- "/xyz/openbmc_project/sensors/temperature/PSU1_TEMP",
- "/xyz/openbmc_project/sensors/voltage/PSU1_VINPUT",
- "/xyz/openbmc_project/sensors/voltage/PSU1_VOUTPUT",
- "/xyz/openbmc_project/sensors/power/PSU1_PINPUT",
- "/xyz/openbmc_project/sensors/power/PSU1_POUTPUT",
- "/xyz/openbmc_project/sensors/current/PSU1_IINPUT",
- "/xyz/openbmc_project/sensors/current/PSU1_IOUTPUT"
- ]
- }
- ]
- },
- {
- "path": "system/chassis",
- "endpoints":
- [
- {
- "types":
- {
- "rType": "chassis",
- "fType": "all_sensors"
- },
- "paths":
- [
- "/xyz/openbmc_project/sensors/fan_tach/FAN3_1",
- "/xyz/openbmc_project/sensors/fan_tach/FAN3_2",
- "/xyz/openbmc_project/sensors/fan_tach/FAN4_1",
- "/xyz/openbmc_project/sensors/fan_tach/FAN4_2",
- "/xyz/openbmc_project/sensors/fan_tach/FAN5_1",
- "/xyz/openbmc_project/sensors/fan_tach/FAN5_2",
- "/xyz/openbmc_project/sensors/fan_tach/FAN6_1",
- "/xyz/openbmc_project/sensors/fan_tach/FAN6_2",
- "/xyz/openbmc_project/sensors/fan_tach/FAN7_1",
- "/xyz/openbmc_project/sensors/fan_tach/FAN7_2",
- "/xyz/openbmc_project/sensors/fan_tach/FAN8_1",
- "/xyz/openbmc_project/sensors/fan_tach/FAN8_2",
- "/xyz/openbmc_project/sensors/fan_tach/PSU0_fan1",
- "/xyz/openbmc_project/sensors/fan_tach/PSU1_fan1"
- ]
- }
- ]
- }
-]
diff --git a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
deleted file mode 100644
index ab30308..0000000
--- a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
-DEPENDS:append:mtjade = " inventory-cleanup"
-
-FILESEXTRAPATHS:prepend:mtjade := "${THISDIR}/${PN}:"
-PACKAGECONFIG:append:mtjade = " associations"
-SRC_URI:append:mtjade = " file://associations.json"
-
-do_install:append:mtjade() {
- install -d ${D}${base_datadir}
- install -m 0755 ${WORKDIR}/associations.json ${D}${base_datadir}
-}