Move to 2021.2
Update the script to point at 2021.2, change the path of the files since
they moved yet again, and run the script.
The directory structure moved back to the way they had it pre-2020.1:
https://github.com/openbmc/bmcweb/commit/a778c0261282b95e14ea3f4406959638b5edb040
Since we have an exclude list, this only brings in new versions of
schemas bmcweb already uses.
Overview of 2021.2:
https://www.dmtf.org/sites/default/files/Redfish_Release_2021.2_Overview.pdf
IBM plans to use Control (for PowerCapping) and IdlePowerSaver
immediately.
Tested: Validator passed after DMTF/Redfish-Service-Validator/pull/423
merged.
CI uses the latest Redfish-Service-Validator so not a problem for CI.
For manual users only a small window where an older validator would
fail. After the schemapack changes but before PR423.
See the new schemas.
Change-Id: I2fe539087167cf6d962c14bf31fa23861302646f
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
diff --git a/static/redfish/v1/schema/VirtualMedia_v1.xml b/static/redfish/v1/schema/VirtualMedia_v1.xml
index 5019060..e16a3cd 100644
--- a/static/redfish/v1/schema/VirtualMedia_v1.xml
+++ b/static/redfish/v1/schema/VirtualMedia_v1.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!---->
<!--################################################################################ -->
-<!--# Redfish Schema: VirtualMedia v1.4.0 -->
+<!--# Redfish Schema: VirtualMedia v1.5.0 -->
<!--# -->
<!--# For a detailed change log, see the README file contained in the DSP8010 bundle, -->
<!--# available at http://www.dmtf.org/standards/redfish -->
@@ -35,7 +35,7 @@
<EntityType Name="VirtualMedia" BaseType="Resource.v1_0_0.Resource" Abstract="true">
<Annotation Term="OData.Description" String="The VirtualMedia schema contains properties related to the monitor and control of an instance of virtual media, such as a remote CD, DVD, or USB device. A manager for a system or device provides virtual media functionality."/>
- <Annotation Term="OData.LongDescription" String="This Resource shall represent a virtual media service for a Redfish implementation."/>
+ <Annotation Term="OData.LongDescription" String="This resource shall represent a virtual media service for a Redfish implementation."/>
<Annotation Term="Capabilities.InsertRestrictions">
<Record>
<PropertyValue Property="Insertable" Bool="false"/>
@@ -75,20 +75,20 @@
</Annotation>
<Parameter Name="VirtualMedia" Type="VirtualMedia.v1_1_0.Actions"/>
<Parameter Name="Image" Type="Edm.String" Nullable="false">
- <Annotation Term="OData.Description" String="The URI of the remote media to attach to the virtual media."/>
- <Annotation Term="OData.LongDescription" String="This parameter shall specify the URI of the remote media to be attached to the virtual media."/>
+ <Annotation Term="OData.Description" String="The URI of the media to attach to the virtual media."/>
+ <Annotation Term="OData.LongDescription" String="This parameter shall contain the URI of the media to be attached to the virtual media. This parameter may specify an absolute URI to remote media or a relative URI to media local to the implementation. A service may allow a relative URI to reference a SoftwareInventory resource."/>
</Parameter>
<Parameter Name="Inserted" Type="Edm.Boolean">
<Annotation Term="OData.Description" String="An indication of whether the image is treated as inserted upon completion of the action. The default is `true`."/>
- <Annotation Term="OData.LongDescription" String="This parameter shall indicate whether the image is treated as inserted upon completion of the action. If the client does not provide this parameter, the service shall default this value to `true`."/>
+ <Annotation Term="OData.LongDescription" String="This parameter shall contain whether the image is treated as inserted upon completion of the action. If the client does not provide this parameter, the service shall default this value to `true`."/>
</Parameter>
<Parameter Name="WriteProtected" Type="Edm.Boolean">
<Annotation Term="OData.Description" String="An indication of whether the remote media is treated as write-protected. The default is `true`."/>
- <Annotation Term="OData.LongDescription" String="This parameter shall indicate whether the remote media is treated as write-protected. If the client does not provide this parameter, the service shall default this value to `true`."/>
+ <Annotation Term="OData.LongDescription" String="This parameter shall contain whether the remote media is treated as write-protected. If the client does not provide this parameter, the service shall default this value to `true`."/>
</Parameter>
<Parameter Name="UserName" Type="Edm.String">
- <Annotation Term="OData.Description" String="The user name to access the Image parameter-specified URI."/>
- <Annotation Term="OData.LongDescription" String="This parameter shall contain the user name to access the Image parameter-specified URI."/>
+ <Annotation Term="OData.Description" String="The username to access the URI specified by the Image parameter."/>
+ <Annotation Term="OData.LongDescription" String="This parameter shall contain the username to access the URI specified by the Image parameter."/>
<Annotation Term="Redfish.Revisions">
<Collection>
<Record>
@@ -99,8 +99,8 @@
</Annotation>
</Parameter>
<Parameter Name="Password" Type="Edm.String">
- <Annotation Term="OData.Description" String="The password to access the Image parameter-specified URI."/>
- <Annotation Term="OData.LongDescription" String="This parameter shall represent the password to access the Image parameter-specified URI."/>
+ <Annotation Term="OData.Description" String="The password to access the URI specified by the Image parameter."/>
+ <Annotation Term="OData.LongDescription" String="This parameter shall contain the password to access the URI specified by the Image parameter."/>
<Annotation Term="Redfish.Revisions">
<Collection>
<Record>
@@ -112,7 +112,7 @@
</Parameter>
<Parameter Name="TransferProtocolType" Type="VirtualMedia.v1_3_0.TransferProtocolType">
<Annotation Term="OData.Description" String="The network protocol to use with the image."/>
- <Annotation Term="OData.LongDescription" String="This parameter shall represent the network protocol to use with the specified image URI."/>
+ <Annotation Term="OData.LongDescription" String="This parameter shall contain the network protocol to use with the specified image URI."/>
<Annotation Term="Redfish.Revisions">
<Collection>
<Record>
@@ -123,8 +123,8 @@
</Annotation>
</Parameter>
<Parameter Name="TransferMethod" Type="VirtualMedia.v1_3_0.TransferMethod">
- <Annotation Term="OData.Description" String="The transfer method to use with the Image."/>
- <Annotation Term="OData.LongDescription" String="This parameter shall describe how the image transfer occurs."/>
+ <Annotation Term="OData.Description" String="The transfer method to use with the image."/>
+ <Annotation Term="OData.LongDescription" String="This parameter shall contain the transfer method to use with the specified image URI."/>
<Annotation Term="Redfish.Revisions">
<Collection>
<Record>
@@ -149,7 +149,6 @@
</Annotation>
<Parameter Name="VirtualMedia" Type="VirtualMedia.v1_1_0.Actions"/>
</Action>
-
</Schema>
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VirtualMedia.v1_0_0">
@@ -165,18 +164,18 @@
<Property Name="Image" Type="Edm.String">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
<Annotation Term="OData.Description" String="The URI of the location of the selected image."/>
- <Annotation Term="OData.LongDescription" String="This property shall contain an URI. A null value indicated no image connection."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the URI of the media attached to the virtual media. This value may specify an absolute URI to remote media or a relative URI to media local to the implementation. A service may allow a relative URI to reference a SoftwareInventory resource. The value `null` shall indicates no image connection."/>
<Annotation Term="OData.IsURL"/>
</Property>
<Property Name="MediaTypes" Type="Collection(VirtualMedia.v1_0_0.MediaType)" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
<Annotation Term="OData.Description" String="The media types supported as virtual media."/>
- <Annotation Term="OData.LongDescription" String="The values of this array shall be the supported media types for this connection."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain an array of the supported media types for this connection."/>
</Property>
<Property Name="ConnectedVia" Type="VirtualMedia.v1_0_0.ConnectedVia">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
<Annotation Term="OData.Description" String="The current virtual media connection method."/>
- <Annotation Term="OData.LongDescription" String="This property shall contain the current connection method from a client to the virtual media that this Resource represents."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the current connection method from a client to the virtual media that this resource represents."/>
</Property>
<Property Name="Inserted" Type="Edm.Boolean">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -219,7 +218,6 @@
<Annotation Term="OData.Description" String="Connected through an OEM-defined method."/>
</Member>
</EnumType>
-
</Schema>
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VirtualMedia.v1_0_2">
@@ -242,7 +240,7 @@
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VirtualMedia.v1_0_5">
<Annotation Term="Redfish.OwningEntity" String="DMTF"/>
- <Annotation Term="OData.Description" String="This version was created to use the new Revisions annotation."/>
+ <Annotation Term="OData.Description" String="This version was created to use the new revisions annotation."/>
<EntityType Name="VirtualMedia" BaseType="VirtualMedia.v1_0_4.VirtualMedia"/>
</Schema>
@@ -258,30 +256,37 @@
<EntityType Name="VirtualMedia" BaseType="VirtualMedia.v1_0_6.VirtualMedia"/>
</Schema>
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VirtualMedia.v1_0_8">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to clarify the usage of Image when mounting media from a local source."/>
+ <EntityType Name="VirtualMedia" BaseType="VirtualMedia.v1_0_7.VirtualMedia"/>
+ </Schema>
+
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VirtualMedia.v1_1_0">
<Annotation Term="Redfish.OwningEntity" String="DMTF"/>
<Annotation Term="Redfish.Release" String="2017.1"/>
+
<EntityType Name="VirtualMedia" BaseType="VirtualMedia.v1_0_3.VirtualMedia">
<Property Name="Actions" Type="VirtualMedia.v1_1_0.Actions" Nullable="false">
- <Annotation Term="OData.Description" String="The available actions for this Resource."/>
- <Annotation Term="OData.LongDescription" String="This property shall contain the available actions for this Resource."/>
+ <Annotation Term="OData.Description" String="The available actions for this resource."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the available actions for this resource."/>
</Property>
</EntityType>
<ComplexType Name="Actions">
<Annotation Term="OData.AdditionalProperties" Bool="false"/>
- <Annotation Term="OData.Description" String="The available actions for this Resource."/>
- <Annotation Term="OData.LongDescription" String="This type shall contain the available actions for this Resource."/>
+ <Annotation Term="OData.Description" String="The available actions for this resource."/>
+ <Annotation Term="OData.LongDescription" String="This type shall contain the available actions for this resource."/>
<Property Name="Oem" Type="VirtualMedia.v1_1_0.OemActions" Nullable="false">
- <Annotation Term="OData.Description" String="The available OEM-specific actions for this Resource."/>
- <Annotation Term="OData.LongDescription" String="This property shall contain the available OEM-specific actions for this Resource."/>
+ <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the available OEM-specific actions for this resource."/>
</Property>
</ComplexType>
<ComplexType Name="OemActions">
<Annotation Term="OData.AdditionalProperties" Bool="true"/>
- <Annotation Term="OData.Description" String="The available OEM-specific actions for this Resource."/>
- <Annotation Term="OData.LongDescription" String="This type shall contain the available OEM-specific actions for this Resource."/>
+ <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+ <Annotation Term="OData.LongDescription" String="This type shall contain the available OEM-specific actions for this resource."/>
</ComplexType>
</Schema>
@@ -299,7 +304,7 @@
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VirtualMedia.v1_1_3">
<Annotation Term="Redfish.OwningEntity" String="DMTF"/>
- <Annotation Term="OData.Description" String="This version was created to use the new Revisions annotation."/>
+ <Annotation Term="OData.Description" String="This version was created to use the new revisions annotation."/>
<EntityType Name="VirtualMedia" BaseType="VirtualMedia.v1_1_2.VirtualMedia"/>
</Schema>
@@ -315,10 +320,17 @@
<EntityType Name="VirtualMedia" BaseType="VirtualMedia.v1_1_4.VirtualMedia"/>
</Schema>
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VirtualMedia.v1_1_6">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to clarify the usage of Image when mounting media from a local source."/>
+ <EntityType Name="VirtualMedia" BaseType="VirtualMedia.v1_1_5.VirtualMedia"/>
+ </Schema>
+
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VirtualMedia.v1_2_0">
<Annotation Term="Redfish.OwningEntity" String="DMTF"/>
<Annotation Term="Redfish.Release" String="2017.3"/>
<Annotation Term="OData.Description" String="This version was created to change the permissions of Image, Inserted, and WriteProtected and to add the InsertMedia and EjectMedia actions."/>
+
<EntityType Name="VirtualMedia" BaseType="VirtualMedia.v1_1_1.VirtualMedia"/>
</Schema>
@@ -330,7 +342,7 @@
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VirtualMedia.v1_2_2">
<Annotation Term="Redfish.OwningEntity" String="DMTF"/>
- <Annotation Term="OData.Description" String="This version was created to use the new Revisions annotation."/>
+ <Annotation Term="OData.Description" String="This version was created to use the new revisions annotation."/>
<EntityType Name="VirtualMedia" BaseType="VirtualMedia.v1_2_1.VirtualMedia"/>
</Schema>
@@ -346,6 +358,12 @@
<EntityType Name="VirtualMedia" BaseType="VirtualMedia.v1_2_3.VirtualMedia"/>
</Schema>
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VirtualMedia.v1_2_5">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to clarify the usage of Image when mounting media from a local source."/>
+ <EntityType Name="VirtualMedia" BaseType="VirtualMedia.v1_2_4.VirtualMedia"/>
+ </Schema>
+
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VirtualMedia.v1_3_0">
<Annotation Term="Redfish.OwningEntity" String="DMTF"/>
<Annotation Term="Redfish.Release" String="2018.3"/>
@@ -426,6 +444,12 @@
<EntityType Name="VirtualMedia" BaseType="VirtualMedia.v1_3_1.VirtualMedia"/>
</Schema>
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VirtualMedia.v1_3_3">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to clarify the usage of Image when mounting media from a local source."/>
+ <EntityType Name="VirtualMedia" BaseType="VirtualMedia.v1_3_2.VirtualMedia"/>
+ </Schema>
+
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VirtualMedia.v1_4_0">
<Annotation Term="Redfish.OwningEntity" String="DMTF"/>
<Annotation Term="Redfish.Release" String="2021.1"/>
@@ -450,5 +474,25 @@
</EntityType>
</Schema>
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VirtualMedia.v1_4_1">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to clarify the usage of Image when mounting media from a local source."/>
+ <EntityType Name="VirtualMedia" BaseType="VirtualMedia.v1_4_0.VirtualMedia"/>
+ </Schema>
+
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VirtualMedia.v1_5_0">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="Redfish.Release" String="2021.2"/>
+
+ <EntityType Name="VirtualMedia" BaseType="VirtualMedia.v1_4_1.VirtualMedia">
+ <NavigationProperty Name="ClientCertificates" Type="CertificateCollection.CertificateCollection" ContainsTarget="true" Nullable="false">
+ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+ <Annotation Term="OData.Description" String="The link to a collection of client identity certificates provided to the server referenced by the Image property."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type CertificateCollection that represents the client identity certificates that are provided to the server referenced by the Image property as part of TLS handshaking."/>
+ <Annotation Term="OData.AutoExpandReferences"/>
+ </NavigationProperty>
+ </EntityType>
+ </Schema>
+
</edmx:DataServices>
</edmx:Edmx>