summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGunnar Mills <gmills@us.ibm.com>2020-02-06 16:36:47 -0600
committerGunnar Mills <gmills@us.ibm.com>2020-02-07 19:07:33 +0000
commit2077899f6d4534d98ca2cca3bc9020dbc6a4aef9 (patch)
tree4c1e38c332e68367dd29b6c17e914da12517f2ef
parent4f50ae4b71fc0821f0013cbf586579f7c9a17a2c (diff)
downloadbmcweb-2077899f6d4534d98ca2cca3bc9020dbc6a4aef9.tar.gz
bmcweb-2077899f6d4534d98ca2cca3bc9020dbc6a4aef9.zip
Update update_schemas.py with new Oem
Several Oem schemas have been added but the update_schemas.py has not been updated. Added them to the update_schemas.py so the static/redfish/v1/$metadata/index.xml is correctly built by update_schemas.py. This is needed to move us to 2019.3 and eventually 2019.4. Ideally, we would not just have a bunch of metadata_index.write to write the Oem schemas to $metadata/index.xml but this will do for now. https://github.com/openbmc/bmcweb/issues/32 is to improve this. Tested: Ran update_schemas.py and loaded that image on a Witherspoon and ran the validator. No errors. Change-Id: Iade028e690c31e25a72503d9352bc75eb7ee58dc Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
-rwxr-xr-xscripts/update_schemas.py25
-rw-r--r--static/redfish/v1/$metadata/index.xml16
2 files changed, 32 insertions, 9 deletions
diff --git a/scripts/update_schemas.py b/scripts/update_schemas.py
index 1c3c6f1..01ab66c 100755
--- a/scripts/update_schemas.py
+++ b/scripts/update_schemas.py
@@ -107,13 +107,36 @@ with open(metadata_index_path, 'w') as metadata_index:
</edmx:DataServices>
""")
# TODO:Issue#32 There's a bug in the script that currently deletes this
- # schema (because it's an OEM schema). Because it's the only one, and we
+ # schema (because it's an OEM schema). Because it's the only five, and we
# don't update schemas very often, we just manually fix it. Need a
# permanent fix to the script.
metadata_index.write(
" <edmx:Reference Uri=\"/redfish/v1/schema/OemManager_v1.xml\">\n")
metadata_index.write(" <edmx:Include Namespace=\"OemManager\"/>\n")
metadata_index.write(" </edmx:Reference>\n")
+
+ metadata_index.write(
+ " <edmx:Reference Uri=\"/redfish/v1/schema/OemCrashdump_v1.xml\">\n")
+ metadata_index.write(" <edmx:Include Namespace=\"OemCrashdump.v1_0_0\"/>\n")
+ metadata_index.write(" </edmx:Reference>\n")
+
+ metadata_index.write(
+ " <edmx:Reference Uri=\"/redfish/v1/schema/OemComputerSystem_v1.xml\">\n")
+ metadata_index.write(" <edmx:Include Namespace=\"OemComputerSystem\"/>\n")
+ metadata_index.write(" </edmx:Reference>\n")
+
+ metadata_index.write(
+ " <edmx:Reference Uri=\"/redfish/v1/schema/OemVirtualMedia_v1.xml\">\n")
+ metadata_index.write(" <edmx:Include Namespace=\"OemVirtualMedia\"/>\n")
+ metadata_index.write(" <edmx:Include Namespace=\"OemVirtualMedia.v1_0_0\"/>\n")
+ metadata_index.write(" </edmx:Reference>\n")
+
+ metadata_index.write(
+ " <edmx:Reference Uri=\"/redfish/v1/schema/OemAccountService_v1.xml\">\n")
+ metadata_index.write(" <edmx:Include Namespace=\"OemAccountService\"/>\n")
+ metadata_index.write(" <edmx:Include Namespace=\"OemAccountService.v1_0_0\"/>\n")
+ metadata_index.write(" </edmx:Reference>\n")
+
metadata_index.write("</edmx:Edmx>\n")
schema_files = {}
diff --git a/static/redfish/v1/$metadata/index.xml b/static/redfish/v1/$metadata/index.xml
index a5a2fcb..2a88ba5 100644
--- a/static/redfish/v1/$metadata/index.xml
+++ b/static/redfish/v1/$metadata/index.xml
@@ -1045,10 +1045,6 @@
<edmx:Include Namespace="NetworkPort.v1_2_2"/>
<edmx:Include Namespace="NetworkPort.v1_2_3"/>
</edmx:Reference>
- <edmx:Reference Uri="/redfish/v1/schema/OemAccountService_v1.xml">
- <edmx:Include Namespace="OemAccountService"/>
- <edmx:Include Namespace="OemAccountService.v1_0_0"/>
- </edmx:Reference>
<edmx:Reference Uri="/redfish/v1/schema/NetworkPortCollection_v1.xml">
<edmx:Include Namespace="NetworkPortCollection"/>
</edmx:Reference>
@@ -1808,10 +1804,6 @@
<edmx:Reference Uri="/redfish/v1/schema/VirtualMediaCollection_v1.xml">
<edmx:Include Namespace="VirtualMediaCollection"/>
</edmx:Reference>
- <edmx:Reference Uri="/redfish/v1/schema/OemVirtualMedia_v1.xml">
- <edmx:Include Namespace="OemVirtualMedia"/>
- <edmx:Include Namespace="OemVirtualMedia.v1_0_0"/>
- </edmx:Reference>
<edmx:Reference Uri="/redfish/v1/schema/VLanNetworkInterface_v1.xml">
<edmx:Include Namespace="VLanNetworkInterface"/>
<edmx:Include Namespace="VLanNetworkInterface.v1_0_0"/>
@@ -1889,4 +1881,12 @@
<edmx:Reference Uri="/redfish/v1/schema/OemComputerSystem_v1.xml">
<edmx:Include Namespace="OemComputerSystem"/>
</edmx:Reference>
+ <edmx:Reference Uri="/redfish/v1/schema/OemVirtualMedia_v1.xml">
+ <edmx:Include Namespace="OemVirtualMedia"/>
+ <edmx:Include Namespace="OemVirtualMedia.v1_0_0"/>
+ </edmx:Reference>
+ <edmx:Reference Uri="/redfish/v1/schema/OemAccountService_v1.xml">
+ <edmx:Include Namespace="OemAccountService"/>
+ <edmx:Include Namespace="OemAccountService.v1_0_0"/>
+ </edmx:Reference>
</edmx:Edmx>
OpenPOWER on IntegriCloud