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/Circuit_v1.xml b/static/redfish/v1/schema/Circuit_v1.xml
index 5b7df01..f2edb7b 100644
--- a/static/redfish/v1/schema/Circuit_v1.xml
+++ b/static/redfish/v1/schema/Circuit_v1.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!---->
<!--################################################################################ -->
-<!--# Redfish Schema: Circuit v1.0.0 -->
+<!--# Redfish Schema: Circuit v1.0.1 -->
<!--# -->
<!--# For a detailed change log, see the README file contained in the DSP8010 bundle, -->
<!--# available at http://www.dmtf.org/standards/redfish -->
@@ -74,29 +74,29 @@
</EntityType>
<Action Name="PowerControl" IsBound="true">
+ <Annotation Term="OData.Description" String="This action turns the circuit on or off."/>
+ <Annotation Term="OData.LongDescription" String="This action shall control the power state of the circuit."/>
<Parameter Name="Circuit" Type="Circuit.v1_0_0.Actions"/>
<Parameter Name="PowerState" Type="Resource.PowerState">
<Annotation Term="OData.Description" String="The desired power state of the circuit."/>
<Annotation Term="OData.LongDescription" String="This parameter shall contain the desired power state of the circuit."/>
</Parameter>
- <Annotation Term="OData.Description" String="This action turns the circuit on or off."/>
- <Annotation Term="OData.LongDescription" String="This action shall control the power state of the circuit."/>
</Action>
<Action Name="BreakerControl" IsBound="true">
+ <Annotation Term="OData.Description" String="This action attempts to reset the circuit breaker."/>
+ <Annotation Term="OData.LongDescription" String="This action shall control the state of the circuit breaker or over-current protection device."/>
<Parameter Name="Circuit" Type="Circuit.v1_0_0.Actions"/>
<Parameter Name="PowerState" Type="Circuit.PowerState">
<Annotation Term="OData.Description" String="The desired power state of the circuit if the breaker is reset successfully."/>
<Annotation Term="OData.LongDescription" String="This parameter shall contain the desired power state of the circuit."/>
</Parameter>
- <Annotation Term="OData.Description" String="This action attempts to reset the circuit breaker."/>
- <Annotation Term="OData.LongDescription" String="This action shall control the state of the circuit breaker or over-current protection device."/>
</Action>
<Action Name="ResetMetrics" IsBound="true">
- <Parameter Name="Circuit" Type="Circuit.v1_0_0.Actions"/>
<Annotation Term="OData.Description" String="This action resets metrics related to this circuit."/>
<Annotation Term="OData.LongDescription" String="This action shall reset any time intervals or counted values for this circuit."/>
+ <Parameter Name="Circuit" Type="Circuit.v1_0_0.Actions"/>
</Action>
<EnumType Name="PowerState">
@@ -436,7 +436,7 @@
<Property Name="PowerEnabled" Type="Edm.Boolean">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
<Annotation Term="OData.Description" String="Indicates if the circuit can be powered."/>
- <Annotation Term="OData.LongDescription" String="This property shall indicate the power enable state of the circuit. The value `true` shall indicate that the circuit may be powered on, and `false` shall indicate that the circuit cannot be powered."/>
+ <Annotation Term="OData.LongDescription" String="This property shall indicate the power enable state of the circuit. The value `true` shall indicate that the circuit can be powered on, and `false` shall indicate that the circuit cannot be powered."/>
</Property>
<NavigationProperty Name="Voltage" Type="Sensor.Sensor">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -486,7 +486,7 @@
</Property>
<Property Name="Links" Type="Circuit.v1_0_0.Links" Nullable="false">
<Annotation Term="OData.Description" String="The links to other resources that are related to this resource."/>
- <Annotation Term="OData.LongDescription" String="This property shall contain links to resources that are related to but are not contained by or subordinate to this resource."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."/>
</Property>
<Property Name="Actions" Type="Circuit.v1_0_0.Actions" Nullable="false">
<Annotation Term="OData.Description" String="The available actions for this resource."/>
@@ -496,7 +496,7 @@
<ComplexType Name="Links" BaseType="Resource.Links">
<Annotation Term="OData.Description" String="The links to other resources that are related to this resource."/>
- <Annotation Term="OData.LongDescription" String="This Redfish Specification-described type shall contain links to resources that are related to but are not contained by or subordinate to this resource."/>
+ <Annotation Term="OData.LongDescription" String="This Redfish Specification-described type shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."/>
<NavigationProperty Name="BranchCircuit" Type="Circuit.Circuit">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
<Annotation Term="OData.Description" String="A reference to the branch circuit related to this circuit."/>
@@ -706,7 +706,12 @@
<Annotation Term="OData.Description" String="Direct Current (DC) circuit."/>
</Member>
</EnumType>
+ </Schema>
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Circuit.v1_0_1">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+ <EntityType Name="Circuit" BaseType="Circuit.v1_0_0.Circuit"/>
</Schema>
</edmx:DataServices>