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/PCIE SSD Retimer.json b/configurations/PCIE SSD Retimer.json
index bd88d88..79f6c13 100644
--- a/configurations/PCIE SSD Retimer.json
+++ b/configurations/PCIE SSD Retimer.json
@@ -13,10 +13,12 @@
             "type": "TMP75"
         }
     ],
-    "manufacturer": "$BOARD_MANUFACTURER",
-    "model": "$BOARD_PRODUCT_NAME",
     "name": "PCIE SSD Retimer",
-    "part_number": "$BOARD_PART_NUMBER",
-    "serial_number": "$BOARD_SERIAL_NUMBER",
-    "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'SP3RT040X16'})"
+    "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'SP3RT040X16'})",
+    "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