tree 054ebc8ac919e37eb6c59a3c7dd059f7099cd96b
parent 27062605f8ddbafeec691ed9556fe90f2c1ab8d2
author Gunnar Mills <gmills@us.ibm.com> 1562090836 -0500
committer Ed Tanous <ed.tanous@intel.com> 1562610421 +0000

Move PowerLimit to correct location

See the following Redfish Validator errors and warning:
/redfish/v1/Chassis/chassis/Power
ERROR - PowerLimit not defined in schema Power.v1_5_2
(check version, spelling and casing)

/redfish/v1/Chassis/chassis/Power#/PowerControl/
ERROR - Decoded object no longer a dictionary /redfish/v1/Chassis/chassis/Power
ERROR - @odata.id of ReferenceableMember does not properly
resolve: /redfish/v1/Chassis/chassis/Power#/PowerControl/

WARNING - No @odata.type present, assuming highest type
Power.v1_0_0.PowerControl Power.v1_4_0.PowerControl

If you look at the specification/mockups, PowerLimit is
under PowerControl.

From the https://redfish.dmtf.org/redfish/mockups/v1/893 mockup:
PowerControl": [
    {
        "@odata.id": "/redfish/v1/Chassis/1U/Power#/PowerControl/0",
        "MemberId": "0",
        ...
        "PowerAvailableWatts": 0,
        "PowerCapacityWatts": 800,
        ...
        "PowerLimit": {
            "LimitInWatts": 500,
            "LimitException": "LogEventOnly",
            "CorrectionInMs": 50
         } ,
         ...
    }
],

Added an odata.type and fixed the odata.id for PowerControl.

Put all power control sensors under the same PowerControl
like we do for PowerSupplies.

Tested: No longer see the errors.

If no total_power (happens when a Open Power system is off):
curl -k https://${bmc}/redfish/v1/Chassis/chassis/Power
  ...
  "PowerControl": [
    {
      "@odata.id": "/redfish/v1/Chassis/chassis/Power#/PowerControl/0",
      "@odata.type": "#Power.v1_0_0.PowerControl",
      "MemberId": "0",
      "Name": "Chassis Power Control",
      "PowerLimit": {
        "LimitInWatts": null
      }
    }
  ],
  "Redundancy": [],
   ...

 curl -k https://${bmc}/redfish/v1/Chassis/chassis/Power/
{
  "PowerControl": [
    {
      "@odata.id": "/redfish/v1/Chassis/chassis/Power#/PowerControl/0",
      "@odata.type": "#Power.v1_0_0.PowerControl",
      "MemberId": "0",
      "Name": "Chassis Power Control",
      "PowerConsumedWatts": 232.0,
      "PowerLimit": {
        "LimitInWatts": null
      },
      "Status": {
        "Health": "OK",
        "State": "Enabled"

Change-Id: I8ca47bd6c7dedf5d0685886e2e45e6f964f69060
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>