Move to 2020.3
Run the script update_schemas.py by pointing it to 2020.3
An overview of 2020.3 release can be found at:
https://www.dmtf.org/sites/default/files/Redfish_Release_2020.3_Overview.pdf
Tested: Loaded on a Witherspoon and Validator passed with the latest schemas
Signed-off-by: Asmitha Karunanithi <asmitk01@in.ibm.com>
Change-Id: I6c7a2e0cbdbe599930ba453a1d8c134c22136306
diff --git a/static/redfish/v1/schema/MetricDefinition_v1.xml b/static/redfish/v1/schema/MetricDefinition_v1.xml
index 4129c76..56752fc 100644
--- a/static/redfish/v1/schema/MetricDefinition_v1.xml
+++ b/static/redfish/v1/schema/MetricDefinition_v1.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!---->
<!--################################################################################ -->
-<!--# Redfish Schema: MetricDefinition v1.0.4 -->
+<!--# Redfish Schema: MetricDefinition v1.1.0 -->
<!--# -->
<!--# For a detailed change log, see the README file contained in the DSP8010 bundle, -->
<!--# available at http://www.dmtf.org/standards/redfish -->
@@ -180,8 +180,8 @@
</Property>
<Property Name="CalculationParameters" Type="Collection(MetricDefinition.v1_0_0.CalculationParamsType)">
- <Annotation Term="OData.Description" String="The metric properties that are part of the synthesis calculation. This property is present when the MetricType property is `Synthesized`."/>
- <Annotation Term="OData.LongDescription" String="This property shall list the metric properties that are part of the synthesis calculation. When MetricType=Synthesis, this property can be present."/>
+ <Annotation Term="OData.Description" String="The metric properties that are part of a calculation."/>
+ <Annotation Term="OData.LongDescription" String="This property shall list the metric properties that are part of a calculation. This property should be present when the value of the ImplementationType property is `Synthesized or `Calculated`."/>
</Property>
<Property Name="PhysicalContext" Type="PhysicalContext.PhysicalContext">
@@ -249,16 +249,16 @@
<ComplexType Name="CalculationParamsType">
<Annotation Term="OData.AdditionalProperties" Bool="false"/>
<Annotation Term="OData.Description" String="The usage of the parameter in the calculation."/>
- <Annotation Term="OData.LongDescription" String="The list element shall contain the usage of the parameter in the calculation. This property is present when the MetricType property is `Synthesized`."/>
+ <Annotation Term="OData.LongDescription" String="The list element shall contain the usage of the parameter in the calculation."/>
<Property Name="SourceMetric" Type="Edm.String">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
- <Annotation Term="OData.Description" String="The metric property used as the input into the calculation."/>
- <Annotation Term="OData.LongDescription" String="This property shall contain a link to a metric property used in a calcuation."/>
+ <Annotation Term="OData.Description" String="The metric property used as the input into the calculation. If the link has wildcards, the wildcards are substituted as specified in the Wildcards array property."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain a link to a metric property used in a calcuation. A set of curly braces shall delimit each wildcard in the URI. The corresponding entry in the Wildcard property shall replace each wildcard. After a URI with wildcards replaces its wildcards, it shall identify a resource property to which the metric definition applies. The property identifiers portion of the URI shall follow RFC6901-defined JSON fragment notation rules."/>
</Property>
<Property Name="ResultMetric" Type="Edm.String">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
- <Annotation Term="OData.Description" String="The link to a metric property that stores the result of the calculation."/>
- <Annotation Term="OData.LongDescription" String="This property shall contain a link to a metric property that stores the result of the calcuation."/>
+ <Annotation Term="OData.Description" String="The link to a metric property that stores the result of the calculation. If the link has wildcards, the wildcards are substituted as specified in the Wildcards array property."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain a link to a metric property that stores the result of the calcuation. A set of curly braces shall delimit each wildcard in the URI. The corresponding entry in the Wildcard property shall replace each wildcard. After a URI with wildcards replaces its wildcards, it shall identify a resource property to which the metric definition applies. The property identifiers portion of the URI shall follow RFC6901-defined JSON fragment notation rules."/>
</Property>
</ComplexType>
@@ -291,6 +291,18 @@
<Annotation Term="OData.Description" String="The metric is calculated as the minimum metric reading over a sliding time interval."/>
<Annotation Term="OData.LongDescription" String="The metric shall be calculated as the minimum metric reading over a sliding time interval. The time interval shall contain the CalculationTimeInterval property value."/>
</Member>
+ <Member Name="OEM">
+ <Annotation Term="OData.Description" String="The metric is calculated as specified by an OEM."/>
+ <Annotation Term="OData.LongDescription" String="The metric shall be calculated as specified by an OEM. The OEMCalculationAlgorithm property shall contain the specific OEM calculation algorithm."/>
+ <Annotation Term="Redfish.Revisions">
+ <Collection>
+ <Record>
+ <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+ <PropertyValue Property="Version" String="v1_1_0"/>
+ </Record>
+ </Collection>
+ </Annotation>
+ </Member>
</EnumType>
<ComplexType Name="Actions">
@@ -334,5 +346,25 @@
<EntityType Name="MetricDefinition" BaseType="MetricDefinition.v1_0_3.MetricDefinition"/>
</Schema>
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricDefinition.v1_0_5">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to update the descriptions for CalculationParameters."/>
+ <EntityType Name="MetricDefinition" BaseType="MetricDefinition.v1_0_4.MetricDefinition"/>
+ </Schema>
+
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricDefinition.v1_1_0">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="Redfish.Release" String="2020.3"/>
+ <Annotation Term="OData.Description" String="This version was created to remove to add `OEM` to CalculationAlgorithm."/>
+
+ <EntityType Name="MetricDefinition" BaseType="MetricDefinition.v1_0_5.MetricDefinition">
+ <Property Name="OEMCalculationAlgorithm" Type="Edm.String">
+ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+ <Annotation Term="OData.Description" String="The OEM-defined calculation that is performed on a source metric to obtain the metric being defined."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the OEM-defined calculation performed to obtain the metric. This property shall be present if CalculationAlgorithm is `OEM`."/>
+ </Property>
+ </EntityType>
+ </Schema>
+
</edmx:DataServices>
</edmx:Edmx>