Make entity manager produce values for device names

And add a configuration for a 1300W power supply

Change-Id: Iae618bca8af6873847ff36d18267db7b5bb72930
Signed-off-by: Ed Tanous <ed.tanous@intel.com>
diff --git a/configurations/F2U12X35S3P_riser.json b/configurations/F2U12X35S3P_riser.json
index 83fda94..365208f 100644
--- a/configurations/F2U12X35S3P_riser.json
+++ b/configurations/F2U12X35S3P_riser.json
@@ -40,7 +40,11 @@
                 "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'})"
     },
     {
@@ -84,7 +88,11 @@
                 "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'})"
     }
 ]
\ No newline at end of file