commit 11be6676c0fbab66891d4f0d6c25b0b9e35b6e82
author James Feist <james.feist@linux.intel.com> Fri Apr 06 14:05:32 2018 -0700
committer James Feist <james.feist@linux.intel.com> Fri Jun 29 13:59:03 2018 -0700
tree c4d0da4cd7a7cc9e64c174986bade8ff89bbcfe6
parent b3e42fee7542e853aaa23846ba06d27259204208

Modify interfaces to match upstream

A dump of witherspoons inventory was done and many
inconsistancies were noticed, try to match as best as
possible. Also autoformat json.

Dump of data can be seen here: https://pastebin.com/NiC7kSMS

Change-Id: I1a99b426d84fdcd9231d1fbda0ed85ad748779f3
Signed-off-by: James Feist <james.feist@linux.intel.com>

configurations/F2U12X35S3P_riser.json

diff --git a/configurations/F2U12X35S3P_riser.json b/configurations/F2U12X35S3P_riser.json
index 365208f..0c6db3f 100644
--- a/configurations/F2U12X35S3P_riser.json
+++ b/configurations/F2U12X35S3P_riser.json
@@ -40,12 +40,14 @@
                 "type": "IntelFruDevice"
             }
         ],
-        "manufacturer": "$BOARD_MANUFACTURER",
-        "model": "$BOARD_PRODUCT_NAME",
         "name": "2U12x35 Riser1",
-        "part_number": "$BOARD_PART_NUMBER",
-        "serial_number": "$BOARD_SERIAL_NUMBER",
-        "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL16RISER\\d', 'ADDRESS' : '0x50'})"
+        "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL16RISER\\d', 'ADDRESS' : '0x50'})",
+        "xyz.openbmc_project.Inventory.Decorator.Asset": {
+            "Manufacturer": "$BOARD_MANUFACTURER",
+            "Model": "$BOARD_PRODUCT_NAME",
+            "PartNumber": "$BOARD_PART_NUMBER",
+            "SerialNumber": "$BOARD_SERIAL_NUMBER"
+        }
     },
     {
         "exposes": [
@@ -88,11 +90,13 @@
                 "type": "IntelFruDevice"
             }
         ],
-        "manufacturer": "$BOARD_MANUFACTURER",
-        "model": "$BOARD_PRODUCT_NAME",
         "name": "2U12x35 Riser2",
-        "serial_number": "$BOARD_SERIAL_NUMBER",
-        "part_number": "$BOARD_PART_NUMBER",
-        "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL16RISER\\d', 'ADDRESS' : '0x51'})"
+        "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL16RISER\\d', 'ADDRESS' : '0x51'})",
+        "xyz.openbmc_project.Inventory.Decorator.Asset": {
+            "Manufacturer": "$BOARD_MANUFACTURER",
+            "Model": "$BOARD_PRODUCT_NAME",
+            "PartNumber": "$BOARD_PART_NUMBER",
+            "SerialNumber": "$BOARD_SERIAL_NUMBER"
+        }
     }
 ]
\ No newline at end of file