commit 480662d437e238048a56efea591dbfbae9d5d065
author Myung Bae <myungbae@us.ibm.com> Wed Oct 04 07:19:38 2023 -0700
committer Myung Bae <myungbae@us.ibm.com> Tue Oct 10 21:17:47 2023 +0000
tree ea01027b80f48670ef1406f9f3f011ced0dd9d59
parent 6fd295531d34a3f1df887200ad904321b6020ddd

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>

static/redfish/v1/$metadata/index.xml

diff --git a/static/redfish/v1/$metadata/index.xml b/static/redfish/v1/$metadata/index.xml
index b514422..b90b518 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>

static/redfish/v1/JsonSchemas/OemAccountService/OemAccountService.json

diff --git a/static/redfish/v1/JsonSchemas/OemAccountService/index.json b/static/redfish/v1/JsonSchemas/OemAccountService/OemAccountService.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/OemAccountService/index.json
rename to static/redfish/v1/JsonSchemas/OemAccountService/OemAccountService.json

static/redfish/v1/JsonSchemas/OemComputerSystem/OemComputerSystem.json

diff --git a/static/redfish/v1/JsonSchemas/OemComputerSystem/index.json b/static/redfish/v1/JsonSchemas/OemComputerSystem/OemComputerSystem.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/OemComputerSystem/index.json
rename to static/redfish/v1/JsonSchemas/OemComputerSystem/OemComputerSystem.json

static/redfish/v1/JsonSchemas/OemManager/OemManager.json

diff --git a/static/redfish/v1/JsonSchemas/OemManager/index.json b/static/redfish/v1/JsonSchemas/OemManager/OemManager.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/OemManager/index.json
rename to static/redfish/v1/JsonSchemas/OemManager/OemManager.json

static/redfish/v1/JsonSchemas/OemVirtualMedia/OemVirtualMedia.json

diff --git a/static/redfish/v1/JsonSchemas/OemVirtualMedia/index.json b/static/redfish/v1/JsonSchemas/OemVirtualMedia/OemVirtualMedia.json
similarity index 100%
rename from static/redfish/v1/JsonSchemas/OemVirtualMedia/index.json
rename to static/redfish/v1/JsonSchemas/OemVirtualMedia/OemVirtualMedia.json