From 28bcda4c2d559c5ff002615af7a115cc475309e7 Mon Sep 17 00:00:00 2001 From: George Liu Date: Tue, 17 Jan 2023 11:02:59 +0800 Subject: meta-ibm: p10bmc: Update the association between Fan and Chassis Per association document[1], add/update the association between Fan and Chassis. [1] https://github.com/openbmc/phosphor-dbus-interfaces/commit/d0aa13b446ee1738d53fb1e04341946f5b0b7616 Signed-off-by: George Liu Change-Id: I6c4d74b17fcfcbeb620832485928dcfd3460fc00 --- .../phosphor-inventory-manager/associations.json | 36 ++++++++++++ .../p10bmc/ibm,everest_associations.json | 44 +++++++++++++++ .../p10bmc/ibm,rainier-2u_associations.json | 66 ++++++++++++++++++++++ .../p10bmc/ibm,rainier-4u_associations.json | 66 ++++++++++++++++++++++ 4 files changed, 212 insertions(+) (limited to 'meta-ibm/recipes-phosphor') diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json index 4c49644a66..4997fb89fe 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json @@ -105,6 +105,15 @@ [ "/xyz/openbmc_project/led/physical/fan0" ] + }, + { + "types": { + "rType": "cooled_by", + "fType": "cooling" + }, + "paths": [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -134,6 +143,15 @@ [ "/xyz/openbmc_project/led/physical/fan1" ] + }, + { + "types": { + "rType": "cooled_by", + "fType": "cooling" + }, + "paths": [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -163,6 +181,15 @@ [ "/xyz/openbmc_project/led/physical/fan2" ] + }, + { + "types": { + "rType": "cooled_by", + "fType": "cooling" + }, + "paths": [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -192,6 +219,15 @@ [ "/xyz/openbmc_project/led/physical/fan3" ] + }, + { + "types": { + "rType": "cooled_by", + "fType": "cooling" + }, + "paths": [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json index 26ea6b2515..dc14eecfba 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json @@ -47,6 +47,17 @@ [ "/xyz/openbmc_project/led/groups/fan0_identify" ] + }, + { + "types": + { + "rType": "cooled_by", + "fType": "cooling" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -87,6 +98,17 @@ [ "/xyz/openbmc_project/led/groups/fan1_identify" ] + }, + { + "types": + { + "rType": "cooled_by", + "fType": "cooling" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -127,6 +149,17 @@ [ "/xyz/openbmc_project/led/groups/fan2_identify" ] + }, + { + "types": + { + "rType": "cooled_by", + "fType": "cooling" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -167,6 +200,17 @@ [ "/xyz/openbmc_project/led/groups/fan3_identify" ] + }, + { + "types": + { + "rType": "cooled_by", + "fType": "cooling" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json index a2d6bb3c0c..5d9e9ecf0b 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json @@ -48,6 +48,17 @@ [ "/xyz/openbmc_project/led/groups/fan0_identify" ] + }, + { + "types": + { + "rType": "cooled_by", + "fType": "cooling" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -88,6 +99,17 @@ [ "/xyz/openbmc_project/led/groups/fan1_identify" ] + }, + { + "types": + { + "rType": "cooled_by", + "fType": "cooling" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -128,6 +150,17 @@ [ "/xyz/openbmc_project/led/groups/fan2_identify" ] + }, + { + "types": + { + "rType": "cooled_by", + "fType": "cooling" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -168,6 +201,17 @@ [ "/xyz/openbmc_project/led/groups/fan3_identify" ] + }, + { + "types": + { + "rType": "cooled_by", + "fType": "cooling" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -208,6 +252,17 @@ [ "/xyz/openbmc_project/led/groups/fan4_identify" ] + }, + { + "types": + { + "rType": "cooled_by", + "fType": "cooling" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -248,6 +303,17 @@ [ "/xyz/openbmc_project/led/groups/fan5_identify" ] + }, + { + "types": + { + "rType": "cooled_by", + "fType": "cooling" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json index 42a59dd2b3..3841716c16 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json @@ -47,6 +47,17 @@ [ "/xyz/openbmc_project/led/groups/fan0_identify" ] + }, + { + "types": + { + "rType": "cooled_by", + "fType": "cooling" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -86,6 +97,17 @@ [ "/xyz/openbmc_project/led/groups/fan1_identify" ] + }, + { + "types": + { + "rType": "cooled_by", + "fType": "cooling" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -125,6 +147,17 @@ [ "/xyz/openbmc_project/led/groups/fan2_identify" ] + }, + { + "types": + { + "rType": "cooled_by", + "fType": "cooling" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -164,6 +197,17 @@ [ "/xyz/openbmc_project/led/groups/fan3_identify" ] + }, + { + "types": + { + "rType": "cooled_by", + "fType": "cooling" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -203,6 +247,17 @@ [ "/xyz/openbmc_project/led/groups/fan4_identify" ] + }, + { + "types": + { + "rType": "cooled_by", + "fType": "cooling" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, @@ -242,6 +297,17 @@ [ "/xyz/openbmc_project/led/groups/fan5_identify" ] + }, + { + "types": + { + "rType": "cooled_by", + "fType": "cooling" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis" + ] } ] }, -- cgit v1.2.3