meta-inspur: fp5280g2: Update the power-supply label name
- In the BmcWeb repo, according to the `LABEL` in the power-supply
configuration, get the `unit` value of the power type
(PowerInputWatts & PowerOutputWatts).
link: https://github.com/openbmc/bmcweb/blob/master/redfish-core/lib/sensors.hpp#L912
- Since the `LABEL` naming of the previous configuration file was
wrong, it needs to be updated and conforms to the `LABEL` naming
convention.
- Also, sync update association.json to ensure that the correct
sensor value can be obtained.
Tested:
- Built image-bmc successfully on fp5280g2 machine.
- Obtain the correct `PowerInputWatts` & `PowerOutputWatts` by
viewing the BmcWeb log.
- Obtain `redfish/v1/Chassis/chassis/Power` by the Redfish command:
... ...
"PowerSupplies": [
{
"@odata.id": "/redfish/v1/Chassis/chassis/Power#/PowerSupplies/0",
"EfficiencyPercent": 90,
"IndicatorLED": "Off",
"Manufacturer": "",
"MemberId": "powersupply0",
"Model": "PS-2801-12L",
"Name": "powersupply0",
"PartNumber": "",
"PowerInputWatts": 13.9375,
"PowerOutputWatts": 5.5,
"SerialNumber": "6K12A0117473YX",
"Status": {
"Health": "OK",
"State": "Enabled"
}
}
]
... ...
Signed-off-by: George Liu <liuxiwei@inspur.com>
Change-Id: Ie88a629c97ab8ad3136a49f71b810b930a820ab2
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/power-supply@58.conf b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/power-supply@58.conf
index 362b4b0..437d4b5 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/power-supply@58.conf
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/power-supply@58.conf
@@ -1,4 +1,6 @@
-LABEL_in1 = "psu0_vin"
-LABEL_in2 = "psu0_vout"
-LABEL_power1 = "psu0_pin"
-LABEL_power2 = "psu0_pout"
+LABEL_in1 = "ps0_input_voltage"
+LABEL_in2 = "ps0_output_voltage"
+LABEL_curr1 = "ps0_input_current"
+LABEL_curr2 = "ps0_output_current"
+LABEL_power1 = "ps0_input_power"
+LABEL_power2 = "ps0_output_power"