From 6ce369f5eb01ee771561215bf42b9a0f6e09b643 Mon Sep 17 00:00:00 2001
From: George Liu <liuxiwei@inspur.com>
Date: Mon, 31 Oct 2022 15:15:56 +0800
Subject: meta-ibm: p10bmc: Update the association between PowerSupply and
 Chassis

Per association document[1], add/update the association between
PowerSupply and Chassis.

[1] https://github.com/openbmc/phosphor-dbus-interfaces/commit/11efbb3c856af9d760e2d27ff276090d7b3510d5

Signed-off-by: George Liu <liuxiwei@inspur.com>
Change-Id: Ia7e40b67c13f2900a4d91d7f911f47c15b12b6c5
---
 .../phosphor-inventory-manager/associations.json      | 19 ++++++++++++++++++-
 .../p10bmc/ibm,everest_associations.json              | 16 ++++++++--------
 .../p10bmc/ibm,rainier-2u_associations.json           |  8 ++++----
 .../p10bmc/ibm,rainier-4u_associations.json           | 16 ++++++++--------
 4 files changed, 38 insertions(+), 21 deletions(-)

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 accf38b18a..4c49644a66 100644
--- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json
+++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json
@@ -27,6 +27,15 @@
                 [
                     "/xyz/openbmc_project/led/physical/cffps1_69"
                 ]
+            },
+	    {
+                "types": {
+                    "rType": "powered_by",
+                    "fType": "powering"
+                },
+                "paths": [
+                    "/xyz/openbmc_project/inventory/system/chassis"
+                ]
             }
         ]
     },
@@ -58,8 +67,16 @@
                 [
                     "/xyz/openbmc_project/led/physical/cffps1_68"
                 ]
+            },
+            {
+                "types": {
+                    "rType": "powered_by",
+                    "fType": "powering"
+                },
+                "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 42aa5bca45..26ea6b2515 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
@@ -400,8 +400,8 @@
                 {
                     "types":
                     {
-                        "rType": "inventory",
-                        "fType": "chassis"
+                        "rType": "powered_by",
+                        "fType": "powering"
                     },
                     "paths":
                     [
@@ -468,8 +468,8 @@
                 {
                     "types":
                     {
-                        "rType": "inventory",
-                        "fType": "chassis"
+                        "rType": "powered_by",
+                        "fType": "powering"
                     },
                     "paths":
                     [
@@ -536,8 +536,8 @@
                 {
                     "types":
                     {
-                        "rType": "inventory",
-                        "fType": "chassis"
+                        "rType": "powered_by",
+                        "fType": "powering"
                     },
                     "paths":
                     [
@@ -604,8 +604,8 @@
                 {
                     "types":
                     {
-                        "rType": "inventory",
-                        "fType": "chassis"
+                        "rType": "powered_by",
+                        "fType": "powering"
                     },
                     "paths":
                     [
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 7edcde5217..a2d6bb3c0c 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
@@ -425,8 +425,8 @@
                 {
                     "types":
                     {
-                        "rType": "inventory",
-                        "fType": "chassis"
+                        "rType": "powered_by",
+                        "fType": "powering"
                     },
                     "paths":
                     [
@@ -493,8 +493,8 @@
                 {
                     "types":
                     {
-                        "rType": "inventory",
-                        "fType": "chassis"
+                        "rType": "powered_by",
+                        "fType": "powering"
                     },
                     "paths":
                     [
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 043b5210a4..42a59dd2b3 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
@@ -431,8 +431,8 @@
                 {
                     "types":
                     {
-                        "rType": "inventory",
-                        "fType": "chassis"
+                        "rType": "powered_by",
+                        "fType": "powering"
                     },
                     "paths":
                     [
@@ -499,8 +499,8 @@
                 {
                     "types":
                     {
-                        "rType": "inventory",
-                        "fType": "chassis"
+                        "rType": "powered_by",
+                        "fType": "powering"
                     },
                     "paths":
                     [
@@ -567,8 +567,8 @@
                 {
                     "types":
                     {
-                        "rType": "inventory",
-                        "fType": "chassis"
+                        "rType": "powered_by",
+                        "fType": "powering"
                     },
                     "paths":
                     [
@@ -635,8 +635,8 @@
                 {
                     "types":
                     {
-                        "rType": "inventory",
-                        "fType": "chassis"
+                        "rType": "powered_by",
+                        "fType": "powering"
                     },
                     "paths":
                     [
-- 
cgit v1.2.3