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/RedfishError_v1.xml b/static/redfish/v1/schema/RedfishError_v1.xml
index 5f6f816..7faaec3 100644
--- a/static/redfish/v1/schema/RedfishError_v1.xml
+++ b/static/redfish/v1/schema/RedfishError_v1.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!---->
<!--################################################################################ -->
-<!--# Redfish Schema: RedfishError v1.0.0-->
+<!--# Redfish Schema: RedfishError v1.0.0 -->
<!--# -->
<!--# 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 -->
<!--################################################################################ -->
<!---->
@@ -25,33 +25,38 @@
<ComplexType Name="RedfishError">
<Annotation Term="OData.AdditionalProperties" Bool="false"/>
- <Annotation Term="OData.Description" String="Contains an error payload from a Redfish Service."/>
- <Annotation Term="OData.LongDescription" String="This type, as described by the Redfish Specification, shall contain an error payload from a Redfish Service."/>
+ <Annotation Term="OData.Description" String="The error payload from a Redfish Service."/>
+ <Annotation Term="OData.LongDescription" String="The Redfish Specification-described type shall contain an error payload from a Redfish Service."/>
<Property Name="error" Type="RedfishError.v1_0_0.RedfishErrorContents" Nullable="false">
- <Annotation Term="OData.Description" String="Contains properties used to describe an error from a Redfish Service."/>
- <Annotation Term="OData.LongDescription" String="This property, as described by the Redfish Specification, shall contain properties used to describe an error from a Redfish Service."/>
- <Annotation Term="Redfish.Required"/>
+ <Annotation Term="OData.Description" String="The properties that describe an error from a Redfish Service."/>
+ <Annotation Term="OData.LongDescription" String="This property, as described by the Redfish Specification, shall contain properties that describe an error from a Redfish Service."/>
+ <Annotation Term="Redfish.Required"/>
</Property>
</ComplexType>
<ComplexType Name="RedfishErrorContents">
<Annotation Term="OData.AdditionalProperties" Bool="false"/>
- <Annotation Term="OData.Description" String="Contains properties used to describe an error from a Redfish Service."/>
- <Annotation Term="OData.LongDescription" String="This type, as described by the Redfish Specification, shall contain properties used to describe an error from a Redfish Service."/>
+ <Annotation Term="OData.Description" String="The properties that describe an error from a Redfish Service."/>
+ <Annotation Term="OData.LongDescription" String="The Redfish Specification-described type shall contain properties that describe an error from a Redfish Service."/>
<Property Name="code" Type="Edm.String" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
- <Annotation Term="OData.Description" String="A string indicating a specific MessageId from the message registry."/>
- <Annotation Term="OData.LongDescription" String="This property shall be a string indicating a specific MessageId from the message registry."/>
+ <Annotation Term="OData.Description" String="A string indicating a specific MessageId from a Message Registry."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain a string indicating a specific MessageId from a Message Registry."/>
<Annotation Term="Redfish.Required"/>
</Property>
<Property Name="message" Type="Edm.String" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
- <Annotation Term="OData.Description" String="A human-readable error message corresponding to the message in the message registry."/>
- <Annotation Term="OData.LongDescription" String="This property shall be a human-readable error message corresponding to the message in the message registry."/>
+ <Annotation Term="OData.Description" String="A human-readable error message corresponding to the message in a Message Registry."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain a human-readable error message corresponding to the message in a Message Registry."/>
<Annotation Term="Redfish.Required"/>
</Property>
</ComplexType>
</Schema>
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="RedfishError.v1_0_1">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to update descriptions that this schema defines."/>
+ </Schema>
+
</edmx:DataServices>
</edmx:Edmx>