commit b1009646e7d2b5426ea3450bd9e51a570bab0f6c
author George Liu <liuxiwei@inspur.com> Tue Oct 01 15:25:06 2019 +0800
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Tue Oct 08 11:54:33 2019 -0400
tree b1104474b3faf2f21bd037a269b0f55fac72dd24
parent baf35b6ed3ffe0d7fcc08b16b4dd45e3a2c89f32

fp5280g2: Fix FRU property interfaces

Add a specific interface for the Cpu and Dimm`s FRU properties and find
all Cpu and Dimm`s paths below the `/xyz/openbmc_project/inventory` path
thought this interface.

Testd: Saw the addition of `xyz.openbmc_project.Inventory.Item.Cpu` or
`xyz.openbmc_project.Inventory.Item.Dimm` interfaces via the D-Bus command.
busctl introspect xyz.openbmc_project.Inventory.Manager
/system/chassis/motherboard/cpu*
or
busctl introspect xyz.openbmc_project.Inventory.Manager
/system/chassis/motherboard/dimm*.

(From meta-inspur rev: 65a4f861c7adbbbc6b4ab8308beaea1c8b4fab5f)

Signed-off-by: George Liu <liuxiwei@inspur.com>
Change-Id: I8d89316be4308d6eb57cf8899d44cc78df5a9b6d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru-properties.yaml

diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru-properties.yaml b/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru-properties.yaml
index a4eab8a..c444504 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru-properties.yaml
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru-properties.yaml
@@ -17,124 +17,124 @@
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Cpu:
         Present: 'true'
 /system/chassis/motherboard/cpu1:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Cpu:
         Present: 'true'
 /system/chassis/motherboard/dimm0:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm1:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm10:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm11:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm12:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm13:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm14:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm15:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm2:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm3:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm4:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm5:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm6:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm7:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm8:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'
 /system/chassis/motherboard/dimm9:
     xyz.openbmc_project.Inventory.Decorator.Cacheable:
         Cached: 'true'
     xyz.openbmc_project.Inventory.Decorator.Replaceable:
         FieldReplaceable: 'true'
-    xyz.openbmc_project.Inventory.Item:
+    xyz.openbmc_project.Inventory.Item.Dimm:
         Present: 'true'