commit 1274c434b557a4448951382e861af0117967209a
author Ratan Gupta <ratagupt@in.ibm.com> Wed Jan 24 17:39:09 2018 +0530
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Wed Feb 14 20:54:23 2018 +0000
tree e0a276ba1ae736252aae625f413a2c69e53d1699
parent dcbf91f86feab5805259374d31c6d13d2e07aa0e

FRU: Add Entity ID in the host FRU inventory yaml

This commit also adds the entityID and entityInstance property
for BMC FRUS config yaml.

These attributes are required to pass it through Get SDR command.
Currently we support two types of record format through Get SDR
1) FULL Record.
2) FRU Record.

Resolves openbmc/openbmc#2823

Change-Id: Ie7424fbc493dde5070a2c65c74ba83565154b9d4
Signed-off-by: Ratan Gupta <ratagupt@in.ibm.com>

meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map/config.yaml

diff --git a/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map/config.yaml b/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map/config.yaml
index 8abef27..8b32bd0 100644
--- a/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map/config.yaml
+++ b/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map/config.yaml
@@ -1,49 +1,54 @@
 1:
   /system/chassis/motherboard/cpu0:
-    xyz.openbmc_project.Inventory.Decorator.Revision:
-      Version:
-        IPMIFruProperty: Custom Field 2
-        IPMIFruSection: Board
-        IPMIFruValueDelimiter: 58
-    xyz.openbmc_project.Inventory.Decorator.Asset:
-      BuildDate:
-        IPMIFruProperty: Mfg Date
-        IPMIFruSection: Board
-      PartNumber:
-        IPMIFruProperty: Part Number
-        IPMIFruSection: Board
-      Manufacturer:
-        IPMIFruProperty: Manufacturer
-        IPMIFruSection: Board
-      SerialNumber:
-        IPMIFruProperty: Serial Number
-        IPMIFruSection: Board
-    xyz.openbmc_project.Inventory.Item:
-      PrettyName:
-        IPMIFruProperty: Name
-        IPMIFruSection: Board
+    entityID: 3
+    entityInstance: 1
+    interfaces:
+      xyz.openbmc_project.Inventory.Decorator.Revision:
+        Version:
+          IPMIFruProperty: Custom Field 2
+          IPMIFruSection: Board
+          IPMIFruValueDelimiter: 58
+      xyz.openbmc_project.Inventory.Decorator.Asset:
+        BuildDate:
+          IPMIFruProperty: Mfg Date
+          IPMIFruSection: Board
+        PartNumber:
+          IPMIFruProperty: Part Number
+          IPMIFruSection: Board
+        Manufacturer:
+          IPMIFruProperty: Manufacturer
+          IPMIFruSection: Board
+        SerialNumber:
+          IPMIFruProperty: Serial Number
+          IPMIFruSection: Board
+      xyz.openbmc_project.Inventory.Item:
+        PrettyName:
+          IPMIFruProperty: Name
+          IPMIFruSection: Board
 2:
   /system/chassis/motherboard/cpu1:
-    xyz.openbmc_project.Inventory.Decorator.Revision:
-      Version:
-        IPMIFruProperty: Custom Field 2
-        IPMIFruSection: Board
-        IPMIFruValueDelimiter: 58
-    xyz.openbmc_project.Inventory.Decorator.Asset:
-      BuildDate:
-        IPMIFruProperty: Mfg Date
-        IPMIFruSection: Board
-      PartNumber:
-        IPMIFruProperty: Part Number
-        IPMIFruSection: Board
-      Manufacturer:
-        IPMIFruProperty: Manufacturer
-        IPMIFruSection: Board
-      SerialNumber:
-        IPMIFruProperty: Serial Number
-        IPMIFruSection: Board
-    xyz.openbmc_project.Inventory.Item:
-      PrettyName:
-        IPMIFruProperty: Name
-        IPMIFruSection: Board
-        Value: False
+    entityID: 3
+    entityInstance: 2
+    interfaces:
+      xyz.openbmc_project.Inventory.Decorator.Revision:
+        Version:
+          IPMIFruProperty: Custom Field 2
+          IPMIFruSection: Board
+          IPMIFruValueDelimiter: 58
+      xyz.openbmc_project.Inventory.Decorator.Asset:
+        BuildDate:
+          IPMIFruProperty: Mfg Date
+          IPMIFruSection: Board
+        PartNumber:
+          IPMIFruProperty: Part Number
+          IPMIFruSection: Board
+        Manufacturer:
+          IPMIFruProperty: Manufacturer
+          IPMIFruSection: Board
+        SerialNumber:
+          IPMIFruProperty: Serial Number
+          IPMIFruSection: Board
+      xyz.openbmc_project.Inventory.Item:
+        PrettyName:
+          IPMIFruProperty: Name
+          IPMIFruSection: Board