diff options
| author | Myung Bae <myungbae@us.ibm.com> | 2023-10-04 17:19:38 +0300 |
|---|---|---|
| committer | Myung Bae <myungbae@us.ibm.com> | 2023-10-11 00:17:47 +0300 |
| commit | 480662d437e238048a56efea591dbfbae9d5d065 (patch) | |
| tree | ea01027b80f48670ef1406f9f3f011ced0dd9d59 /static | |
| parent | 6fd295531d34a3f1df887200ad904321b6020ddd (diff) | |
| download | bmcweb-480662d437e238048a56efea591dbfbae9d5d065.tar.xz | |
Fix update_schemas.py to add Oem JsonSchemas
GET on redfish/v1/JsonSchema does not show OEM schemas but shows only
DMTF redfish schemas.
It is because Oem schemas are not included into `schemas.hpp`.
In addition, the explicit OEM JsonSchema gives the content of the file
rather than the valid Json output.
Tested:
- Query JsonSchemas
```
curl -k -H "X-Auth-Token: $token" -X GET "https://$bmc/redfish/v1/JsonSchemas"
curl -k -H "X-Auth-Token: $token" -X GET "https://$bmc/redfish/v1/JsonSchemas/<OemSchema>"
e.g.
curl -k -H "X-Auth-Token: $token" -X GET "https://$bmc/redfish/v1/JsonSchemas/OemManager"
```
- Redfish Service Validator passed
Change-Id: I0fc9c3d4a48fb9c6ddec9591af12fd2c849331e3
Signed-off-by: Myung Bae <myungbae@us.ibm.com>
Diffstat (limited to 'static')
| -rw-r--r-- | static/redfish/v1/$metadata/index.xml | 10 | ||||
| -rw-r--r-- | static/redfish/v1/JsonSchemas/OemAccountService/OemAccountService.json (renamed from static/redfish/v1/JsonSchemas/OemAccountService/index.json) | 0 | ||||
| -rw-r--r-- | static/redfish/v1/JsonSchemas/OemComputerSystem/OemComputerSystem.json (renamed from static/redfish/v1/JsonSchemas/OemComputerSystem/index.json) | 0 | ||||
| -rw-r--r-- | static/redfish/v1/JsonSchemas/OemManager/OemManager.json (renamed from static/redfish/v1/JsonSchemas/OemManager/index.json) | 0 | ||||
| -rw-r--r-- | static/redfish/v1/JsonSchemas/OemVirtualMedia/OemVirtualMedia.json (renamed from static/redfish/v1/JsonSchemas/OemVirtualMedia/index.json) | 0 |
5 files changed, 5 insertions, 5 deletions
diff --git a/static/redfish/v1/$metadata/index.xml b/static/redfish/v1/$metadata/index.xml index b514422da4..b90b518f43 100644 --- a/static/redfish/v1/$metadata/index.xml +++ b/static/redfish/v1/$metadata/index.xml @@ -3300,11 +3300,6 @@ <edmx:Reference Uri="/redfish/v1/schema/VirtualMediaCollection_v1.xml"> <edmx:Include Namespace="VirtualMediaCollection"/> </edmx:Reference> - <edmx:DataServices> - <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Service"> - <EntityContainer Name="Service" Extends="ServiceRoot.v1_0_0.ServiceContainer"/> - </Schema> - </edmx:DataServices> <edmx:Reference Uri="/redfish/v1/schema/OemManager_v1.xml"> <edmx:Include Namespace="OemManager"/> </edmx:Reference> @@ -3319,4 +3314,9 @@ <edmx:Include Namespace="OpenBMCAccountService"/> <edmx:Include Namespace="OpenBMCAccountService.v1_0_0"/> </edmx:Reference> + <edmx:DataServices> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Service"> + <EntityContainer Name="Service" Extends="ServiceRoot.v1_0_0.ServiceContainer"/> + </Schema> + </edmx:DataServices> </edmx:Edmx> diff --git a/static/redfish/v1/JsonSchemas/OemAccountService/index.json b/static/redfish/v1/JsonSchemas/OemAccountService/OemAccountService.json index 2311d83b9f..2311d83b9f 100644 --- a/static/redfish/v1/JsonSchemas/OemAccountService/index.json +++ b/static/redfish/v1/JsonSchemas/OemAccountService/OemAccountService.json diff --git a/static/redfish/v1/JsonSchemas/OemComputerSystem/index.json b/static/redfish/v1/JsonSchemas/OemComputerSystem/OemComputerSystem.json index 1423af5e89..1423af5e89 100644 --- a/static/redfish/v1/JsonSchemas/OemComputerSystem/index.json +++ b/static/redfish/v1/JsonSchemas/OemComputerSystem/OemComputerSystem.json diff --git a/static/redfish/v1/JsonSchemas/OemManager/index.json b/static/redfish/v1/JsonSchemas/OemManager/OemManager.json index e0be5b10b8..e0be5b10b8 100644 --- a/static/redfish/v1/JsonSchemas/OemManager/index.json +++ b/static/redfish/v1/JsonSchemas/OemManager/OemManager.json diff --git a/static/redfish/v1/JsonSchemas/OemVirtualMedia/index.json b/static/redfish/v1/JsonSchemas/OemVirtualMedia/OemVirtualMedia.json index 9ae641a487..9ae641a487 100644 --- a/static/redfish/v1/JsonSchemas/OemVirtualMedia/index.json +++ b/static/redfish/v1/JsonSchemas/OemVirtualMedia/OemVirtualMedia.json |