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/Delta DPS-750XB PSU.json b/configurations/Delta DPS-750XB PSU.json
index 541371f..62639da 100644
--- a/configurations/Delta DPS-750XB PSU.json
+++ b/configurations/Delta DPS-750XB PSU.json
@@ -14,11 +14,15 @@
                 "type": "IntelFruDevice"
             }
         ],
-        "manufacturer": "$BOARD_MANUFACTURER",
-        "model": "$BOARD_PRODUCT_NAME",
-        "name": "Delta DPS-750XB PSU",
-        "part_number": "$BOARD_PART_NUMBER",
-        "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'DPS-750XB A', 'ADDRESS': '0x51'})"
+        "name": "Delta DPS-750XB PSU 2",
+        "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'DPS-750XB A', 'ADDRESS': '0x51'})",
+        "type": "PowerSupply",
+        "xyz.openbmc_project.Inventory.Decorator.Asset": {
+            "Manufacturer": "$BOARD_MANUFACTURER",
+            "Model": "$BOARD_PRODUCT_NAME",
+            "PartNumber": "$BOARD_PART_NUMBER",
+            "SerialNumber": "$BOARD_SERIAL_NUMBER"
+        }
     },
     {
         "exposes": [
@@ -35,10 +39,14 @@
                 "type": "IntelFruDevice"
             }
         ],
-        "manufacturer": "$BOARD_MANUFACTURER",
-        "model": "$BOARD_PRODUCT_NAME",
-        "name": "Delta DPS-750XB PSU PSU",
-        "part_number": "$BOARD_PART_NUMBER",
-        "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'DPS-750XB A', 'ADDRESS': '0x50'})"
+        "name": "Delta DPS-750XB PSU 1",
+        "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'DPS-750XB A', 'ADDRESS': '0x50'})",
+        "type": "PowerSupply",
+        "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