Update Redfish schemas to 2019.2
Note, the DMTF changed the format of the schema file pack yet again, so
the script changes now to compensate for that.
Tested:
Ran schema validator. One unrelated failure in LogEntry, and 4 new
warnings in PCIe devices (we're using a deprecated property). All other
endpoints pass.
Signed-off-by: Ed Tanous <ed.tanous@intel.com>
Change-Id: I81c030a7c5a6a32cc12a5e7e02a9441b7891bc5d
diff --git a/static/redfish/v1/schema/SerialInterface_v1.xml b/static/redfish/v1/schema/SerialInterface_v1.xml
index 63d65f9..c0e2a9b 100644
--- a/static/redfish/v1/schema/SerialInterface_v1.xml
+++ b/static/redfish/v1/schema/SerialInterface_v1.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!---->
<!--################################################################################ -->
-<!--# Redfish Schema: SerialInterface v1.1.3-->
+<!--# Redfish Schema: SerialInterface v1.1.5 -->
<!--# -->
<!--# For a detailed change log, see the README file contained in the DSP8010 bundle, -->
<!--# available at http://www.dmtf.org/standards/redfish -->
-<!--# Copyright 2014-2018 DMTF. -->
+<!--# Copyright 2014-2019 DMTF. -->
<!--# For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright -->
<!--################################################################################ -->
<!---->
@@ -30,8 +30,8 @@
<Annotation Term="Redfish.OwningEntity" String="DMTF"/>
<EntityType Name="SerialInterface" BaseType="Resource.v1_0_0.Resource" Abstract="true">
- <Annotation Term="OData.Description" String="This resource describes an asynchronous serial interface, such as an RS-232 interface, available to a system or device."/>
- <Annotation Term="OData.LongDescription" String="This resource shall be used to represent serial resources as part of the Redfish specification."/>
+ <Annotation Term="OData.Description" String="The SerialInterface schema describes an asynchronous serial interface, such as an RS-232 interface, available to a system or device."/>
+ <Annotation Term="OData.LongDescription" String="This Resource contains SerialInterface Resources as part of the Redfish Specification."/>
<Annotation Term="Capabilities.InsertRestrictions">
<Record>
<PropertyValue Property="Insertable" Bool="false"/>
@@ -40,7 +40,7 @@
<Annotation Term="Capabilities.UpdateRestrictions">
<Record>
<PropertyValue Property="Updatable" Bool="true"/>
- <Annotation Term="OData.Description" String="A Serial Interface can be updated to enable or disable it or to change the configuration."/>
+ <Annotation Term="OData.Description" String="Serial interfaces can be updated to enable or disable them or change their configuration."/>
</Record>
</Annotation>
<Annotation Term="Capabilities.DeleteRestrictions">
@@ -62,17 +62,15 @@
<Annotation Term="Redfish.Release" String="1.0"/>
<EntityType Name="SerialInterface" BaseType="SerialInterface.SerialInterface">
- <Annotation Term="OData.Description" String="This schema defines an asynchronous serial interface resource."/>
- <Annotation Term="OData.LongDescription" String="This resource shall be used to represent serial resources as part of the Redfish specification."/>
<Property Name="InterfaceEnabled" Type="Edm.Boolean">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
- <Annotation Term="OData.Description" String="This indicates whether this interface is enabled."/>
- <Annotation Term="OData.LongDescription" String="The value of this property shall be a boolean indicating whether this interface is enabled."/>
+ <Annotation Term="OData.Description" String="An indication of whether this interface is enabled."/>
+ <Annotation Term="OData.LongDescription" String="This property shall indicate whether this interface is enabled."/>
</Property>
<Property Name="SignalType" Type="SerialInterface.v1_0_0.SignalType" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
- <Annotation Term="OData.Description" String="The type of signal used for the communication connection - RS232 or RS485."/>
- <Annotation Term="OData.LongDescription" String="This property shall indicate the type of serial signalling that will be utilized for the serial connection."/>
+ <Annotation Term="OData.Description" String="The type of signal used for the communication connection."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the type of serial signalling in use for the serial connection."/>
</Property>
<Property Name="BitRate" Type="SerialInterface.v1_0_0.BitRate" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -81,12 +79,12 @@
</Property>
<Property Name="Parity" Type="SerialInterface.v1_0_0.Parity" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
- <Annotation Term="OData.Description" String="The type of parity used by the sender and receiver in order to detect errors over the serial connection."/>
+ <Annotation Term="OData.Description" String="The type of parity used by the sender and receiver to detect errors over the serial connection."/>
<Annotation Term="OData.LongDescription" String="This property shall indicate parity information for a serial connection."/>
</Property>
<Property Name="DataBits" Type="SerialInterface.v1_0_0.DataBits" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
- <Annotation Term="OData.Description" String="The number of data bits that will follow the start bit over the serial connection."/>
+ <Annotation Term="OData.Description" String="The number of data bits that follow the start bit over the serial connection."/>
<Annotation Term="OData.LongDescription" String="This property shall indicate number of data bits for the serial connection."/>
</Property>
<Property Name="StopBits" Type="SerialInterface.v1_0_0.StopBits" Nullable="false">
@@ -96,18 +94,18 @@
</Property>
<Property Name="FlowControl" Type="SerialInterface.v1_0_0.FlowControl" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
- <Annotation Term="OData.Description" String="The type of flow control, if any, that will be imposed on the serial connection."/>
+ <Annotation Term="OData.Description" String="The type of flow control, if any, that is imposed on the serial connection."/>
<Annotation Term="OData.LongDescription" String="This property shall indicate the flow control mechanism for the serial connection."/>
</Property>
<Property Name="ConnectorType" Type="SerialInterface.v1_0_0.ConnectorType" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
<Annotation Term="OData.Description" String="The type of connector used for this interface."/>
- <Annotation Term="OData.LongDescription" String="This property shall indicate the type of phyiscal connector used for this serial connection."/>
+ <Annotation Term="OData.LongDescription" String="This property shall indicate the type of physical connector used for this serial connection."/>
</Property>
<Property Name="PinOut" Type="SerialInterface.v1_0_0.PinOut">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
- <Annotation Term="OData.Description" String="The physical pin configuration needed for a serial connector."/>
- <Annotation Term="OData.LongDescription" String="This property shall indicate the physical pin out for the serial connection."/>
+ <Annotation Term="OData.Description" String="The physical pinout configuration for a serial connector."/>
+ <Annotation Term="OData.LongDescription" String="This property shall indicate the physical pinout for the serial connector."/>
</Property>
</EntityType>
@@ -186,19 +184,19 @@
<Collection>
<Record>
<PropertyValue Property="Member" String="5"/>
- <Annotation Term="OData.Description" String="5 bits of data following the start bit."/>
+ <Annotation Term="OData.Description" String="Five bits of data following the start bit."/>
</Record>
<Record>
<PropertyValue Property="Member" String="6"/>
- <Annotation Term="OData.Description" String="6 bits of data following the start bit."/>
+ <Annotation Term="OData.Description" String="Six bits of data following the start bit."/>
</Record>
<Record>
<PropertyValue Property="Member" String="7"/>
- <Annotation Term="OData.Description" String="7 bits of data following the start bit."/>
+ <Annotation Term="OData.Description" String="Seven bits of data following the start bit."/>
</Record>
<Record>
<PropertyValue Property="Member" String="8"/>
- <Annotation Term="OData.Description" String="8 bits of data following the start bit."/>
+ <Annotation Term="OData.Description" String="Eight bits of data following the start bit."/>
</Record>
</Collection>
</Annotation>
@@ -209,11 +207,11 @@
<Collection>
<Record>
<PropertyValue Property="Member" String="1"/>
- <Annotation Term="OData.Description" String="1 stop bit following the data bits."/>
+ <Annotation Term="OData.Description" String="One stop bit following the data bits."/>
</Record>
<Record>
<PropertyValue Property="Member" String="2"/>
- <Annotation Term="OData.Description" String="2 stop bits following the data bits."/>
+ <Annotation Term="OData.Description" String="Two stop bits following the data bits."/>
</Record>
</Collection>
</Annotation>
@@ -227,19 +225,19 @@
<Annotation Term="OData.Description" String="XON/XOFF in-band flow control imposed."/>
</Member>
<Member Name="Hardware">
- <Annotation Term="OData.Description" String="Out of band flow control imposed."/>
+ <Annotation Term="OData.Description" String="Out-of-band flow control imposed."/>
</Member>
</EnumType>
<EnumType Name="PinOut">
<Member Name="Cisco">
- <Annotation Term="OData.Description" String="The Cisco pin configuration."/>
+ <Annotation Term="OData.Description" String="The Cisco pinout configuration."/>
</Member>
<Member Name="Cyclades">
- <Annotation Term="OData.Description" String="The Cyclades pin configuration."/>
+ <Annotation Term="OData.Description" String="The Cyclades pinout configuration."/>
</Member>
<Member Name="Digi">
- <Annotation Term="OData.Description" String="The Digi pin configuration."/>
+ <Annotation Term="OData.Description" String="The Digi pinout configuration."/>
</Member>
</EnumType>
@@ -290,25 +288,25 @@
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SerialInterface.v1_0_2">
<Annotation Term="Redfish.OwningEntity" String="DMTF"/>
- <Annotation Term="OData.Description" String="This version was created to show annotations in previous namespaces were updated."/>
+ <Annotation Term="OData.Description" String="This version was created to show that annotations in previous namespaces were updated."/>
<EntityType Name="SerialInterface" BaseType="SerialInterface.v1_0_0.SerialInterface"/>
</Schema>
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SerialInterface.v1_0_3">
<Annotation Term="Redfish.OwningEntity" String="DMTF"/>
- <Annotation Term="OData.Description" String="This version was created to show annotations in previous namespaces were updated."/>
+ <Annotation Term="OData.Description" String="This version was created to show that annotations in previous namespaces were updated."/>
<EntityType Name="SerialInterface" BaseType="SerialInterface.v1_0_2.SerialInterface"/>
</Schema>
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SerialInterface.v1_0_4">
<Annotation Term="Redfish.OwningEntity" String="DMTF"/>
- <Annotation Term="OData.Description" String="This version was created to correct the ConnectorType enum values to match orginal publication."/>
+ <Annotation Term="OData.Description" String="This version was created to correct the ConnectorType enumerated values to match orginal publication."/>
<EntityType Name="SerialInterface" BaseType="SerialInterface.v1_0_3.SerialInterface"/>
</Schema>
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SerialInterface.v1_0_5">
<Annotation Term="Redfish.OwningEntity" String="DMTF"/>
- <Annotation Term="OData.Description" String="This version was created to add descriptions to various enum values."/>
+ <Annotation Term="OData.Description" String="This version was created to add descriptions to various enumerated values."/>
<EntityType Name="SerialInterface" BaseType="SerialInterface.v1_0_4.SerialInterface"/>
</Schema>
@@ -318,42 +316,54 @@
<EntityType Name="SerialInterface" BaseType="SerialInterface.v1_0_5.SerialInterface"/>
</Schema>
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SerialInterface.v1_0_7">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to force the regeneration of JSON Schema so that URI properties use the uri-reference format."/>
+ <EntityType Name="SerialInterface" BaseType="SerialInterface.v1_0_6.SerialInterface"/>
+ </Schema>
+
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SerialInterface.v1_0_8">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to update descriptions that this schema defines."/>
+ <EntityType Name="SerialInterface" BaseType="SerialInterface.v1_0_7.SerialInterface"/>
+ </Schema>
+
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SerialInterface.v1_1_0">
<Annotation Term="Redfish.OwningEntity" String="DMTF"/>
<Annotation Term="Redfish.Release" String="2017.1"/>
<EntityType Name="SerialInterface" BaseType="SerialInterface.v1_0_3.SerialInterface">
<Property Name="Actions" Type="SerialInterface.v1_1_0.Actions" Nullable="false">
- <Annotation Term="OData.Description" String="The available actions for this resource."/>
- <Annotation Term="OData.LongDescription" String="The Actions 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="SerialInterface.v1_1_0.OemActions" Nullable="false">
- <Annotation Term="OData.Description" String="This property contains the available OEM specific actions for this resource."/>
- <Annotation Term="OData.LongDescription" String="This property shall contain any additional OEM 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 any additional OEM 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>
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SerialInterface.v1_1_1">
<Annotation Term="Redfish.OwningEntity" String="DMTF"/>
- <Annotation Term="OData.Description" String="This version was created to correct the ConnectorType enum values to match orginal publication."/>
+ <Annotation Term="OData.Description" String="This version was created to correct the ConnectorType enumerated values to match orginal publication."/>
<EntityType Name="SerialInterface" BaseType="SerialInterface.v1_1_0.SerialInterface"/>
</Schema>
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SerialInterface.v1_1_2">
<Annotation Term="Redfish.OwningEntity" String="DMTF"/>
- <Annotation Term="OData.Description" String="This version was created to add descriptions to various enum values."/>
+ <Annotation Term="OData.Description" String="This version was created to add descriptions to various enumerated values."/>
<EntityType Name="SerialInterface" BaseType="SerialInterface.v1_1_1.SerialInterface"/>
</Schema>
@@ -363,5 +373,17 @@
<EntityType Name="SerialInterface" BaseType="SerialInterface.v1_1_2.SerialInterface"/>
</Schema>
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SerialInterface.v1_1_4">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to force the regeneration of JSON Schema so that URI properties use the uri-reference format."/>
+ <EntityType Name="SerialInterface" BaseType="SerialInterface.v1_1_3.SerialInterface"/>
+ </Schema>
+
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SerialInterface.v1_1_5">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to update descriptions that this schema defines."/>
+ <EntityType Name="SerialInterface" BaseType="SerialInterface.v1_1_4.SerialInterface"/>
+ </Schema>
+
</edmx:DataServices>
</edmx:Edmx>