commit 32cdb4a78399fec17442dc2cd36b2e57382475a3
author Willy Tu <wltu@google.com> Tue May 23 10:58:39 2023 -0700
committer Ed Tanous <ed@tanous.net> Mon Jun 12 15:33:22 2023 +0000
tree 8f0c963ca453ee1a5e3808a23d338d527d583c96
parent 994fd86a3f6649a820f66313765e85e762ad105a

query: Fix default expand level with delegated

With delegate expand, the default expand level is -=
`queryCapabilities.canDelegateExpandLevel`. This creates an overlap of
expand process between delegate expand vs. default expand.

With
query.expandLevel = 2 ->
  query.expandLevel = 1 and delegated.expandLevel = 1.

Both delegated and default expand will try to only expand of level one
instead of level 2 for the default.

The code in
https://github.com/openbmc/bmcweb/blob/479e899d5f57a67647f83b7f615d2c8565290bcf/redfish-core/include/utils/query_param.hpp#L583-L597
stated that the level with "@odata.id" + other property is treated as a
seperate level. So with `query.expandLevel = 1` it just loop through the
id that was already expanded and is noop.

Tested:

Before:
/redfish/v1/Chassis/BMC/Sensors?$expand=.($levels=2) returns
the same result as level=1. Needs level=3 to expand to the next level.

The RelatedItem in here doesn't get expanded with level=2.
```
 wget -qO- 'http://localhost:80/redfish/v1/Chassis/BMC/Sensors?$expand=.($levels=1)'
 ...
    {
      "@odata.id": "/redfish/v1/Chassis/BMC/Sensors/temperature_DIMMXX",
      "@odata.type": "#Sensor.v1_2_0.Sensor",
      "Id": "temperature_DIMMXX",
      "Name": "DIMMXX",
      "Reading": 30.0,
      "ReadingRangeMax": 127.0,
      "ReadingRangeMin": -128.0,
      "ReadingType": "Temperature",
      "ReadingUnits": "Cel",
      "RelatedItem": [
        {
          "@odata.id": "/redfish/v1/Systems/system/Memory/dimmXX"
        }
      ],
      "Status": {
        "Health": "OK",
        "State": "Enabled"
      },
      "Thresholds": {
        "LowerCaution": {
          "Reading": null
        },
        "LowerCritical": {
          "Reading": null
        },
        "UpperCaution": {
          "Reading": 93.0
        },
        "UpperCritical": {
          "Reading": 95.0
        }
      }
    }
  ],
  "Members@odata.count": 242,
  "Name": "Sensors"
}
```

After:
level=2 was able to expand to the next level.

Change-Id: I542177a94a33f8df7afbb68837f3a53b86140c86
Signed-off-by: Willy Tu <wltu@google.com>