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/R2000 Chassis.json b/configurations/R2000 Chassis.json
index b2d4893..220ad4d 100644
--- a/configurations/R2000 Chassis.json
+++ b/configurations/R2000 Chassis.json
@@ -121,16 +121,17 @@
             "type": "AspeedFan"
         }
     ],
-
-    "manufacturer": "Intel Corporation",
-    "model": "R2000",
     "name": "R2000 Chassis",
-    "part_number": "R2104",
-    "serial_number": "23165",
     "probe": [
         "FOUND('WFP Baseboard')",
         "AND",
         "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL\\d+RISER\\d'})",
         "MATCH_ONE"
-    ]
+    ],
+    "xyz.openbmc_project.Inventory.Decorator.Asset": {
+        "Manufacturer": "Intel Corporation",
+        "Model": "R2000",
+        "PartNumber": "R2104",
+        "SerialNumber": "23165"
+    }
 }
\ No newline at end of file