From c20556be8c6337e722b474e3b80b4c9a331e453a Mon Sep 17 00:00:00 2001
From: Shawn McCarney <shawnmm@us.ibm.com>
Date: Mon, 29 Jul 2019 23:49:18 -0500
Subject: meta-ibm: witherspoon: Power sensor associations

BMCWeb uses ObjectMapper associations to find sensor information for
Redfish.  Due to BMCWeb enhancements for the Power and SensorCollection
schemas, the following Witherspoon association changes are required:

* Remove the "chassis" <-> "all_sensors" association for power supplies.
  Power supplies were considered chassis by BMCWeb as a short-term
  solution, but they have been moved to the Power schema.

* Add the power supply sensors to the "chassis" <-> "all_sensors"
  association for the top level chassis.

* Add other missing power sensors to the "chassis" <->
  "all_sensors" association for the top level chassis.  These
  associations were temporarily removed due to limitations in the BMCWeb
  support for power sensors.  These limitations have been addressed.

See https://github.com/openbmc/docs/blob/master/sensor-architecture.md
for more information on sensor associations used by BMCWeb.

(From meta-ibm rev: a1c35f612f58e5453fe988d59db21a8673fdcfa4)

Change-Id: Ibea5bdea58711e96faff4937ecccedcc695d9ba4
Signed-off-by: Shawn McCarney <shawnmm@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 .../phosphor-inventory-manager/associations.json   | 58 +++++++++++-----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json
index bea5269ab..accf38b18 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json
@@ -17,20 +17,6 @@
                     "/xyz/openbmc_project/sensors/voltage/ps0_output_voltage"
                 ]
             },
-            {
-                "types":
-                {
-                    "rType": "chassis",
-                    "fType": "all_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":
                 {
@@ -62,20 +48,6 @@
                     "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage"
                 ]
             },
-            {
-                "types":
-                {
-                    "rType": "chassis",
-                    "fType": "all_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":
                 {
@@ -1581,6 +1553,15 @@
                     "/xyz/openbmc_project/sensors/voltage/p1_vddr_voltage",
                     "/xyz/openbmc_project/sensors/voltage/p1_vdn_voltage",
 
+                    "/xyz/openbmc_project/sensors/power/p0_vdd_power",
+                    "/xyz/openbmc_project/sensors/power/p0_vcs_power",
+                    "/xyz/openbmc_project/sensors/power/p0_vddr_power",
+                    "/xyz/openbmc_project/sensors/power/p0_vdn_power",
+                    "/xyz/openbmc_project/sensors/power/p1_vdd_power",
+                    "/xyz/openbmc_project/sensors/power/p1_vcs_power",
+                    "/xyz/openbmc_project/sensors/power/p1_vddr_power",
+                    "/xyz/openbmc_project/sensors/power/p1_vdn_power",
+
                     "/xyz/openbmc_project/sensors/temperature/p0_vcs_temp",
                     "/xyz/openbmc_project/sensors/temperature/p0_vddr_temp",
                     "/xyz/openbmc_project/sensors/temperature/p0_vdd_temp",
@@ -1599,7 +1580,26 @@
                     "/xyz/openbmc_project/sensors/current/p1_vdd_current",
                     "/xyz/openbmc_project/sensors/current/p1_vdn_current",
 
-                    "/xyz/openbmc_project/sensors/power/total_power"
+                    "/xyz/openbmc_project/sensors/power/fan_disk_power",
+                    "/xyz/openbmc_project/sensors/power/io_power",
+                    "/xyz/openbmc_project/sensors/power/total_power",
+                    "/xyz/openbmc_project/sensors/power/p0_io_power",
+                    "/xyz/openbmc_project/sensors/power/p0_mem_power",
+                    "/xyz/openbmc_project/sensors/power/p0_power",
+                    "/xyz/openbmc_project/sensors/power/p1_io_power",
+                    "/xyz/openbmc_project/sensors/power/p1_mem_power",
+                    "/xyz/openbmc_project/sensors/power/p1_power",
+
+                    "/xyz/openbmc_project/sensors/voltage/ps0_input_voltage",
+                    "/xyz/openbmc_project/sensors/voltage/ps0_output_voltage",
+                    "/xyz/openbmc_project/sensors/voltage/ps1_input_voltage",
+                    "/xyz/openbmc_project/sensors/voltage/ps1_output_voltage",
+
+                    "/xyz/openbmc_project/sensors/power/ps0_input_power",
+                    "/xyz/openbmc_project/sensors/power/ps1_input_power",
+
+                    "/xyz/openbmc_project/sensors/current/ps0_output_current",
+                    "/xyz/openbmc_project/sensors/current/ps1_output_current"
                 ]
             }
         ]
-- 
cgit v1.2.3