meta-ibm: Add power supply sensor associations

Make the power supply sensors visible via redfish, chassis, all_sensors.

Input voltage, input power, output voltage, output current.

Signed-off-by: Brandon Wyman <bjwyman@gmail.com>
Change-Id: I79c9a07c849ad8015fb9fa42242aeab932b755c9
diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json
index 81ad070..b64f393 100644
--- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json
+++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json
@@ -204,6 +204,22 @@
                     },
                     "paths":
                     [
+                        "/xyz/openbmc_project/sensors/power/ps0_input_power",
+                        "/xyz/openbmc_project/sensors/voltage/ps0_input_voltage",
+                        "/xyz/openbmc_project/sensors/current/ps0_output_current",
+                        "/xyz/openbmc_project/sensors/voltage/ps0_output_voltage",
+                        "/xyz/openbmc_project/sensors/power/ps1_input_power",
+                        "/xyz/openbmc_project/sensors/voltage/ps1_input_voltage",
+                        "/xyz/openbmc_project/sensors/current/ps1_output_current",
+                        "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage",
+                        "/xyz/openbmc_project/sensors/power/ps2_input_power",
+                        "/xyz/openbmc_project/sensors/voltage/ps2_input_voltage",
+                        "/xyz/openbmc_project/sensors/current/ps2_output_current",
+                        "/xyz/openbmc_project/sensors/voltage/ps2_output_voltage",
+                        "/xyz/openbmc_project/sensors/power/ps3_input_power",
+                        "/xyz/openbmc_project/sensors/voltage/ps3_input_voltage",
+                        "/xyz/openbmc_project/sensors/current/ps3_output_current",
+                        "/xyz/openbmc_project/sensors/voltage/ps3_output_voltage",
                         "/xyz/openbmc_project/sensors/altitude/Altitude",
                         "/xyz/openbmc_project/sensors/fan_tach/fan0_0",
                         "/xyz/openbmc_project/sensors/fan_tach/fan0_1",
@@ -303,6 +319,20 @@
                 {
                     "types":
                     {
+                        "rType": "inventory",
+                        "fType": "sensors"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/sensors/power/ps0_input_power",
+                        "/xyz/openbmc_project/sensors/voltage/ps0_input_voltage",
+                        "/xyz/openbmc_project/sensors/current/ps0_output_current",
+                        "/xyz/openbmc_project/sensors/voltage/ps0_output_voltage"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "fault_inventory_object",
                         "fType": "fault_led_group"
                     },
@@ -342,6 +372,20 @@
                 {
                     "types":
                     {
+                        "rType": "inventory",
+                        "fType": "sensors"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/sensors/power/ps1_input_power",
+                        "/xyz/openbmc_project/sensors/voltage/ps1_input_voltage",
+                        "/xyz/openbmc_project/sensors/current/ps1_output_current",
+                        "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "fault_inventory_object",
                         "fType": "fault_led_group"
                     },
@@ -381,6 +425,20 @@
                 {
                     "types":
                     {
+                        "rType": "inventory",
+                        "fType": "sensors"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/sensors/power/ps2_input_power",
+                        "/xyz/openbmc_project/sensors/voltage/ps2_input_voltage",
+                        "/xyz/openbmc_project/sensors/current/ps2_output_current",
+                        "/xyz/openbmc_project/sensors/voltage/ps2_output_voltage"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "fault_inventory_object",
                         "fType": "fault_led_group"
                     },
@@ -420,6 +478,20 @@
                 {
                     "types":
                     {
+                        "rType": "inventory",
+                        "fType": "sensors"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/sensors/power/ps3_input_power",
+                        "/xyz/openbmc_project/sensors/voltage/ps3_input_voltage",
+                        "/xyz/openbmc_project/sensors/current/ps3_output_current",
+                        "/xyz/openbmc_project/sensors/voltage/ps3_output_voltage"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "fault_inventory_object",
                         "fType": "fault_led_group"
                     },
diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json
index 9193d0f..67829c5 100644
--- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json
+++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json
@@ -285,6 +285,14 @@
                     },
                     "paths":
                     [
+                        "/xyz/openbmc_project/sensors/power/ps0_input_power",
+                        "/xyz/openbmc_project/sensors/voltage/ps0_input_voltage",
+                        "/xyz/openbmc_project/sensors/current/ps0_output_current",
+                        "/xyz/openbmc_project/sensors/voltage/ps0_output_voltage",
+                        "/xyz/openbmc_project/sensors/power/ps1_input_power",
+                        "/xyz/openbmc_project/sensors/voltage/ps1_input_voltage",
+                        "/xyz/openbmc_project/sensors/current/ps1_output_current",
+                        "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage",
                         "/xyz/openbmc_project/sensors/altitude/Altitude",
                         "/xyz/openbmc_project/sensors/fan_tach/fan0_0",
                         "/xyz/openbmc_project/sensors/fan_tach/fan0_1",
@@ -346,6 +354,20 @@
                 {
                     "types":
                     {
+                        "rType": "inventory",
+                        "fType": "sensors"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/sensors/power/ps0_input_power",
+                        "/xyz/openbmc_project/sensors/voltage/ps0_input_voltage",
+                        "/xyz/openbmc_project/sensors/current/ps0_output_current",
+                        "/xyz/openbmc_project/sensors/voltage/ps0_output_voltage"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "fault_inventory_object",
                         "fType": "fault_led_group"
                     },
@@ -385,6 +407,20 @@
                 {
                     "types":
                     {
+                        "rType": "inventory",
+                        "fType": "sensors"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/sensors/power/ps1_input_power",
+                        "/xyz/openbmc_project/sensors/voltage/ps1_input_voltage",
+                        "/xyz/openbmc_project/sensors/current/ps1_output_current",
+                        "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "fault_inventory_object",
                         "fType": "fault_led_group"
                     },
diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json
index b08f1f3..43384d5 100644
--- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json
+++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json
@@ -279,6 +279,22 @@
                     },
                     "paths":
                     [
+                        "/xyz/openbmc_project/sensors/power/ps0_input_power",
+                        "/xyz/openbmc_project/sensors/voltage/ps0_input_voltage",
+                        "/xyz/openbmc_project/sensors/current/ps0_output_current",
+                        "/xyz/openbmc_project/sensors/voltage/ps0_output_voltage",
+                        "/xyz/openbmc_project/sensors/power/ps1_input_power",
+                        "/xyz/openbmc_project/sensors/voltage/ps1_input_voltage",
+                        "/xyz/openbmc_project/sensors/current/ps1_output_current",
+                        "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage",
+                        "/xyz/openbmc_project/sensors/power/ps2_input_power",
+                        "/xyz/openbmc_project/sensors/voltage/ps2_input_voltage",
+                        "/xyz/openbmc_project/sensors/current/ps2_output_current",
+                        "/xyz/openbmc_project/sensors/voltage/ps2_output_voltage",
+                        "/xyz/openbmc_project/sensors/power/ps3_input_power",
+                        "/xyz/openbmc_project/sensors/voltage/ps3_input_voltage",
+                        "/xyz/openbmc_project/sensors/current/ps3_output_current",
+                        "/xyz/openbmc_project/sensors/voltage/ps3_output_voltage",
                         "/xyz/openbmc_project/sensors/altitude/Altitude",
                         "/xyz/openbmc_project/sensors/fan_tach/fan0_0",
                         "/xyz/openbmc_project/sensors/fan_tach/fan1_0",
@@ -334,6 +350,20 @@
                 {
                     "types":
                     {
+                        "rType": "inventory",
+                        "fType": "sensors"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/sensors/power/ps0_input_power",
+                        "/xyz/openbmc_project/sensors/voltage/ps0_input_voltage",
+                        "/xyz/openbmc_project/sensors/current/ps0_output_current",
+                        "/xyz/openbmc_project/sensors/voltage/ps0_output_voltage"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "fault_inventory_object",
                         "fType": "fault_led_group"
                     },
@@ -373,6 +403,20 @@
                 {
                     "types":
                     {
+                        "rType": "inventory",
+                        "fType": "sensors"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/sensors/power/ps1_input_power",
+                        "/xyz/openbmc_project/sensors/voltage/ps1_input_voltage",
+                        "/xyz/openbmc_project/sensors/current/ps1_output_current",
+                        "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "fault_inventory_object",
                         "fType": "fault_led_group"
                     },
@@ -412,6 +456,20 @@
                 {
                     "types":
                     {
+                        "rType": "inventory",
+                        "fType": "sensors"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/sensors/power/ps2_input_power",
+                        "/xyz/openbmc_project/sensors/voltage/ps2_input_voltage",
+                        "/xyz/openbmc_project/sensors/current/ps2_output_current",
+                        "/xyz/openbmc_project/sensors/voltage/ps2_output_voltage"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "fault_inventory_object",
                         "fType": "fault_led_group"
                     },
@@ -451,6 +509,20 @@
                 {
                     "types":
                     {
+                        "rType": "inventory",
+                        "fType": "sensors"
+                    },
+                    "paths":
+                    [
+                        "/xyz/openbmc_project/sensors/power/ps3_input_power",
+                        "/xyz/openbmc_project/sensors/voltage/ps3_input_voltage",
+                        "/xyz/openbmc_project/sensors/current/ps3_output_current",
+                        "/xyz/openbmc_project/sensors/voltage/ps3_output_voltage"
+                    ]
+                },
+                {
+                    "types":
+                    {
                         "rType": "fault_inventory_object",
                         "fType": "fault_led_group"
                     },