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>
diff --git a/configurations/2Ux8 Riser.json b/configurations/2Ux8 Riser.json
index 4b613d1..e861607 100644
--- a/configurations/2Ux8 Riser.json
+++ b/configurations/2Ux8 Riser.json
@@ -47,7 +47,13 @@
             }
         ],
         "name": "2Ux8 Riser 1",
-        "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL8RISER1', 'ADDRESS': '0x50'})"
+        "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL8RISER1', 'ADDRESS': '0x50'})",
+        "xyz.openbmc_project.Inventory.Decorator.Asset": {
+            "Manufacturer": "$BOARD_MANUFACTURER",
+            "Model": "$BOARD_PRODUCT_NAME",
+            "PartNumber": "$BOARD_PART_NUMBER",
+            "SerialNumber": "$BOARD_SERIAL_NUMBER"
+        }
     },
     {
         "exposes": [
@@ -97,6 +103,12 @@
             }
         ],
         "name": "2Ux8 Riser 2",
-        "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL8RISER2', 'ADDRESS': '0x51'})"
+        "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL8RISER2', '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