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/Flextronics S-1100ADU00-201 PSU.json b/configurations/Flextronics S-1100ADU00-201 PSU.json
index 7b4274e..537e28d 100644
--- a/configurations/Flextronics S-1100ADU00-201 PSU.json
+++ b/configurations/Flextronics S-1100ADU00-201 PSU.json
@@ -1,18 +1,44 @@
-{
-    "exposes": [
-        {
-            "address": "0x58",
-            "bus": "$bus",
-            "name": "Flextronics S-1100ADU00-201 PSU Device",
-            "type": "pmbus"
-        },
-        {
-            "address": "$address",
-            "bus": "$bus",
-            "name": "Flextronics S-1100ADU00-201 PSU FRU",
-            "type": "IntelFruDevice"
-        }
-    ],
-    "name": "Flextronics S-1100ADU00-201 PSU",
-    "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'S-1100ADU00-201', 'ADDRESS': '0x50'})"
-}
\ No newline at end of file
+[
+    {
+        "exposes": [
+            {
+                "address": "0x59",
+                "bus": "$bus",
+                "name": "Flextronics S-1100ADU00-201 PSU Device",
+                "type": "pmbus"
+            },
+            {
+                "address": "$address",
+                "bus": "$bus",
+                "name": "Flextronics S-1100ADU00-201 PSU FRU",
+                "type": "IntelFruDevice"
+            }
+        ],
+        "manufacturer": "$BOARD_MANUFACTURER",
+        "model": "$BOARD_PRODUCT_NAME",
+        "name": "Flextronics S-1100ADU00-201 PSU",
+        "part_number": "$BOARD_PART_NUMBER",
+        "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'S-1100ADU00-201', 'ADDRESS': '0x51'})"
+    },
+    {
+        "exposes": [
+            {
+                "address": "0x58",
+                "bus": "$bus",
+                "name": "Flextronics S-1100ADU00-201 PSU Device",
+                "type": "pmbus"
+            },
+            {
+                "address": "$address",
+                "bus": "$bus",
+                "name": "Flextronics S-1100ADU00-201 PSU FRU",
+                "type": "IntelFruDevice"
+            }
+        ],
+        "manufacturer": "$BOARD_MANUFACTURER",
+        "model": "$BOARD_PRODUCT_NAME",
+        "name": "Flextronics S-1100ADU00-201 PSU",
+        "part_number": "$BOARD_PART_NUMBER",
+        "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'S-1100ADU00-201', 'ADDRESS': '0x50'})"
+    }
+]
\ No newline at end of file