commit 380bb024e1139b141e97cafa18db828baefaa5da
author George Liu <liuxiwei@inspur.com> Thu Nov 10 08:31:25 2022 +0800
committer Patrick Williams <patrick@stwcx.xyz> Mon Nov 28 13:56:05 2022 +0000
tree ec5f3770ca7cacdf959029f5d678f911cc445ed5
parent 1a891d32437863796137a239bebbf2be2884ebf1

Fix the association between Item and PowerSupply

PowerSupply should be associated with an Item, instead of Chassis.

Signed-off-by: George Liu <liuxiwei@inspur.com>
Change-Id: If2e7dbea6f1cf0eb2e5984bb83bea252fd7f94cf

yaml/xyz/openbmc_project/Inventory/Item.interface.yaml

diff --git a/yaml/xyz/openbmc_project/Inventory/Item.interface.yaml b/yaml/xyz/openbmc_project/Inventory/Item.interface.yaml
index 8cc391d..44f8d8c 100644
--- a/yaml/xyz/openbmc_project/Inventory/Item.interface.yaml
+++ b/yaml/xyz/openbmc_project/Inventory/Item.interface.yaml
@@ -64,3 +64,11 @@
       reverse_name: fault_identifying
       required_endpoint_interfaces:
           - xyz.openbmc_project.Led.Group
+    - name: powered_by
+      description: >
+          Objects that implement Item can optionally implement the
+          'powered_by' association to provide a link to one or more
+          power supplies.
+      reverse_name: powering
+      required_endpoint_interfaces:
+          - xyz.openbmc_project.Inventory.Item.PowerSupply

yaml/xyz/openbmc_project/Inventory/Item/Chassis.interface.yaml

diff --git a/yaml/xyz/openbmc_project/Inventory/Item/Chassis.interface.yaml b/yaml/xyz/openbmc_project/Inventory/Item/Chassis.interface.yaml
index dd805ee..597ec4b 100644
--- a/yaml/xyz/openbmc_project/Inventory/Item/Chassis.interface.yaml
+++ b/yaml/xyz/openbmc_project/Inventory/Item/Chassis.interface.yaml
@@ -43,13 +43,3 @@
             description: >
                 A logical division or portion of a physical chassis that contains
                 multiple devices or systems that cannot be physically separated.
-
-associations:
-    - name: powered_by
-      description: >
-          Objects that implement Chassis can optionally implement the
-          'powered_by' association to provide a link to one or more
-          power supplies.
-      reverse_name: powering
-      required_endpoint_interfaces:
-          - xyz.openbmc_project.Inventory.Item.PowerSupply

yaml/xyz/openbmc_project/Inventory/Item/PowerSupply.interface.yaml

diff --git a/yaml/xyz/openbmc_project/Inventory/Item/PowerSupply.interface.yaml b/yaml/xyz/openbmc_project/Inventory/Item/PowerSupply.interface.yaml
index 0d77ef0..af38c92 100644
--- a/yaml/xyz/openbmc_project/Inventory/Item/PowerSupply.interface.yaml
+++ b/yaml/xyz/openbmc_project/Inventory/Item/PowerSupply.interface.yaml
@@ -5,7 +5,7 @@
     - name: powering
       description: >
           Objects that implement PowerSupply can optionally implement the
-          'powering' association to provide a link back to a Chassis.
+          'powering' association to provide a link back to a Item.
       reverse_name: powered_by
       required_endpoint_interfaces:
-          - xyz.openbmc_project.Inventory.Item.Chassis
+          - xyz.openbmc_project.Inventory.Item

yaml/xyz/openbmc_project/Inventory/Item/README.md

diff --git a/yaml/xyz/openbmc_project/Inventory/Item/README.md b/yaml/xyz/openbmc_project/Inventory/Item/README.md
index 5c87f24..b81d553 100644
--- a/yaml/xyz/openbmc_project/Inventory/Item/README.md
+++ b/yaml/xyz/openbmc_project/Inventory/Item/README.md
@@ -21,3 +21,4 @@
 * Sensor.Value and Bmc: [monitoring, monitored_by]
 * fan and item: [cooling, cooled_by]
 * led and item : [identifying, identified_by] [fault_identifying, fault_identified_by]
+* powerSupply and item : [powering, powered_by]