Move to 2020.2
Point update_schemas.py at 2020.2 and run the script.
An overview of 2020.2 can be found at:
https://www.dmtf.org/sites/default/files/Redfish_Release_2020.2_Overview.pdf
Tested: Loaded on a Witherspoon and ran the validator.
See the new schemas.
Change-Id: Idb6cbc58efe484dcffa0cc22deff3a4746af67ed
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
diff --git a/static/redfish/v1/schema/RedfishExtensions_v1.xml b/static/redfish/v1/schema/RedfishExtensions_v1.xml
index 3cb73f7..d7db83d 100644
--- a/static/redfish/v1/schema/RedfishExtensions_v1.xml
+++ b/static/redfish/v1/schema/RedfishExtensions_v1.xml
@@ -37,21 +37,21 @@
<Annotation Term="OData.Description" String="The set of allowable values for an action parameter or property."/>
</Term>
<Term Name="Required" Type="Edm.Boolean" DefaultValue="true">
- <Annotation Term="OData.Description" String="This term specifies that a property is required to be supported by Services. Properties not annotated as required are optional."/>
+ <Annotation Term="OData.Description" String="This term specifies that a property is required to be supported by services. Properties not annotated as required are optional."/>
</Term>
<Term Name="RequiredOnCreate" Type="Edm.Boolean" DefaultValue="true">
- <Annotation Term="OData.Description" String="The term specifies that a property is required to be specified in the body of a POST request to create the Resource."/>
+ <Annotation Term="OData.Description" String="The term specifies that a property is required to be specified in the body of a POST request to create the resource."/>
</Term>
<Term Name="Settings" Type="Settings.Settings">
- <Annotation Term="OData.Description" String="The link to the Settings Resource that represents the settings to apply to this Resource."/>
+ <Annotation Term="OData.Description" String="The link to the settings resource that represents the settings to apply to this resource."/>
</Term>
<Term Name="AutoExpandReferences" Type="Edm.Boolean" DefaultValue="true">
<Annotation Term="RedfishExtensions.v1_0_0.Deprecated" String="This term has been deprecated in favor of OData.AutoExpandReferences."/>
- <Annotation Term="OData.Description" String="This term can be applied to a navigation property to specify that the default behavior for the Service is to expand the links to the related Resource or Resource Collection in responses."/>
+ <Annotation Term="OData.Description" String="This term can be applied to a navigation property to specify that the default behavior for the service is to expand the links to the related resource or resource collection in responses."/>
</Term>
<Term Name="AutoExpand" Type="Edm.Boolean" DefaultValue="true">
<Annotation Term="RedfishExtensions.v1_0_0.Deprecated" String="This term has been deprecated in favor of OData.AutoExpand."/>
- <Annotation Term="OData.Description" String="The term can be applied to a navigation property to specify that the default behavior for the Service is to expand the related Resource or Resource Collection in responses."/>
+ <Annotation Term="OData.Description" String="The term can be applied to a navigation property to specify that the default behavior for the service is to expand the related resource or resource collection in responses."/>
</Term>
<Term Name="IPv6Format" Type="Edm.Boolean" DefaultValue="true">
<Annotation Term="OData.Description" String="The term can be applied to a property or parameter to specify that IPv6 addressing rules apply to that property or parameter."/>
@@ -63,21 +63,21 @@
<Annotation Term="OData.Description" String="The term shall be applied to a property or value to specify that the property or value is deprecated. The string value should explain the deprecation, including new property or properties or value to use. The property or value can be supported in new and existing implementations, but usage in new implementations is discouraged. Deprecated properties and values are likely to be removed in a future major version of the schema."/>
</Term>
<Term Name="ActionInfo" Type="Edm.String">
- <Annotation Term="OData.Description" String="The term can be applied to an action to specify a URI to an ActionInfo Resource that describes the parameters supported by this instance of the action."/>
+ <Annotation Term="OData.Description" String="The term can be applied to an action to specify a URI to an ActionInfo resource that describes the parameters supported by this instance of the action."/>
<Annotation Term="OData.IsURL"/>
</Term>
<Term Name="DynamicPropertyPatterns" Type="Collection(RedfishExtensions.v1_0_0.PropertyPattern)" Nullable="false"/>
<Term Name="SetOnlyOnCreate" Type="Edm.Boolean" DefaultValue="true">
- <Annotation Term="OData.Description" String="The term specifies that a property can only be set when a client creates an instance of a Resource through POST."/>
+ <Annotation Term="OData.Description" String="The term specifies that a property can only be set when a client creates an instance of a resource through POST."/>
</Term>
<Term Name="OptionalOnCreate" Type="Edm.Boolean" DefaultValue="true">
- <Annotation Term="OData.Description" String="The term specifies that a property may be set when a client creates an instance of a Resource through POST."/>
+ <Annotation Term="OData.Description" String="The term specifies that a property can be set when a client creates an instance of a resource through POST."/>
</Term>
<Term Name="UpdatableAfterCreate" Type="Edm.Boolean" DefaultValue="true">
- <Annotation Term="OData.Description" String="The term specifies that a property may be set by a client that uses PATCH after it creates an instance of a Resource through POST."/>
+ <Annotation Term="OData.Description" String="The term specifies that a property can be set by a client that uses PATCH after it creates an instance of a resource through POST."/>
</Term>
<Term Name="CollectionCapabilities" Type="CollectionCapabilities.CollectionCapabilities">
- <Annotation Term="OData.Description" String="The link to the Resource that represents the POST capabilities of a collection."/>
+ <Annotation Term="OData.Description" String="The link to the resource that represents the POST capabilities of a collection."/>
</Term>
<Term Name="Confidential" Type="Edm.String">
<Annotation Term="OData.Description" String="The term specifies that a schema or property is un-released and confidential material that is not meant for public disclosure."/>
@@ -89,22 +89,22 @@
<Annotation Term="OData.Description" String="The term specifies the public release status of a property or schema."/>
</Term>
<Term Name="SettingsApplyTime" Type="Settings.PreferredApplyTime">
- <Annotation Term="OData.Description" String="The configuration settings for when the values in the settings object are applied to a Resource."/>
+ <Annotation Term="OData.Description" String="The configuration settings for when the values in the settings object are applied to a resource."/>
</Term>
<Term Name="OperationApplyTime" Type="Settings.OperationApplyTime">
<Annotation Term="OData.Description" String="The requested apply time from a client when performing a create, delete, or action operation."/>
</Term>
<Term Name="OperationApplyTimeSupport" Type="Settings.OperationApplyTimeSupport">
- <Annotation Term="OData.Description" String="An indication of whether a client can request an apply time for a create, delete, or action operation of a Resource through the OperationApplyTime term."/>
+ <Annotation Term="OData.Description" String="An indication of whether a client can request an apply time for a create, delete, or action operation of a resource through the OperationApplyTime term."/>
</Term>
<Term Name="MaintenanceWindow" Type="Settings.MaintenanceWindow">
- <Annotation Term="OData.Description" String="The maintenance window configuration for a Resource for when to apply settings or operations."/>
+ <Annotation Term="OData.Description" String="The maintenance window configuration for a resource for when to apply settings or operations."/>
</Term>
<Term Name="OwningEntity" Type="Edm.String">
<Annotation Term="OData.Description" String="The name of the entity responsible for development, publication, and maintenance of a schema. Possible values include `DMTF` or `SNIA`, or an OEM label from a Redfish OEM extension section."/>
</Term>
<Term Name="Uris" Type="Collection(Edm.String)">
- <Annotation Term="OData.Description" String="The term specifies the URIs that a Service can use for the Resource."/>
+ <Annotation Term="OData.Description" String="The term specifies the URIs that a service can use for the resource."/>
</Term>
<Term Name="RequestedCount" Type="Edm.Int64">
<Annotation Term="OData.Description" String="The term is used by a client to specify a request for a quantity of items."/>
@@ -113,31 +113,31 @@
<Annotation Term="OData.Description" String="The term specifies that a client is required to provide the @Redfish.RequestedCount term as part of the payload to specify a quantity of items."/>
</Term>
<Term Name="AllowOverprovisioning" Type="Edm.Boolean" DefaultValue="false">
- <Annotation Term="OData.Description" String="The term specifies that a client allows the Service to provide more Resources than requested, which includes, but is not limited to, a larger quantity of items, larger capacity, and faster devices."/>
- <Annotation Term="OData.LongDescription" String="The term shall specify that a client allows the Service to provide more Resources than requested, which includes, but is not limited to, a larger quantity of items, larger capacity, and faster devices. If not specified by the client, the Service shall treat this as `false`."/>
+ <Annotation Term="OData.Description" String="The term specifies that a client allows the service to provide more resources than requested, which includes, but is not limited to, a larger quantity of items, larger capacity, and faster devices."/>
+ <Annotation Term="OData.LongDescription" String="The term shall specify that a client allows the service to provide more resources than requested, which includes, but is not limited to, a larger quantity of items, larger capacity, and faster devices. If not specified by the client, the service shall treat this as `false`."/>
</Term>
<Term Name="ZoneAffinity" Type="Edm.String">
- <Annotation Term="OData.Description" String="The term specifies that a client requests that the Service fulfills a request with Resources available within a specific Zone Resource. The term value is the Id property of the Zone Resource."/>
- <Annotation Term="OData.LongDescription" String="The term shall specify that a client requests that the Service fulfills a request with Resources available in a specific Zone Resource. The term value shall contain the Id property of the Zone Resource. This term shall only be at the root level of the request payload."/>
+ <Annotation Term="OData.Description" String="The term specifies that a client requests that the service fulfills a request with resources available within a specific zone resource. The term value is the Id property of the zone resource."/>
+ <Annotation Term="OData.LongDescription" String="The term shall specify that a client requests that the service fulfills a request with resources available in a specific zone resource. The term value shall contain the Id property of the zone resource. This term shall only be at the root level of the request payload."/>
</Term>
<Term Name="Filter" Type="Edm.String">
<Annotation Term="OData.Description" String="The filter to apply to an array of objects when the values are copies of data elsewhere in the data model."/>
<Annotation Term="OData.LongDescription" String="The term shall specify a filter to apply to a set of objects used as the data source for an array. The term value shall follow the Redfish Specification-specified filter query parameter format. Items that match the filter shall appear in the resulting array, while items that do not match the filter shall be excluded from the results."/>
</Term>
<Term Name="Excerpt" Type="Edm.String">
- <Annotation Term="OData.Description" String="The term specifies that the property is a Excerpt data element that shall appear in objects marked as a Excerpt Copy when the term value matches the ExcerptCopy term type. The value shall contain a property name to use as a key, and the key property value, and only one key property can be defined for each Resource. If the term value is unspecified, the property shall appear in all ExcerptCopy instances."/>
+ <Annotation Term="OData.Description" String="The term specifies that the property is a excerpt data element that shall appear in objects marked as a excerpt copy when the term value matches the excerpt copy term type. The value shall contain a property name to use as a key, and the key property value, and only one key property can be defined for each resource. If the term value is unspecified, the property shall appear in all excerpt copy instances."/>
</Term>
<Term Name="ExcerptCopy" Type="Edm.String">
- <Annotation Term="OData.Description" String="The term specifies that the object or property definition is a copy of data from a source elsewhere in the data model, and that only properties marked as Excerpt in that linked definition shall be included. The term value shall contain the name of the specific Excerpt from the linked definition. If the term value is not defined, all Excerpt properties shall be copied from the linked definition."/>
+ <Annotation Term="OData.Description" String="The term specifies that the object or property definition is a copy of data from a source elsewhere in the data model, and that only properties marked as excerpt in that linked definition shall be included. The term value shall contain the name of the specific excerpt from the linked definition. If the term value is not defined, all excerpt properties shall be copied from the linked definition."/>
</Term>
<Term Name="ExcerptCopyOnly" Type="Edm.Boolean" DefaultValue="true">
- <Annotation Term="OData.Description" String="The term specifies that the property is a data element that shall appear only when the Resource definition is used as a copy (using the ExcerptCopy term), and shall not appear in the original data Resource."/>
+ <Annotation Term="OData.Description" String="The term specifies that the property is a data element that shall appear only when the resource definition is used as a copy, using the excerpt copy term, and shall not appear in the original data resource."/>
</Term>
<Term Name="SupportedCertificates" Type="Collection(Certificate.CertificateType)">
<Annotation Term="OData.Description" String="The term specifies the supported certificate formats for a given certificate collection."/>
</Term>
<Term Name="ResourceBlockLimits" Type="ResourceBlock.ResourceBlockLimits">
- <Annotation Term="OData.Description" String="The term specifies the allowable quantities of types of Resource Blocks for a composition request."/>
+ <Annotation Term="OData.Description" String="The term specifies the allowable quantities of types of resource blocks for a composition request."/>
</Term>
<Term Name="Language" Type="Edm.String" DefaultValue="en">
<Annotation Term="OData.Description" String="The term specifies the ISO 639-1 language code (Alpha-2) that matches the language used for the descriptive text in this schema file. If this term is not present, the default value shall be English (en)."/>