diff options
| author | Sui Chen <suichen@google.com> | 2022-02-04 09:01:27 +0300 |
|---|---|---|
| committer | Ed Tanous <ed@tanous.net> | 2022-02-10 06:24:10 +0300 |
| commit | 141d943157442558a78f8d4b06328d849d6df5e5 (patch) | |
| tree | 3fca81939bc3ab94b322be5e7a4de37a7a8925ec /static/redfish/v1/schema | |
| parent | 9eb808c1a84a76e92b0e01fa95d3f160f38d7c3f (diff) | |
| download | bmcweb-141d943157442558a78f8d4b06328d849d6df5e5.tar.xz | |
Update schema pack to 2021.4
Update the script to point to 2021.4.
Tested: built for evb-ast2500, ran Redfish Service Validator:
BASE 2021.4
metadataNamespaces: 2330 2388
pass: 3239 3249
passAction: 8 8
passGet: 120 121
passRedfishUri: 114 115
skipNoSchema: 3 3
skipOptional: 2180 2184
unverifiedAdditional.complex: 2 0
warnDeprecated: 315 315
warningPresent: 12 11
Validation has: succeeded succeeded
Saw new schemas:
curl -k https://$bmc/redfish/v1/JsonSchemas/Manager/Manager.json
...
"title": "#Manager.v1_14_0.Manager"
}
Signed-off-by: Sui Chen <suichen@google.com>
Change-Id: I6560ec010362df28e264d80452059b534b3f89ba
Diffstat (limited to 'static/redfish/v1/schema')
20 files changed, 859 insertions, 72 deletions
diff --git a/static/redfish/v1/schema/Cable_v1.xml b/static/redfish/v1/schema/Cable_v1.xml index feadc62a90..b309633093 100644 --- a/static/redfish/v1/schema/Cable_v1.xml +++ b/static/redfish/v1/schema/Cable_v1.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!----> <!--################################################################################ --> -<!--# Redfish Schema: Cable v1.1.0 --> +<!--# Redfish Schema: Cable v1.2.0 --> <!--# --> <!--# For a detailed change log, see the README file contained in the DSP8010 bundle, --> <!--# available at http://www.dmtf.org/standards/redfish --> @@ -263,6 +263,28 @@ <Member Name="QSFP"> <Annotation Term="OData.Description" String="This cable connects to a QSFP connector."/> </Member> + <Member Name="CDFP"> + <Annotation Term="OData.Description" String="This cable connects to a CDFP connector."/> + <Annotation Term="Redfish.Revisions"> + <Collection> + <Record> + <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/> + <PropertyValue Property="Version" String="v1_2_0"/> + </Record> + </Collection> + </Annotation> + </Member> + <Member Name="OSFP"> + <Annotation Term="OData.Description" String="This cable connects to a OSFP connector."/> + <Annotation Term="Redfish.Revisions"> + <Collection> + <Record> + <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/> + <PropertyValue Property="Version" String="v1_2_0"/> + </Record> + </Collection> + </Annotation> + </Member> </EnumType> <EnumType Name="CableStatus"> @@ -363,5 +385,13 @@ </EntityType> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Cable.v1_2_0"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="Redfish.Release" String="2021.4"/> + <Annotation Term="OData.Description" String="This version was created to add `CDFP` and `OSFP` to ConnectorType."/> + + <EntityType Name="Cable" BaseType="Cable.v1_1_0.Cable"/> + </Schema> + </edmx:DataServices> </edmx:Edmx> diff --git a/static/redfish/v1/schema/Chassis_v1.xml b/static/redfish/v1/schema/Chassis_v1.xml index 824c4af00c..a3f782d3fd 100644 --- a/static/redfish/v1/schema/Chassis_v1.xml +++ b/static/redfish/v1/schema/Chassis_v1.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!----> <!--################################################################################ --> -<!--# Redfish Schema: Chassis v1.18.0 --> +<!--# Redfish Schema: Chassis v1.19.0 --> <!--# --> <!--# For a detailed change log, see the README file contained in the DSP8010 bundle, --> <!--# available at http://www.dmtf.org/standards/redfish --> @@ -1546,6 +1546,15 @@ <Property Name="Measurements" Type="Collection(SoftwareInventory.MeasurementBlock)" Nullable="false"> <Annotation Term="OData.Description" String="An array of DSP0274-defined measurement blocks."/> <Annotation Term="OData.LongDescription" String="This property shall contain an array of DSP0274-defined measurement blocks."/> + <Annotation Term="Redfish.Revisions"> + <Collection> + <Record> + <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/> + <PropertyValue Property="Version" String="v1_19_0"/> + <PropertyValue Property="Description" String="This property has been deprecated in favor of the ComponentIntegrity resource."/> + </Record> + </Collection> + </Annotation> </Property> </EntityType> </Schema> @@ -1621,5 +1630,13 @@ </ComplexType> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Chassis.v1_19_0"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="Redfish.Release" String="2021.4"/> + <Annotation Term="OData.Description" String="This version was created to deprecate Measurements in favor of measurement reporting in the ComponentIntegrity resource."/> + + <EntityType Name="Chassis" BaseType="Chassis.v1_18_0.Chassis"/> + </Schema> + </edmx:DataServices> </edmx:Edmx> diff --git a/static/redfish/v1/schema/ComputerSystem_v1.xml b/static/redfish/v1/schema/ComputerSystem_v1.xml index c3e68dffaa..39802b4203 100644 --- a/static/redfish/v1/schema/ComputerSystem_v1.xml +++ b/static/redfish/v1/schema/ComputerSystem_v1.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!----> <!--################################################################################ --> -<!--# Redfish Schema: ComputerSystem v1.16.0 --> +<!--# Redfish Schema: ComputerSystem v1.17.0 --> <!--# --> <!--# For a detailed change log, see the README file contained in the DSP8010 bundle, --> <!--# available at http://www.dmtf.org/standards/redfish --> @@ -109,6 +109,9 @@ <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/USBControllerCollection_v1.xml"> <edmx:Include Namespace="USBControllerCollection"/> </edmx:Reference> + <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/NetworkDeviceFunction_v1.xml"> + <edmx:Include Namespace="NetworkDeviceFunction"/> + </edmx:Reference> <edmx:DataServices> @@ -2305,6 +2308,15 @@ <Property Name="Measurements" Type="Collection(SoftwareInventory.MeasurementBlock)" Nullable="false"> <Annotation Term="OData.Description" String="An array of DSP0274-defined measurement blocks."/> <Annotation Term="OData.LongDescription" String="This property shall contain an array of DSP0274-defined measurement blocks."/> + <Annotation Term="Redfish.Revisions"> + <Collection> + <Record> + <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/> + <PropertyValue Property="Version" String="v1_17_0"/> + <PropertyValue Property="Description" String="This property has been deprecated in favor of the ComponentIntegrity resource."/> + </Record> + </Collection> + </Annotation> </Property> </EntityType> @@ -2539,5 +2551,22 @@ <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_16_0.ComputerSystem"/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_17_0"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="Redfish.Release" String="2021.4"/> + <Annotation Term="OData.Description" String="This version was created to deprecate Measurements in favor of measurement reporting in the ComponentIntegrity resource."/> + + <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_16_1.ComputerSystem"/> + + <ComplexType Name="Links" BaseType="ComputerSystem.v1_5_0.Links"> + <NavigationProperty Name="OffloadedNetworkDeviceFunctions" Type="Collection(NetworkDeviceFunction.NetworkDeviceFunction)"> + <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> + <Annotation Term="OData.Description" String="The network device functions to which this system performs offload computation, such as with a SmartNIC."/> + <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources of type NetworkDeviceFunction that represent the network device functions to which this system performs offload computation, such as with a SmartNIC. This property shall not be present if the SystemType property does not contain `DPU`."/> + <Annotation Term="OData.AutoExpandReferences"/> + </NavigationProperty> + </ComplexType> + </Schema> + </edmx:DataServices> </edmx:Edmx> diff --git a/static/redfish/v1/schema/Drive_v1.xml b/static/redfish/v1/schema/Drive_v1.xml index ab78681356..1f27fe27f7 100644 --- a/static/redfish/v1/schema/Drive_v1.xml +++ b/static/redfish/v1/schema/Drive_v1.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!----> <!--################################################################################ --> -<!--# Redfish Schema: Drive v1.13.0 --> +<!--# Redfish Schema: Drive v1.14.0 --> <!--# --> <!--# For a detailed change log, see the README file contained in the DSP8010 bundle, --> <!--# available at http://www.dmtf.org/standards/redfish --> @@ -63,6 +63,9 @@ <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Storage_v1.xml"> <edmx:Include Namespace="Storage"/> </edmx:Reference> + <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/NetworkDeviceFunction_v1.xml"> + <edmx:Include Namespace="NetworkDeviceFunction"/> + </edmx:Reference> <edmx:DataServices> @@ -247,7 +250,7 @@ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> <Annotation Term="OData.Description" String="The rotation speed of this drive, in revolutions per minute (RPM)."/> <Annotation Term="OData.LongDescription" String="This property shall contain the rotation speed, in revolutions per minute (RPM), of the associated drive."/> - <Annotation Term="Measures.Unit" String="RPM"/> + <Annotation Term="Measures.Unit" String="{rev}/min"/> </Property> <Property Name="BlockSizeBytes" Type="Edm.Int64"> <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> @@ -487,6 +490,12 @@ <EntityType Name="Drive" BaseType="Drive.v1_0_12.Drive"/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_0_14"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to correct the units annotation value for RotationSpeedRPM to match the available UCUM format."/> + <EntityType Name="Drive" BaseType="Drive.v1_0_13.Drive"/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_1_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2016.2"/> @@ -602,6 +611,12 @@ <EntityType Name="Drive" BaseType="Drive.v1_1_11.Drive"/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_1_13"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to correct the units annotation value for RotationSpeedRPM to match the available UCUM format."/> + <EntityType Name="Drive" BaseType="Drive.v1_1_12.Drive"/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_2_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2017.1"/> @@ -678,6 +693,12 @@ <EntityType Name="Drive" BaseType="Drive.v1_2_9.Drive"/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_2_11"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to correct the units annotation value for RotationSpeedRPM to match the available UCUM format."/> + <EntityType Name="Drive" BaseType="Drive.v1_2_10.Drive"/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_3_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2017.3"/> @@ -746,6 +767,12 @@ <EntityType Name="Drive" BaseType="Drive.v1_3_8.Drive"/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_3_10"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to correct the units annotation value for RotationSpeedRPM to match the available UCUM format."/> + <EntityType Name="Drive" BaseType="Drive.v1_3_9.Drive"/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_4_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2018.1"/> @@ -812,6 +839,12 @@ <EntityType Name="Drive" BaseType="Drive.v1_4_8.Drive"/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_4_10"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to correct the units annotation value for RotationSpeedRPM to match the available UCUM format."/> + <EntityType Name="Drive" BaseType="Drive.v1_4_9.Drive"/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_5_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2018.2"/> @@ -882,6 +915,12 @@ <EntityType Name="Drive" BaseType="Drive.v1_5_7.Drive"/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_5_9"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to correct the units annotation value for RotationSpeedRPM to match the available UCUM format."/> + <EntityType Name="Drive" BaseType="Drive.v1_5_8.Drive"/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_6_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2019.1"/> @@ -933,6 +972,12 @@ <EntityType Name="Drive" BaseType="Drive.v1_6_5.Drive"/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_6_7"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to correct the units annotation value for RotationSpeedRPM to match the available UCUM format."/> + <EntityType Name="Drive" BaseType="Drive.v1_6_6.Drive"/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_7_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2019.2"/> @@ -977,6 +1022,12 @@ <EntityType Name="Drive" BaseType="Drive.v1_7_4.Drive"/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_7_6"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to correct the units annotation value for RotationSpeedRPM to match the available UCUM format."/> + <EntityType Name="Drive" BaseType="Drive.v1_7_5.Drive"/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_8_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2019.3"/> @@ -1023,6 +1074,12 @@ <EntityType Name="Drive" BaseType="Drive.v1_8_4.Drive"/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_8_6"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to correct the units annotation value for RotationSpeedRPM to match the available UCUM format."/> + <EntityType Name="Drive" BaseType="Drive.v1_8_5.Drive"/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_9_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2019.4"/> @@ -1067,6 +1124,12 @@ <EntityType Name="Drive" BaseType="Drive.v1_9_4.Drive"/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_9_6"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to correct the units annotation value for RotationSpeedRPM to match the available UCUM format."/> + <EntityType Name="Drive" BaseType="Drive.v1_9_5.Drive"/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_10_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2020.2"/> @@ -1099,6 +1162,12 @@ <EntityType Name="Drive" BaseType="Drive.v1_10_2.Drive"/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_10_4"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to correct the units annotation value for RotationSpeedRPM to match the available UCUM format."/> + <EntityType Name="Drive" BaseType="Drive.v1_10_3.Drive"/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_11_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2020.3"/> @@ -1131,6 +1200,12 @@ <EntityType Name="Drive" BaseType="Drive.v1_11_2.Drive"/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_11_4"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to correct the units annotation value for RotationSpeedRPM to match the available UCUM format."/> + <EntityType Name="Drive" BaseType="Drive.v1_11_3.Drive"/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_12_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2020.4"/> @@ -1152,6 +1227,15 @@ <Property Name="Measurements" Type="Collection(SoftwareInventory.MeasurementBlock)" Nullable="false"> <Annotation Term="OData.Description" String="An array of DSP0274-defined measurement blocks."/> <Annotation Term="OData.LongDescription" String="This property shall contain an array of DSP0274-defined measurement blocks."/> + <Annotation Term="Redfish.Revisions"> + <Collection> + <Record> + <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/> + <PropertyValue Property="Version" String="v1_14_0"/> + <PropertyValue Property="Description" String="This property has been deprecated in favor of the ComponentIntegrity resource."/> + </Record> + </Collection> + </Annotation> </Property> </EntityType> </Schema> @@ -1168,6 +1252,12 @@ <EntityType Name="Drive" BaseType="Drive.v1_12_1.Drive"/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_12_3"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to correct the units annotation value for RotationSpeedRPM to match the available UCUM format."/> + <EntityType Name="Drive" BaseType="Drive.v1_12_2.Drive"/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_13_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2021.2"/> @@ -1184,5 +1274,28 @@ </ComplexType> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_13_1"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to correct the units annotation value for RotationSpeedRPM to match the available UCUM format."/> + <EntityType Name="Drive" BaseType="Drive.v1_13_0.Drive"/> + </Schema> + + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_14_0"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="Redfish.Release" String="2021.4"/> + <Annotation Term="OData.Description" String="This version was created to deprecate Measurements in favor of measurement reporting in the ComponentIntegrity resource."/> + + <EntityType Name="Drive" BaseType="Drive.v1_13_1.Drive"/> + + <ComplexType Name="Links" BaseType="Drive.v1_13_0.Links"> + <NavigationProperty Name="NetworkDeviceFunctions" Type="Collection(NetworkDeviceFunction.NetworkDeviceFunction)"> + <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> + <Annotation Term="OData.Description" String="An array of links to the network device functions that provide network connectivity for this drive."/> + <Annotation Term="OData.LongDescription" String="This property shall contain the array of links to resources of type NetworkDeviceFunction. This property should only be present for drives with network connectivity, such as Ethernet attached drives."/> + <Annotation Term="OData.AutoExpandReferences"/> + </NavigationProperty> + </ComplexType> + </Schema> + </edmx:DataServices> </edmx:Edmx> diff --git a/static/redfish/v1/schema/EthernetInterface_v1.xml b/static/redfish/v1/schema/EthernetInterface_v1.xml index 4a06ec4f55..7a9b302e26 100644 --- a/static/redfish/v1/schema/EthernetInterface_v1.xml +++ b/static/redfish/v1/schema/EthernetInterface_v1.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!----> <!--################################################################################ --> -<!--# Redfish Schema: EthernetInterface v1.7.0 --> +<!--# Redfish Schema: EthernetInterface v1.8.0 --> <!--# --> <!--# For a detailed change log, see the README file contained in the DSP8010 bundle, --> <!--# available at http://www.dmtf.org/standards/redfish --> @@ -652,7 +652,7 @@ <Property Name="OperatingMode" Type="EthernetInterface.v1_4_0.DHCPv6OperatingMode"> <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/> <Annotation Term="OData.Description" String="Determines the DHCPv6 operating mode for this interface."/> - <Annotation Term="OData.LongDescription" String="This property shall control the operating mode of DHCPv6 on this interface. DHCPv6 stateful mode configures addresses, and when it is enabled, stateless mode is also implicitly enabled."/> + <Annotation Term="OData.LongDescription" String="This property shall control the operating mode of DHCPv6 on this interface."/> </Property> <Property Name="UseDNSServers" Type="Edm.Boolean"> <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/> @@ -661,8 +661,8 @@ </Property> <Property Name="UseDomainName" Type="Edm.Boolean"> <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/> - <Annotation Term="OData.Description" String="An indication of whether the interface uses a domain name supplied through DHCP v6 stateless mode."/> - <Annotation Term="OData.LongDescription" String="This property shall indicate whether the interface uses a domain name supplied through DHCP v6 stateless mode."/> + <Annotation Term="OData.Description" String="An indication of whether this interface uses a DHCP v6-supplied domain name."/> + <Annotation Term="OData.LongDescription" String="This property shall indicate whether the interface uses a DHCP v6-supplied domain name."/> </Property> <Property Name="UseNTPServers" Type="Edm.Boolean"> <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/> @@ -679,16 +679,46 @@ <EnumType Name="DHCPv6OperatingMode"> <Member Name="Stateful"> <Annotation Term="OData.Description" String="DHCPv6 stateful mode."/> - <Annotation Term="OData.LongDescription" String="DHCPv6 shall operate in stateful mode on this interface. DHCPv6 stateful mode configures addresses, and when it is enabled, stateless mode is also implicitly enabled."/> + <Annotation Term="OData.LongDescription" String="DHCPv6 shall operate in stateful mode on this interface. DHCPv6 stateful mode configures addresses, and when it is enabled, stateless mode is also implicitly enabled. Services may replace this value with `Enabled`."/> + <Annotation Term="Redfish.Revisions"> + <Collection> + <Record> + <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/> + <PropertyValue Property="Version" String="v1_8_0"/> + <PropertyValue Property="Description" String="This property has been deprecated in favor of `Enabled`. The control between 'stateful' and 'stateless' is managed by the DHCP server and not the client."/> + </Record> + </Collection> + </Annotation> </Member> <Member Name="Stateless"> <Annotation Term="OData.Description" String="DHCPv6 stateless mode."/> - <Annotation Term="OData.LongDescription" String="DHCPv6 shall operate in stateless mode on this interface. DHCPv6 stateless mode allows configuring the interface using DHCP options but does not configure addresses. It is always enabled by default whenever DHCPv6 Stateful mode is also enabled."/> + <Annotation Term="OData.LongDescription" String="DHCPv6 shall operate in stateless mode on this interface. DHCPv6 stateless mode allows configuring the interface using DHCP options but does not configure addresses. It is always enabled by default whenever DHCPv6 Stateful mode is also enabled. Services may replace this value with `Enabled`."/> + <Annotation Term="Redfish.Revisions"> + <Collection> + <Record> + <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/> + <PropertyValue Property="Version" String="v1_8_0"/> + <PropertyValue Property="Description" String="This property has been deprecated in favor of `Enabled`. The control between 'stateful' and 'stateless' is managed by the DHCP server and not the client."/> + </Record> + </Collection> + </Annotation> </Member> <Member Name="Disabled"> <Annotation Term="OData.Description" String="DHCPv6 is disabled."/> <Annotation Term="OData.LongDescription" String="DHCPv6 shall be disabled for this interface."/> </Member> + <Member Name="Enabled"> + <Annotation Term="OData.Description" String="DHCPv6 is enabled."/> + <Annotation Term="OData.LongDescription" String="DHCPv6 shall be enabled for this interface."/> + <Annotation Term="Redfish.Revisions"> + <Collection> + <Record> + <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/> + <PropertyValue Property="Version" String="v1_8_0"/> + </Record> + </Collection> + </Annotation> + </Member> </EnumType> <ComplexType Name="StatelessAddressAutoConfiguration"> @@ -892,6 +922,7 @@ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2021.2"/> <Annotation Term="OData.Description" String="This version was created to deprecate several properties and add NetworkDeviceFunctions link collection."/> + <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_6_4.EthernetInterface"/> <ComplexType Name="Links" BaseType="EthernetInterface.v1_6_0.Links"> @@ -904,5 +935,13 @@ </ComplexType> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_8_0"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="Redfish.Release" String="2021.2"/> + <Annotation Term="OData.Description" String="This version was created to deprecate the `Stateless` and `Stateful` values for DHCPv6 OperatingMode and add `Enabled` to DHCPv6 OperatingMode."/> + + <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_7_0.EthernetInterface"/> + </Schema> + </edmx:DataServices> </edmx:Edmx> diff --git a/static/redfish/v1/schema/EventDestination_v1.xml b/static/redfish/v1/schema/EventDestination_v1.xml index d04cfd4317..b23c084207 100644 --- a/static/redfish/v1/schema/EventDestination_v1.xml +++ b/static/redfish/v1/schema/EventDestination_v1.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!----> <!--################################################################################ --> -<!--# Redfish Schema: EventDestination v1.11.1 --> +<!--# Redfish Schema: EventDestination v1.11.2 --> <!--# --> <!--# For a detailed change log, see the README file contained in the DSP8010 bundle, --> <!--# available at http://www.dmtf.org/standards/redfish --> @@ -921,7 +921,7 @@ <Property Name="VerifyCertificate" Type="Edm.Boolean"> <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/> <Annotation Term="OData.Description" String="An indication of whether the service will verify the certificate of the server referenced by the Destination property prior to sending the event."/> - <Annotation Term="OData.LongDescription" String="This property shall indicate whether whether the service will verify the certificate of the server referenced by the Destination property prior to sending the event."/> + <Annotation Term="OData.LongDescription" String="This property shall indicate whether whether the service will verify the certificate of the server referenced by the Destination property prior to sending the event. If this property is not supported by the service or specified by the client in the create request, it shall be assumed to be `false`."/> </Property> <Property Name="SyslogFilters" Type="Collection(EventDestination.v1_9_0.SyslogFilter)"> <Annotation Term="OData.Description" String="A list of filters applied to syslog messages before sending to a remote syslog server. An empty list indicates all syslog messages are sent."/> @@ -1089,6 +1089,12 @@ <EntityType Name="EventDestination" BaseType="EventDestination.v1_9_3.EventDestination"/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_9_5"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to clarify the behavior of VerifyCertificate when not supported or specified."/> + <EntityType Name="EventDestination" BaseType="EventDestination.v1_9_4.EventDestination"/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_10_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="OData.Description" String="This version was created to add additional SNMP authentication protocols and to provide better description for the authentication and encryption keys. It also added `RetryForeverWithBackoff` to DeliveryRetryPolicy and long description details to the DeliveryRetryPolicy values."/> @@ -1128,6 +1134,12 @@ <EntityType Name="EventDestination" BaseType="EventDestination.v1_10_2.EventDestination"/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_10_4"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to clarify the behavior of VerifyCertificate when not supported or specified."/> + <EntityType Name="EventDestination" BaseType="EventDestination.v1_10_3.EventDestination"/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_11_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2021.2"/> @@ -1160,5 +1172,11 @@ <EntityType Name="EventDestination" BaseType="EventDestination.v1_11_0.EventDestination"/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_11_2"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to clarify the behavior of VerifyCertificate when not supported or specified."/> + <EntityType Name="EventDestination" BaseType="EventDestination.v1_11_1.EventDestination"/> + </Schema> + </edmx:DataServices> </edmx:Edmx> diff --git a/static/redfish/v1/schema/LogEntry_v1.xml b/static/redfish/v1/schema/LogEntry_v1.xml index 7305253785..1725591b90 100644 --- a/static/redfish/v1/schema/LogEntry_v1.xml +++ b/static/redfish/v1/schema/LogEntry_v1.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!----> <!--################################################################################ --> -<!--# Redfish Schema: LogEntry v1.10.0 --> +<!--# Redfish Schema: LogEntry v1.11.0 --> <!--# --> <!--# For a detailed change log, see the README file contained in the DSP8010 bundle, --> <!--# available at http://www.dmtf.org/standards/redfish --> @@ -1196,11 +1196,17 @@ <Property Name="Resolution" Type="Edm.String" Nullable="false"> <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> <Annotation Term="OData.Description" String="Used to provide suggestions on how to resolve the situation that caused the log entry."/> - <Annotation Term="OData.LongDescription" String="This property shall contain the resolution of the log entry. Services can replace the resolution defined in the message registry with a more specific resolution in a log entry."/> + <Annotation Term="OData.LongDescription" String="This property shall contain the resolution of the log entry. Services should replace the resolution defined in the message registry with a more specific resolution in a log entry."/> </Property> </EntityType> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_9_1"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to update description for Resolution to recommend that an appropriate resolution is used."/> + <EntityType Name="LogEntry" BaseType="LogEntry.v1_9_0.LogEntry"/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_10_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2021.3"/> @@ -1209,5 +1215,41 @@ <EntityType Name="LogEntry" BaseType="LogEntry.v1_9_0.LogEntry"/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_10_1"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to update description for Resolution to recommend that an appropriate resolution is used."/> + <EntityType Name="LogEntry" BaseType="LogEntry.v1_10_0.LogEntry"/> + </Schema> + + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_11_0"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="Redfish.Release" String="2021.4"/> + + <EntityType Name="LogEntry" BaseType="LogEntry.v1_10_1.LogEntry"> + <Property Name="Originator" Type="Edm.String" Nullable="false"> + <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> + <Annotation Term="OData.Description" String="The source of the log entry."/> + <Annotation Term="OData.LongDescription" String="This property shall contain the source of the log entry."/> + </Property> + <Property Name="OriginatorType" Type="LogEntry.v1_11_0.OriginatorTypes" Nullable="false"> + <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> + <Annotation Term="OData.Description" String="The type of originator data."/> + <Annotation Term="OData.LongDescription" String="This property shall contain the type of originator data."/> + </Property> + </EntityType> + + <EnumType Name="OriginatorTypes"> + <Member Name="Client"> + <Annotation Term="OData.Description" String="A client of the service created this log entry."/> + </Member> + <Member Name="Internal"> + <Annotation Term="OData.Description" String="A process running on the service created this log entry."/> + </Member> + <Member Name="SupportingService"> + <Annotation Term="OData.Description" String="A process not running on the service but running on a supporting service, such as RDE implementations, UEFI, or host processes, created this log entry."/> + </Member> + </EnumType> + </Schema> + </edmx:DataServices> </edmx:Edmx> diff --git a/static/redfish/v1/schema/Manager_v1.xml b/static/redfish/v1/schema/Manager_v1.xml index d660bb9d31..a2b19c7e62 100644 --- a/static/redfish/v1/schema/Manager_v1.xml +++ b/static/redfish/v1/schema/Manager_v1.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!----> <!--################################################################################ --> -<!--# Redfish Schema: Manager v1.13.0 --> +<!--# Redfish Schema: Manager v1.14.0 --> <!--# --> <!--# For a detailed change log, see the README file contained in the DSP8010 bundle, --> <!--# available at http://www.dmtf.org/standards/redfish --> @@ -67,6 +67,9 @@ <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/CertificateCollection_v1.xml"> <edmx:Include Namespace="CertificateCollection"/> </edmx:Reference> + <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ManagerDiagnosticData_v1.xml"> + <edmx:Include Namespace="ManagerDiagnosticData"/> + </edmx:Reference> <edmx:DataServices> @@ -1284,9 +1287,32 @@ <Property Name="Measurements" Type="Collection(SoftwareInventory.MeasurementBlock)" Nullable="false"> <Annotation Term="OData.Description" String="An array of DSP0274-defined measurement blocks."/> <Annotation Term="OData.LongDescription" String="This property shall contain an array of DSP0274-defined measurement blocks."/> + <Annotation Term="Redfish.Revisions"> + <Collection> + <Record> + <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/> + <PropertyValue Property="Version" String="v1_14_0"/> + <PropertyValue Property="Description" String="This property has been deprecated in favor of the ComponentIntegrity resource."/> + </Record> + </Collection> + </Annotation> </Property> </EntityType> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_14_0"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="Redfish.Release" String="2021.4"/> + <Annotation Term="OData.Description" String="This version was created to deprecate Measurements in favor of measurement reporting in the ComponentIntegrity resource."/> + + <EntityType Name="Manager" BaseType="Manager.v1_13_0.Manager"> + <NavigationProperty Name="ManagerDiagnosticData" Type="ManagerDiagnosticData.ManagerDiagnosticData"> + <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> + <Annotation Term="OData.Description" String="The diagnostic data for this manager."/> + <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type ManagerDiagnosticData that represents the diagnostic data for this manager."/> + </NavigationProperty> + </EntityType> + </Schema> + </edmx:DataServices> </edmx:Edmx> diff --git a/static/redfish/v1/schema/Memory_v1.xml b/static/redfish/v1/schema/Memory_v1.xml index 9b312e48d4..4ad83c695c 100644 --- a/static/redfish/v1/schema/Memory_v1.xml +++ b/static/redfish/v1/schema/Memory_v1.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!----> <!--################################################################################ --> -<!--# Redfish Schema: Memory v1.13.0 --> +<!--# Redfish Schema: Memory v1.14.0 --> <!--# --> <!--# For a detailed change log, see the README file contained in the DSP8010 bundle, --> <!--# available at http://www.dmtf.org/standards/redfish --> @@ -1680,6 +1680,15 @@ <Property Name="Measurements" Type="Collection(SoftwareInventory.MeasurementBlock)" Nullable="false"> <Annotation Term="OData.Description" String="An array of DSP0274-defined measurement blocks."/> <Annotation Term="OData.LongDescription" String="This property shall contain an array of DSP0274-defined measurement blocks."/> + <Annotation Term="Redfish.Revisions"> + <Collection> + <Record> + <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/> + <PropertyValue Property="Version" String="v1_14_0"/> + <PropertyValue Property="Description" String="This property has been deprecated in favor of the ComponentIntegrity resource."/> + </Record> + </Collection> + </Annotation> </Property> </EntityType> @@ -1722,10 +1731,24 @@ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/> <Annotation Term="Redfish.ExcerptCopy" String="Range"/> <Annotation Term="OData.Description" String="Range of allowed operating speeds (MHz)."/> - <Annotation Term="OData.LongDescription" String="This property shall contain the operating speed control excerpt for this resource."/> + <Annotation Term="OData.LongDescription" String="This property shall contain the operating speed control, in megahertz units, for this resource. The value of the DataSourceUri property, if present, shall reference a resource of type Control with the ControlType property containing the value of `FrequencyMHz`."/> </NavigationProperty> </EntityType> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Memory.v1_13_1"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to update descriptions to tie excerpt property definitions to a specific type of Sensor or Control."/> + <EntityType Name="Memory" BaseType="Memory.v1_13_0.Memory"/> + </Schema> + + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Memory.v1_14_0"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="Redfish.Release" String="2021.4"/> + <Annotation Term="OData.Description" String="This version was created to deprecate Measurements in favor of measurement reporting in the ComponentIntegrity resource."/> + + <EntityType Name="Memory" BaseType="Memory.v1_13_1.Memory"/> + </Schema> + </edmx:DataServices> </edmx:Edmx> diff --git a/static/redfish/v1/schema/PCIeDevice_v1.xml b/static/redfish/v1/schema/PCIeDevice_v1.xml index 36b9fa641a..caeb9ca286 100644 --- a/static/redfish/v1/schema/PCIeDevice_v1.xml +++ b/static/redfish/v1/schema/PCIeDevice_v1.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!----> <!--################################################################################ --> -<!--# Redfish Schema: PCIeDevice v1.8.0 --> +<!--# Redfish Schema: PCIeDevice v1.9.0 --> <!--# --> <!--# For a detailed change log, see the README file contained in the DSP8010 bundle, --> <!--# available at http://www.dmtf.org/standards/redfish --> @@ -527,5 +527,90 @@ </ComplexType> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="PCIeDevice.v1_9_0"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="Redfish.Release" String="2021.4"/> + + <EntityType Name="PCIeDevice" BaseType="PCIeDevice.v1_8_0.PCIeDevice"> + <Property Name="Slot" Type="PCIeDevice.v1_9_0.Slot"> + <Annotation Term="OData.Description" String="Information about the slot for this PCIe device."/> + <Annotation Term="OData.LongDescription" String="This property shall contain information about the PCIe slot for this PCIe device."/> + </Property> + </EntityType> + + <ComplexType Name="Slot"> + <Annotation Term="OData.AdditionalProperties" Bool="false"/> + <Annotation Term="OData.Description" String="The PCIe slot associated with a PCIe device."/> + <Annotation Term="OData.LongDescription" String="This object shall contain properties that describe the PCIe slot associated with a PCIe device."/> + <Property Name="PCIeType" Type="PCIeDevice.PCIeTypes"> + <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> + <Annotation Term="OData.Description" String="The PCIe specification this slot supports."/> + <Annotation Term="OData.LongDescription" String="This property shall contain the maximum PCIe specification that this slot supports."/> + </Property> + <Property Name="SlotType" Type="PCIeDevice.v1_9_0.SlotType"> + <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> + <Annotation Term="OData.Description" String="The PCIe slot type."/> + <Annotation Term="OData.LongDescription" String="This property shall contain the PCIe slot type."/> + </Property> + <Property Name="Lanes" Type="Edm.Int64"> + <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> + <Annotation Term="OData.Description" String="The number of PCIe lanes supported by this slot."/> + <Annotation Term="OData.LongDescription" String="This property shall contain the maximum number of PCIe lanes supported by the slot."/> + <Annotation Term="Validation.Maximum" Int="32"/> + </Property> + <Property Name="Location" Type="Resource.Location" Nullable="false"> + <Annotation Term="OData.Description" String="The location of the PCIe slot."/> + <Annotation Term="OData.LongDescription" String="This property shall contain part location information, including a ServiceLabel property, of the associated PCIe slot."/> + </Property> + <Property Name="LaneSplitting" Type="PCIeDevice.v1_9_0.LaneSplittingType"> + <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> + <Annotation Term="OData.Description" String="The lane splitting strategy used in the PCIe slot."/> + <Annotation Term="OData.LongDescription" String="This property shall contain lane splitting information of the associated PCIe slot."/> + </Property> + </ComplexType> + + <EnumType Name="SlotType"> + <Member Name="FullLength"> + <Annotation Term="OData.Description" String="Full-Length PCIe slot."/> + </Member> + <Member Name="HalfLength"> + <Annotation Term="OData.Description" String="Half-Length PCIe slot."/> + </Member> + <Member Name="LowProfile"> + <Annotation Term="OData.Description" String="Low-Profile or Slim PCIe slot."/> + </Member> + <Member Name="Mini"> + <Annotation Term="OData.Description" String="Mini PCIe slot."/> + </Member> + <Member Name="M2"> + <Annotation Term="OData.Description" String="PCIe M.2 slot."/> + </Member> + <Member Name="OEM"> + <Annotation Term="OData.Description" String="An OEM-specific slot."/> + </Member> + <Member Name="OCP3Small"> + <Annotation Term="OData.Description" String="Open Compute Project 3.0 small form factor slot."/> + </Member> + <Member Name="OCP3Large"> + <Annotation Term="OData.Description" String="Open Compute Project 3.0 large form factor slot."/> + </Member> + <Member Name="U2"> + <Annotation Term="OData.Description" String="U.2 / SFF-8639 slot or bay."/> + </Member> + </EnumType> + + <EnumType Name="LaneSplittingType"> + <Member Name="None"> + <Annotation Term="OData.Description" String="The slot has no lane splitting."/> + </Member> + <Member Name="Bridged"> + <Annotation Term="OData.Description" String="The slot has a bridge to share the lanes with associated devices."/> + </Member> + <Member Name="Bifurcated"> + <Annotation Term="OData.Description" String="The slot is bifurcated to split the lanes with associated devices."/> + </Member> + </EnumType> + </Schema> + </edmx:DataServices> </edmx:Edmx> diff --git a/static/redfish/v1/schema/Processor_v1.xml b/static/redfish/v1/schema/Processor_v1.xml index bbfa84ce8c..bcc72b8344 100644 --- a/static/redfish/v1/schema/Processor_v1.xml +++ b/static/redfish/v1/schema/Processor_v1.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!----> <!--################################################################################ --> -<!--# Redfish Schema: Processor v1.13.0 --> +<!--# Redfish Schema: Processor v1.14.0 --> <!--# --> <!--# For a detailed change log, see the README file contained in the DSP8010 bundle, --> <!--# available at http://www.dmtf.org/standards/redfish --> @@ -1437,6 +1437,15 @@ <Property Name="Measurements" Type="Collection(SoftwareInventory.MeasurementBlock)" Nullable="false"> <Annotation Term="OData.Description" String="An array of DSP0274-defined measurement blocks."/> <Annotation Term="OData.LongDescription" String="This property shall contain an array of DSP0274-defined measurement blocks."/> + <Annotation Term="Redfish.Revisions"> + <Collection> + <Record> + <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/> + <PropertyValue Property="Version" String="v1_14_0"/> + <PropertyValue Property="Description" String="This property has been deprecated in favor of the ComponentIntegrity resource."/> + </Record> + </Collection> + </Annotation> </Property> </EntityType> @@ -1523,7 +1532,7 @@ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/> <Annotation Term="Redfish.ExcerptCopy" String="Range"/> <Annotation Term="OData.Description" String="Range of allowed operating speeds (MHz)."/> - <Annotation Term="OData.LongDescription" String="This property shall contain the operating speed control excerpt for this resource."/> + <Annotation Term="OData.LongDescription" String="This property shall contain the operating speed control, measured in megahertz units, for this resource. The value of the DataSourceUri property, if present, shall reference a resource of type Control with the ControlType property containing the value of `FrequencyMHz`."/> </NavigationProperty> <NavigationProperty Name="Ports" Type="PortCollection.PortCollection" ContainsTarget="true" Nullable="false"> <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> @@ -1551,5 +1560,19 @@ </ComplexType> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_13_1"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to update descriptions to tie excerpt property definitions to a specific type of Sensor or Control."/> + <EntityType Name="Processor" BaseType="Processor.v1_13_0.Processor"/> + </Schema> + + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_14_0"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="Redfish.Release" String="2021.4"/> + <Annotation Term="OData.Description" String="This version was created to deprecate Measurements in favor of measurement reporting in the ComponentIntegrity resource."/> + + <EntityType Name="Processor" BaseType="Processor.v1_13_1.Processor"/> + </Schema> + </edmx:DataServices> </edmx:Edmx> diff --git a/static/redfish/v1/schema/Resource_v1.xml b/static/redfish/v1/schema/Resource_v1.xml index a405c62edf..77e417c737 100644 --- a/static/redfish/v1/schema/Resource_v1.xml +++ b/static/redfish/v1/schema/Resource_v1.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!----> <!--################################################################################ --> -<!--# Redfish Schema: Resource v1.13.0 --> +<!--# Redfish Schema: Resource v1.14.0 --> <!--# --> <!--# For a detailed change log, see the README file contained in the DSP8010 bundle, --> <!--# available at http://www.dmtf.org/standards/redfish --> @@ -113,7 +113,7 @@ </Property> <Property Name="Conditions" Type="Collection(Resource.Condition)"> <Annotation Term="OData.Description" String="Conditions in this resource that require attention."/> - <Annotation Term="OData.LongDescription" String="This property shall represent the active conditions requiring attention in this or a related resource that affects the Health or HealthRollup of this resource."/> + <Annotation Term="OData.LongDescription" String="This property shall represent the active conditions requiring attention in this or a related resource that affects the Health or HealthRollup of this resource. The service may roll up multiple conditions originating from a resource, using the `ConditionInRelatedResource` message from Base Message Registry."/> <Annotation Term="Redfish.Revisions"> <Collection> <Record> @@ -172,6 +172,19 @@ <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type LogEntry that represents the log entry created for this condition."/> <Annotation Term="OData.AutoExpandReferences"/> </NavigationProperty> + <Property Name="Resolution" Type="Edm.String" Nullable="false"> + <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> + <Annotation Term="OData.Description" String="Suggestions on how to resolve the condition."/> + <Annotation Term="OData.LongDescription" String="This property shall contain the resolution of the condition. Services should replace the resolution defined in the message registry with a more specific resolution."/> + <Annotation Term="Redfish.Revisions"> + <Collection> + <Record> + <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/> + <PropertyValue Property="Version" String="v1_14_0"/> + </Record> + </Collection> + </Annotation> + </Property> </ComplexType> <EnumType Name="State"> @@ -630,6 +643,18 @@ </Collection> </Annotation> </Member> + <Member Name="MACAddress"> + <Annotation Term="OData.Description" String="The media access control address (MAC address)."/> + <Annotation Term="OData.LongDescription" String="This durable name shall be a media access control address (MAC address), which is a unique identifier assigned to a network interface controller (NIC) for use as a network address. This value should not be used if a more specific type of identifier is available. The DurableName property shall follow the pattern '^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$', where the most significant octet is first."/> + <Annotation Term="Redfish.Revisions"> + <Collection> + <Record> + <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/> + <PropertyValue Property="Version" String="v1_14_0"/> + </Record> + </Collection> + </Annotation> + </Member> </EnumType> </Schema> @@ -1337,7 +1362,7 @@ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_6_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2017.3"/> - <Annotation Term="OData.Description" String="This version was created to add GPS Coordinated to Location and enumerations for DurableNameFormat for NVMe fabric extension."/> + <Annotation Term="OData.Description" String="This version was created to add GPS coordinates to Location and enumerations for DurableNameFormat for NVMe fabric extension."/> <ComplexType Name="Location" BaseType="Resource.v1_5_0.Location"> <Property Name="Longitude" Type="Edm.Decimal" DefaultValue="0"> @@ -1355,7 +1380,7 @@ <Property Name="AltitudeMeters" Type="Edm.Decimal" DefaultValue="0"> <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/> <Annotation Term="OData.Description" String="The altitude of the resource in meters."/> - <Annotation Term="OData.LongDescription" String="This property shall contain the altitude of the resource in meters."/> + <Annotation Term="OData.LongDescription" String="This property shall contain the altitude of the resource, in meters units, defined as the elevation above sea level."/> <Annotation Term="Measures.Unit" String="m"/> </Property> </ComplexType> @@ -1406,6 +1431,11 @@ <Annotation Term="OData.Description" String="This version was created to correct the description for LocationType within PartLocation. It was also created to clarify the descriptions for Id, Name, Description, and MemberId to be consistent with usage in the specification."/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_6_10"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to enhance the description of AltitudeMeters."/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_7_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2018.2"/> @@ -1495,6 +1525,11 @@ <Annotation Term="OData.Description" String="This version was created to correct the description for LocationType within PartLocation. It was also created to clarify the descriptions for Id, Name, Description, and MemberId to be consistent with usage in the specification."/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_7_9"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to enhance the description of AltitudeMeters."/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_8_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2018.3"/> @@ -1541,6 +1576,11 @@ <Annotation Term="OData.Description" String="This version was created to correct the description for LocationType within PartLocation. It was also created to clarify the descriptions for Id, Name, Description, and MemberId to be consistent with usage in the specification."/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_8_9"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to enhance the description of AltitudeMeters."/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_9_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2019.4"/> @@ -1577,6 +1617,11 @@ <Annotation Term="OData.Description" String="This version was created to correct the description for LocationType within PartLocation. It was also created to clarify the descriptions for Id, Name, Description, and MemberId to be consistent with usage in the specification."/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_9_7"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to enhance the description of AltitudeMeters."/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_10_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2020.3"/> @@ -1598,6 +1643,11 @@ <Annotation Term="OData.Description" String="This version was created to correct the description for LocationType within PartLocation. It was also created to clarify the descriptions for Id, Name, Description, and MemberId to be consistent with usage in the specification."/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_10_4"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to enhance the description of AltitudeMeters."/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_11_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2020.4"/> @@ -1614,6 +1664,11 @@ <Annotation Term="OData.Description" String="This version was created to correct the description for LocationType within PartLocation. It was also created to clarify the descriptions for Id, Name, Description, and MemberId to be consistent with usage in the specification."/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_11_3"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to enhance the description of AltitudeMeters. It was also added to improve the description of Conditions."/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_12_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2021.1"/> @@ -1625,11 +1680,27 @@ <Annotation Term="OData.Description" String="This version was created to correct the description for LocationType within PartLocation. It was also created to clarify the descriptions for Id, Name, Description, and MemberId to be consistent with usage in the specification."/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_12_2"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to enhance the description of AltitudeMeters. It was also added to improve the description of Conditions."/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_13_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2021.2"/> <Annotation Term="OData.Description" String="This version was created to add `Embedded` to LocationType within PartLocation. It was also to add the `Pause`, `Resume`, and `Suspend` enumerations to ResetType. It was also created to add `Paused` to PowerState."/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_13_1"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to enhance the description of AltitudeMeters. It was also added to improve the description of Conditions."/> + </Schema> + + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_14_0"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="Redfish.Release" String="2021.4"/> + <Annotation Term="OData.Description" String="This version was created to add Resolution to the Conditions property in Status. It was also was created to add `MACAddress` to DurableNameFormat."/> + </Schema> + </edmx:DataServices> </edmx:Edmx> diff --git a/static/redfish/v1/schema/Sensor_v1.xml b/static/redfish/v1/schema/Sensor_v1.xml index 2c32a51211..a1300e66cf 100644 --- a/static/redfish/v1/schema/Sensor_v1.xml +++ b/static/redfish/v1/schema/Sensor_v1.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!----> <!--################################################################################ --> -<!--# Redfish Schema: Sensor v1.4.0 --> +<!--# Redfish Schema: Sensor v1.5.0 --> <!--# --> <!--# For a detailed change log, see the README file contained in the DSP8010 bundle, --> <!--# available at http://www.dmtf.org/standards/redfish --> @@ -237,7 +237,7 @@ <Property Name="ApparentVA" Type="Edm.Decimal"> <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> - <Annotation Term="OData.Description" String="The product of voltage and current for an AC circuit, in Volt-Ampere units."/> + <Annotation Term="OData.Description" String="The product of voltage and current for an AC circuit, in volt-ampere units."/> <Annotation Term="OData.LongDescription" String="This property shall contain the product of voltage (RMS) multiplied by current (RMS) for a circuit. This property can appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values."/> <Annotation Term="Measures.Unit" String="V.A"/> <Annotation Term="Redfish.Excerpt" String="Power,PowerArray"/> @@ -252,8 +252,8 @@ <Property Name="PowerFactor" Type="Edm.Decimal"> <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> <Annotation Term="OData.Description" String="The power factor for this sensor."/> - <Annotation Term="OData.LongDescription" String="This property shall identify the quotient of real power (W) and apparent power (VA) for a circuit. PowerFactor is expressed in unit-less 1/100ths. This property can appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values."/> - <Annotation Term="Validation.Minimum" Int="0"/> + <Annotation Term="OData.LongDescription" String="This property shall identify the quotient of real power (W) and apparent power (VA) for a circuit. PowerFactor is expressed in unit-less 1/100ths. This property can appear in sensors containing a ReadingType value of `Power`, and shall not appear in sensors of other ReadingType values."/> + <Annotation Term="Validation.Minimum" Int="-1"/> <Annotation Term="Validation.Maximum" Int="1"/> <Annotation Term="Redfish.Excerpt" String="Power,PowerArray"/> </Property> @@ -430,24 +430,24 @@ <EnumType Name="ReadingType"> <Member Name="Temperature"> - <Annotation Term="OData.Description" String="Temperature."/> + <Annotation Term="OData.Description" String="Temperature (C)."/> <Annotation Term="OData.LongDescription" String="This value shall indicate a temperature measurement, in degrees Celsius units, and the ReadingUnits value shall be 'Cel'."/> </Member> <Member Name="Humidity"> - <Annotation Term="OData.Description" String="Relative Humidity."/> + <Annotation Term="OData.Description" String="Relative humidity (percent)."/> <Annotation Term="OData.LongDescription" String="This value shall indicate a relative humidity measurement, in percent units, and the ReadingUnits value shall be '%'."/> </Member> <Member Name="Power"> - <Annotation Term="OData.Description" String="Power."/> - <Annotation Term="OData.LongDescription" String="This value shall indicate the arithmetic mean of product terms of instantaneous voltage and current values measured over integer number of line cycles for a circuit, in Watt units, and the ReadingUnits value shall be 'W'."/> + <Annotation Term="OData.Description" String="Power (W)."/> + <Annotation Term="OData.LongDescription" String="This value shall indicate the arithmetic mean of product terms of instantaneous voltage and current values measured over integer number of line cycles for a circuit, in watt units, and the ReadingUnits value shall be 'W'."/> </Member> <Member Name="EnergykWh"> <Annotation Term="OData.Description" String="Energy (kWh)."/> <Annotation Term="OData.LongDescription" String="This value shall indicate the energy, integral of real power over time, of the monitored item. If representing metered power consumption the value shall reflect the power consumption since the sensor metrics were last reset. The value of the Reading property shall be in kilowatt-hour units and the ReadingUnits value shall be `kW.h`. This value is used for large-scale energy consumption measurements, while EnergyJoules and EnergyWh are used for device-level consumption measurements."/> </Member> <Member Name="EnergyJoules"> - <Annotation Term="OData.Description" String="Energy (Joules)."/> - <Annotation Term="OData.LongDescription" String="This value shall indicate the energy, integral of real power over time, of the monitored item. If representing metered power consumption the value shall reflect the power consumption since the sensor metrics were last reset. The value of the Reading property shall be in Joule units and the ReadingUnits value shall be `J`. This value is used for device-level energy consumption measurements, while EnergykWh is used for large-scale consumption measurements."/> + <Annotation Term="OData.Description" String="Energy (J)."/> + <Annotation Term="OData.LongDescription" String="This value shall indicate the energy, integral of real power over time, of the monitored item. If representing metered power consumption the value shall reflect the power consumption since the sensor metrics were last reset. The value of the Reading property shall be in joule units and the ReadingUnits value shall be `J`. This value is used for device-level energy consumption measurements, while EnergykWh is used for large-scale consumption measurements."/> </Member> <Member Name="EnergyWh"> <Annotation Term="OData.Description" String="Energy (Wh)."/> @@ -463,7 +463,7 @@ </Member> <Member Name="ChargeAh"> <Annotation Term="OData.Description" String="Charge (Ah)."/> - <Annotation Term="OData.LongDescription" String="This value shall indicate the amount of charge of the monitored item. If representing metered power consumption, integral of real power over time, the value shall reflect the power consumption since the sensor metrics were last reset. The value of the Reading property shall be in amp-hour units and the ReadingUnits value shall be `A.h`."/> + <Annotation Term="OData.LongDescription" String="This value shall indicate the amount of charge of the monitored item. If representing metered power consumption, integral of real power over time, the value shall reflect the power consumption since the sensor metrics were last reset. The value of the Reading property shall be in ampere-hour units and the ReadingUnits value shall be `A.h`."/> <Annotation Term="Redfish.Revisions"> <Collection> <Record> @@ -474,47 +474,59 @@ </Annotation> </Member> <Member Name="Voltage"> - <Annotation Term="OData.Description" String="Voltage (AC or DC)."/> - <Annotation Term="OData.LongDescription" String="This value shall indicate a measurement of the root mean square (RMS) of instantaneous voltage calculated over an integer number of line cycles for a circuit. Voltage is expressed in Volts units and the ReadingUnits value shall be `V`."/> + <Annotation Term="OData.Description" String="Voltage (VAC or VDC)."/> + <Annotation Term="OData.LongDescription" String="This value shall indicate a measurement of the root mean square (RMS) of instantaneous voltage calculated over an integer number of line cycles for a circuit. Voltage is expressed in volt units and the ReadingUnits value shall be `V`."/> </Member> <Member Name="Current"> - <Annotation Term="OData.Description" String="Current."/> - <Annotation Term="OData.LongDescription" String="This value shall indicate a measurement of the root mean square (RMS) of instantaneous current calculated over an integer number of line cycles for a circuit. Current is expressed in Amperes units and the ReadingUnits value shall be `A`."/> + <Annotation Term="OData.Description" String="Current (A)."/> + <Annotation Term="OData.LongDescription" String="This value shall indicate a measurement of the root mean square (RMS) of instantaneous current calculated over an integer number of line cycles for a circuit. Current is expressed in ampere units and the ReadingUnits value shall be `A`."/> </Member> <Member Name="Frequency"> - <Annotation Term="OData.Description" String="Frequency."/> - <Annotation Term="OData.LongDescription" String="This value shall indicate a frequency measurement, in Hertz units, and the ReadingUnits value shall be `Hz`."/> + <Annotation Term="OData.Description" String="Frequency (Hz)."/> + <Annotation Term="OData.LongDescription" String="This value shall indicate a frequency measurement, in hertz units, and the ReadingUnits value shall be `Hz`."/> </Member> <Member Name="Pressure"> - <Annotation Term="OData.Description" String="Pressure."/> - <Annotation Term="OData.LongDescription" String="This value shall indicate a measurement of force applied perpendicular to the surface of an object per unit area over which that force is distributed. The ReadingUnits shall be `Pa`."/> + <Annotation Term="OData.Description" String="Pressure (Pa)."/> + <Annotation Term="OData.LongDescription" String="This value shall indicate a measurement of force, in pascal units, applied perpendicular to the surface of an object per unit area over which that force is distributed. The ReadingUnits shall be `Pa`."/> + </Member> + <Member Name="PressurekPa"> + <Annotation Term="OData.Description" String="Pressure (kPa)."/> + <Annotation Term="OData.LongDescription" String="This value shall indicate a measurement of pressure, in kilopascal units, relative to atmospheric pressure. The ReadingUnits value shall be `kPa`."/> + <Annotation Term="Redfish.Revisions"> + <Collection> + <Record> + <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/> + <PropertyValue Property="Version" String="v1_5_0"/> + </Record> + </Collection> + </Annotation> </Member> <Member Name="LiquidLevel"> - <Annotation Term="OData.Description" String="Liquid level."/> - <Annotation Term="OData.LongDescription" String="This value shall indicate a measurement of fluid height relative to a specified vertical datum and the ReadingUnits value shall be `cm`."/> + <Annotation Term="OData.Description" String="Liquid level (cm)."/> + <Annotation Term="OData.LongDescription" String="This value shall indicate a measurement of fluid height, in centimeter units, relative to a specified vertical datum and the ReadingUnits value shall be `cm`."/> </Member> <Member Name="Rotational"> - <Annotation Term="OData.Description" String="Rotational."/> - <Annotation Term="OData.LongDescription" String="This value shall indicate a measurement of rotational frequency, in revolutions per minute unit, and the ReadingUnits value shall be `RPM`."/> + <Annotation Term="OData.Description" String="Rotational (RPM)."/> + <Annotation Term="OData.LongDescription" String="This value shall indicate a measurement of rotational frequency, in revolutions per minute unit, and the ReadingUnits value shall be either `{rev}/min`, which is preferred, or `RPM`, which is a deprecated value."/> </Member> <Member Name="AirFlow"> - <Annotation Term="OData.Description" String="Airflow."/> - <Annotation Term="OData.LongDescription" String="This value shall indicate a measurement of a volume of gas per unit of time that flows through a particular junction. The ReadingUnits shall be `cft_i/min`."/> + <Annotation Term="OData.Description" String="Airflow (cu ft/min)."/> + <Annotation Term="OData.LongDescription" String="This value shall indicate a measurement of a volume of gas per unit of time, in cubic feet per minute units, that flows through a particular junction. The ReadingUnits shall be `[ft_i]3/min`."/> </Member> <Member Name="LiquidFlow"> - <Annotation Term="OData.Description" String="Liquid flow."/> - <Annotation Term="OData.LongDescription" String="This value shall indicate a measurement of a volume of liquid per unit of time that flows through a particular junction. The ReadingUnits shall be `L/s`."/> + <Annotation Term="OData.Description" String="Liquid flow (L/s)."/> + <Annotation Term="OData.LongDescription" String="This value shall indicate a measurement of a volume of liquid per unit of time, in liters per second units, that flows through a particular junction. The ReadingUnits shall be `L/s`."/> </Member> <Member Name="Barometric"> - <Annotation Term="OData.Description" String="Barometric pressure."/> - <Annotation Term="OData.LongDescription" String="This value shall indicate a measurement of barometric pressure, in millimeters, of a mercury column, and the ReadingUnits value shall be `mm[Hg]`."/> + <Annotation Term="OData.Description" String="Barometric pressure (mm)."/> + <Annotation Term="OData.LongDescription" String="This value shall indicate a measurement of barometric pressure, in millimeters of a mercury column, and the ReadingUnits value shall be `mm[Hg]`."/> </Member> <Member Name="Altitude"> - <Annotation Term="OData.Description" String="Altitude."/> - <Annotation Term="OData.LongDescription" String="This value shall indicate a measurement of altitude, in meter units, and the ReadingUnits value shall be `m`."/> + <Annotation Term="OData.Description" String="Altitude (m)."/> + <Annotation Term="OData.LongDescription" String="This value shall indicate a measurement of altitude, in meter units, defined as the elevation above sea level. The ReadingUnits value shall be `m`."/> </Member> <Member Name="Percent"> - <Annotation Term="OData.Description" String="Percent."/> + <Annotation Term="OData.Description" String="Percent (%)."/> <Annotation Term="OData.LongDescription" String="This value shall indicate a percentage measurement, in percent units, and the ReadingUnits value shall be `%`."/> <Annotation Term="Redfish.Revisions"> <Collection> @@ -525,6 +537,18 @@ </Collection> </Annotation> </Member> + <Member Name="AbsoluteHumidity"> + <Annotation Term="OData.Description" String="Absolute humidity (g/cu m)."/> + <Annotation Term="OData.LongDescription" String="This value shall indicate an absolute (volumetric) humidity measurement, in grams per cubic meter units, and the ReadingUnits value shall be `g/m3`."/> + <Annotation Term="Redfish.Revisions"> + <Collection> + <Record> + <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/> + <PropertyValue Property="Version" String="v1_5_0"/> + </Record> + </Collection> + </Annotation> + </Member> </EnumType> </Schema> @@ -570,6 +594,12 @@ <EntityType Name="Sensor" BaseType="Sensor.v1_0_6.Sensor"/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_0_8"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to add units to ReadingType descriptions. It was also created to update the units of AirFlow to remove the deprecated format and the units of SpeedRPM to use the available UCUM format. It was also created to correct various typographical errors. It was also created to correct the minimum value for PowerFactor."/> + <EntityType Name="Sensor" BaseType="Sensor.v1_0_7.Sensor"/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_1_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2019.4"/> @@ -642,6 +672,12 @@ <EntityType Name="Sensor" BaseType="Sensor.v1_1_2.Sensor"/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_1_4"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to add units to ReadingType descriptions. It was also created to update the units of AirFlow to remove the deprecated format and the units of SpeedRPM to use the available UCUM format. It was also created to correct various typographical errors. It was also created to correct the minimum value for PowerFactor."/> + <EntityType Name="Sensor" BaseType="Sensor.v1_1_3.Sensor"/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_2_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2020.4"/> @@ -658,7 +694,7 @@ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> <Annotation Term="OData.Description" String="The rotational speed."/> <Annotation Term="OData.LongDescription" String="This property shall contain a reading of the rotational speed of the device in revolutions per minute (RPM) units."/> - <Annotation Term="Measures.Unit" String="RPM"/> + <Annotation Term="Measures.Unit" String="{rev}/min"/> <Annotation Term="Redfish.Excerpt" String="Fan,FanArray"/> </Property> <Property Name="DeviceName" Type="Edm.String"> @@ -696,6 +732,12 @@ <EntityType Name="Sensor" BaseType="Sensor.v1_2_0.Sensor"/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_2_2"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to add units to ReadingType descriptions. It was also created to update the units of AirFlow to remove the deprecated format and the units of SpeedRPM to use the available UCUM format. It was also created to correct various typographical errors. It was also created to correct the minimum value for PowerFactor."/> + <EntityType Name="Sensor" BaseType="Sensor.v1_2_1.Sensor"/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_3_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2021.1"/> @@ -719,6 +761,12 @@ <EntityType Name="Sensor" BaseType="Sensor.v1_3_0.Sensor"/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_3_2"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to add units to ReadingType descriptions. It was also created to update the units of AirFlow to remove the deprecated format and the units of SpeedRPM to use the available UCUM format. It was also created to correct various typographical errors. It was also created to correct the minimum value for PowerFactor."/> + <EntityType Name="Sensor" BaseType="Sensor.v1_3_1.Sensor"/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_4_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2021.2"/> @@ -775,5 +823,42 @@ </ComplexType> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_4_1"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to add units to ReadingType descriptions. It was also created to update the units of AirFlow to remove the deprecated format and the units of SpeedRPM to use the available UCUM format. It was also created to correct various typographical errors. It was also created to correct the minimum value for PowerFactor."/> + <EntityType Name="Sensor" BaseType="Sensor.v1_4_0.Sensor"/> + </Schema> + + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_5_0"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="Redfish.Release" String="2021.4"/> + <Annotation Term="OData.Description" String="This version was created to add `AbsoluteHumidity` and `PressurekPa` to ReadingType."/> + + <EntityType Name="Sensor" BaseType="Sensor.v1_4_1.Sensor"> + <Property Name="ApparentkVAh" Type="Edm.Decimal"> + <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> + <Annotation Term="OData.Description" String="Apparent energy (kVAh)."/> + <Annotation Term="OData.LongDescription" String="This property shall contain the apparent energy, in kilovolt-ampere-hour units, for an electrical energy measurement. This property can appear in sensors with a ReadingType containing `EnergykWh`, and shall not appear in sensors with other ReadingType values."/> + <Annotation Term="Measures.Unit" String="kV.A.h"/> + <Annotation Term="Redfish.Excerpt" String="EnergykWh"/> + </Property> + <Property Name="ReactivekVARh" Type="Edm.Decimal"> + <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> + <Annotation Term="OData.Description" String="Reactive energy (kVARh)."/> + <Annotation Term="OData.LongDescription" String="This property shall contain the reactive energy, in kilovolt-ampere-hours (reactive) units, for an electrical energy measurement. This property can appear in sensors with a ReadingType containing `EnergykWh`, and shall not appear in sensors with other ReadingType values."/> + <Annotation Term="Measures.Unit" String="kV.A.h"/> + <Annotation Term="Redfish.Excerpt" String="EnergykWh"/> + </Property> + <Property Name="PhaseAngleDegrees" Type="Edm.Decimal"> + <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> + <Annotation Term="OData.Description" String="The phase angle (degrees) between the current and voltage waveforms."/> + <Annotation Term="OData.LongDescription" String="This property shall contain the phase angle, in degree units, between the current and voltage waveforms for an electrical measurement. This property can appear in sensors with a ReadingType containing `Power`, and shall not appear in sensors with other ReadingType values."/> + <Annotation Term="Validation.Minimum" Int="-90"/> + <Annotation Term="Validation.Maximum" Int="90"/> + <Annotation Term="Redfish.Excerpt" String="Power,PowerArray"/> + </Property> + </EntityType> + </Schema> + </edmx:DataServices> </edmx:Edmx> diff --git a/static/redfish/v1/schema/ServiceRoot_v1.xml b/static/redfish/v1/schema/ServiceRoot_v1.xml index 1be074b0b8..0189dad913 100644 --- a/static/redfish/v1/schema/ServiceRoot_v1.xml +++ b/static/redfish/v1/schema/ServiceRoot_v1.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!----> <!--################################################################################ --> -<!--# Redfish Schema: ServiceRoot v1.12.0 --> +<!--# Redfish Schema: ServiceRoot v1.13.0 --> <!--# --> <!--# For a detailed change log, see the README file contained in the DSP8010 bundle, --> <!--# available at http://www.dmtf.org/standards/redfish --> @@ -106,6 +106,15 @@ <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/CableCollection_v1.xml"> <edmx:Include Namespace="CableCollection"/> </edmx:Reference> + <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ServiceConditions_v1.xml"> + <edmx:Include Namespace="ServiceConditions"/> + </edmx:Reference> + <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ComponentIntegrityCollection_v1.xml"> + <edmx:Include Namespace="ComponentIntegrityCollection"/> + </edmx:Reference> + <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RegisteredClientCollection_v1.xml"> + <edmx:Include Namespace="RegisteredClientCollection"/> + </edmx:Reference> <edmx:DataServices> @@ -763,5 +772,34 @@ </EntityType> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ServiceRoot.v1_13_0"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="Redfish.Release" String="2021.4"/> + + <EntityContainer Name="ServiceContainer" Extends="ServiceRoot.v1_12_0.ServiceContainer"> + <Singleton Name="ComponentIntegrity" Type="ComponentIntegrityCollection.ComponentIntegrityCollection"/> + <Singleton Name="ServiceConditions" Type="ServiceConditions.ServiceConditions"/> + <Singleton Name="RegisteredClients" Type="RegisteredClientCollection.RegisteredClientCollection"/> + </EntityContainer> + + <EntityType Name="ServiceRoot" BaseType="ServiceRoot.v1_12_0.ServiceRoot"> + <NavigationProperty Name="ServiceConditions" Type="ServiceConditions.ServiceConditions" Nullable="false"> + <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> + <Annotation Term="OData.Description" String="The link to the service conditions."/> + <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type ServiceConditions."/> + </NavigationProperty> + <NavigationProperty Name="ComponentIntegrity" Type="ComponentIntegrityCollection.ComponentIntegrityCollection" Nullable="false"> + <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> + <Annotation Term="OData.Description" String="The link to a collection of component integrity information."/> + <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type ComponentIntegrityCollection."/> + </NavigationProperty> + <NavigationProperty Name="RegisteredClients" Type="RegisteredClientCollection.RegisteredClientCollection" Nullable="false"> + <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> + <Annotation Term="OData.Description" String="The link to a collection of registered clients."/> + <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type RegisteredClientCollection."/> + </NavigationProperty> + </EntityType> + </Schema> + </edmx:DataServices> </edmx:Edmx> diff --git a/static/redfish/v1/schema/Settings_v1.xml b/static/redfish/v1/schema/Settings_v1.xml index 209dce047b..06ecde6844 100644 --- a/static/redfish/v1/schema/Settings_v1.xml +++ b/static/redfish/v1/schema/Settings_v1.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!----> <!--################################################################################ --> -<!--# Redfish Schema: Settings v1.3.3 --> +<!--# Redfish Schema: Settings v1.3.4 --> <!--# --> <!--# For a detailed change log, see the README file contained in the DSP8010 bundle, --> <!--# available at http://www.dmtf.org/standards/redfish --> @@ -168,7 +168,7 @@ <Property Name="MaintenanceWindowStartTime" Type="Edm.DateTimeOffset" Nullable="false"> <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/> <Annotation Term="OData.Description" String="The start time of a maintenance window."/> - <Annotation Term="OData.LongDescription" String="This property shall indicate the date and time when the service can start to apply the future configuration as part of a maintenance window. This property shall be required if the ApplyTime property is `AtMaintenanceWindowStart` or `InMaintenanceWindowOnReset`."/> + <Annotation Term="OData.LongDescription" String="This property shall indicate the date and time when the service can start to apply the future configuration as part of a maintenance window. Services shall provide a default value if not configured by a user. This property shall be required if the ApplyTime property is `AtMaintenanceWindowStart` or `InMaintenanceWindowOnReset`."/> </Property> <Property Name="MaintenanceWindowDurationInSeconds" Type="Edm.Int64" Nullable="false"> <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/> @@ -234,6 +234,13 @@ <ComplexType Name="PreferredApplyTime" BaseType="Settings.v1_1_4.PreferredApplyTime"/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Settings.v1_1_6"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to clarify the default behavior of MaintenanceWindowStartTime."/> + <ComplexType Name="Settings" BaseType="Settings.v1_1_5.Settings"/> + <ComplexType Name="PreferredApplyTime" BaseType="Settings.v1_1_5.PreferredApplyTime"/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Settings.v1_2_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2018.1"/> @@ -260,7 +267,7 @@ <Property Name="MaintenanceWindowStartTime" Type="Edm.DateTimeOffset" Nullable="false"> <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> <Annotation Term="OData.Description" String="The start time of a maintenance window."/> - <Annotation Term="OData.LongDescription" String="This property shall contain the same as the MaintenanceWindowStartTime property found in the MaintenanceWindow structure on the MaintenanceWindowResource. This property shall be required if the SupportedValues property contains `AtMaintenanceWindowStart` or `InMaintenanceWindowOnReset`."/> + <Annotation Term="OData.LongDescription" String="This property shall contain the same as the MaintenanceWindowStartTime property found in the MaintenanceWindow structure on the MaintenanceWindowResource. Services shall provide a default value if not configured by a user. This property shall be required if the SupportedValues property contains `AtMaintenanceWindowStart` or `InMaintenanceWindowOnReset`."/> </Property> <Property Name="MaintenanceWindowDurationInSeconds" Type="Edm.Int64" Nullable="false"> <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> @@ -282,7 +289,7 @@ <Property Name="MaintenanceWindowStartTime" Type="Edm.DateTimeOffset" Nullable="false"> <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/> <Annotation Term="OData.Description" String="The start time of a maintenance window."/> - <Annotation Term="OData.LongDescription" String="This property shall indicate the date and time when the service can start to apply the requested settings or operation as part of a maintenance window."/> + <Annotation Term="OData.LongDescription" String="This property shall indicate the date and time when the service can start to apply the requested settings or operation as part of a maintenance window. Services shall provide a default value if not configured by a user."/> <Annotation Term="Redfish.Required"/> </Property> <Property Name="MaintenanceWindowDurationInSeconds" Type="Edm.Int64" Nullable="false"> @@ -341,6 +348,15 @@ <ComplexType Name="MaintenanceWindow" BaseType="Settings.v1_2_4.MaintenanceWindow"/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Settings.v1_2_6"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to clarify the default behavior of MaintenanceWindowStartTime."/> + <ComplexType Name="Settings" BaseType="Settings.v1_2_5.Settings"/> + <ComplexType Name="PreferredApplyTime" BaseType="Settings.v1_2_5.PreferredApplyTime"/> + <ComplexType Name="OperationApplyTimeSupport" BaseType="Settings.v1_2_5.OperationApplyTimeSupport"/> + <ComplexType Name="MaintenanceWindow" BaseType="Settings.v1_2_5.MaintenanceWindow"/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Settings.v1_3_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2019.3"/> @@ -379,5 +395,14 @@ <ComplexType Name="MaintenanceWindow" BaseType="Settings.v1_3_2.MaintenanceWindow"/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Settings.v1_3_4"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to clarify the default behavior of MaintenanceWindowStartTime."/> + <ComplexType Name="Settings" BaseType="Settings.v1_3_3.Settings"/> + <ComplexType Name="PreferredApplyTime" BaseType="Settings.v1_3_3.PreferredApplyTime"/> + <ComplexType Name="OperationApplyTimeSupport" BaseType="Settings.v1_3_3.OperationApplyTimeSupport"/> + <ComplexType Name="MaintenanceWindow" BaseType="Settings.v1_3_3.MaintenanceWindow"/> + </Schema> + </edmx:DataServices> </edmx:Edmx> diff --git a/static/redfish/v1/schema/SoftwareInventory_v1.xml b/static/redfish/v1/schema/SoftwareInventory_v1.xml index dde75bdc14..6a5bf0e45e 100644 --- a/static/redfish/v1/schema/SoftwareInventory_v1.xml +++ b/static/redfish/v1/schema/SoftwareInventory_v1.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!----> <!--################################################################################ --> -<!--# Redfish Schema: SoftwareInventory v1.5.0 --> +<!--# Redfish Schema: SoftwareInventory v1.6.0 --> <!--# --> <!--# For a detailed change log, see the README file contained in the DSP8010 bundle, --> <!--# available at http://www.dmtf.org/standards/redfish --> @@ -248,6 +248,15 @@ <Property Name="Measurement" Type="SoftwareInventory.MeasurementBlock" Nullable="false"> <Annotation Term="OData.Description" String="A DSP0274-defined measurement block."/> <Annotation Term="OData.LongDescription" String="This property shall contain a DSP0274-defined measurement block."/> + <Annotation Term="Redfish.Revisions"> + <Collection> + <Record> + <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/> + <PropertyValue Property="Version" String="v1_6_0"/> + <PropertyValue Property="Description" String="This property has been deprecated in favor of the ComponentIntegrity resource."/> + </Record> + </Collection> + </Annotation> </Property> </EntityType> @@ -287,5 +296,13 @@ </ComplexType> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SoftwareInventory.v1_6_0"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="Redfish.Release" String="2021.4"/> + <Annotation Term="OData.Description" String="This version was created to deprecate Measurement in favor of measurement reporting in the ComponentIntegrity resource."/> + + <EntityType Name="SoftwareInventory" BaseType="SoftwareInventory.v1_5_0.SoftwareInventory"/> + </Schema> + </edmx:DataServices> </edmx:Edmx> diff --git a/static/redfish/v1/schema/StorageController_v1.xml b/static/redfish/v1/schema/StorageController_v1.xml index 65542087a7..9688e0f008 100644 --- a/static/redfish/v1/schema/StorageController_v1.xml +++ b/static/redfish/v1/schema/StorageController_v1.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!----> <!--################################################################################ --> -<!--# Redfish Schema: StorageController v1.3.0 --> +<!--# Redfish Schema: StorageController v1.5.0 --> <!--# --> <!--# For a detailed change log, see the README file contained in the DSP8010 bundle, --> <!--# available at http://www.dmtf.org/standards/redfish --> @@ -491,6 +491,15 @@ <Property Name="Measurements" Type="Collection(SoftwareInventory.MeasurementBlock)" Nullable="false"> <Annotation Term="OData.Description" String="An array of DSP0274-defined measurement blocks."/> <Annotation Term="OData.LongDescription" String="This property shall contain an array of DSP0274-defined measurement blocks."/> + <Annotation Term="Redfish.Revisions"> + <Collection> + <Record> + <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/> + <PropertyValue Property="Version" String="v1_5_0"/> + <PropertyValue Property="Description" String="This property has been deprecated in favor of the ComponentIntegrity resource."/> + </Record> + </Collection> + </Annotation> </Property> </EntityType> </Schema> @@ -561,5 +570,13 @@ </ComplexType> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="StorageController.v1_5_0"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="Redfish.Release" String="2021.4"/> + <Annotation Term="OData.Description" String="This version was created to deprecate Measurements in favor of measurement reporting in the ComponentIntegrity resource."/> + + <EntityType Name="StorageController" BaseType="StorageController.v1_4_0.StorageController"/> + </Schema> + </edmx:DataServices> </edmx:Edmx> diff --git a/static/redfish/v1/schema/Storage_v1.xml b/static/redfish/v1/schema/Storage_v1.xml index f3743c6b2a..83b8294ad7 100644 --- a/static/redfish/v1/schema/Storage_v1.xml +++ b/static/redfish/v1/schema/Storage_v1.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!----> <!--################################################################################ --> -<!--# Redfish Schema: Storage v1.11.0 --> +<!--# Redfish Schema: Storage v1.12.0 --> <!--# --> <!--# For a detailed change log, see the README file contained in the DSP8010 bundle, --> <!--# available at http://www.dmtf.org/standards/redfish --> @@ -1054,6 +1054,15 @@ <Property Name="Measurements" Type="Collection(SoftwareInventory.MeasurementBlock)" Nullable="false"> <Annotation Term="OData.Description" String="An array of DSP0274-defined measurement blocks."/> <Annotation Term="OData.LongDescription" String="This property shall contain an array of DSP0274-defined measurement blocks."/> + <Annotation Term="Redfish.Revisions"> + <Collection> + <Record> + <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/> + <PropertyValue Property="Version" String="v1_12_0"/> + <PropertyValue Property="Description" String="This property has been deprecated in favor of the ComponentIntegrity resource."/> + </Record> + </Collection> + </Annotation> </Property> </EntityType> </Schema> @@ -1091,5 +1100,13 @@ </ComplexType> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_12_0"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="Redfish.Release" String="2021.4"/> + <Annotation Term="OData.Description" String="This version was created to deprecate Measurements in favor of measurement reporting in the ComponentIntegrity resource."/> + + <EntityType Name="Storage" BaseType="Storage.v1_11_0.Storage"/> + </Schema> + </edmx:DataServices> </edmx:Edmx> diff --git a/static/redfish/v1/schema/UpdateService_v1.xml b/static/redfish/v1/schema/UpdateService_v1.xml index 5fe6c1241f..dbbc0fb672 100644 --- a/static/redfish/v1/schema/UpdateService_v1.xml +++ b/static/redfish/v1/schema/UpdateService_v1.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!----> <!--################################################################################ --> -<!--# Redfish Schema: UpdateService v1.10.0 --> +<!--# Redfish Schema: UpdateService v1.11.0 --> <!--# --> <!--# For a detailed change log, see the README file contained in the DSP8010 bundle, --> <!--# available at http://www.dmtf.org/standards/redfish --> @@ -117,6 +117,18 @@ </Collection> </Annotation> </Parameter> + <Parameter Name="ForceUpdate" Type="Edm.Boolean"> + <Annotation Term="OData.Description" String="An indication of whether the service should bypass update policies when applying the provided image. The default is `false`."/> + <Annotation Term="OData.LongDescription" String="This parameter shall indicate whether the service should bypass update policies when applying the provided image, such as allowing a component to be downgraded. Services may contain update policies that are never bypassed, such as minimum version enforcement. If the client does not provide this parameter, the service shall default this value to `false`."/> + <Annotation Term="Redfish.Revisions"> + <Collection> + <Record> + <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/> + <PropertyValue Property="Version" String="v1_11_0"/> + </Record> + </Collection> + </Annotation> + </Parameter> </Action> <Action Name="StartUpdate" IsBound="true"> @@ -545,6 +557,18 @@ <Annotation Term="OData.Description" String="Apply after a reset but within an administrator-specified maintenance window."/> <Annotation Term="OData.LongDescription" String="This value shall indicate the HttpPushUri-provided software is applied during the maintenance window specified by the MaintenanceWindowStartTime and MaintenanceWindowDurationInSeconds properties, and if a reset occurs within the maintenance window."/> </Member> + <Member Name="OnStartUpdateRequest"> + <Annotation Term="OData.Description" String="Apply when the StartUpdate action of the update service is invoked."/> + <Annotation Term="OData.LongDescription" String="This value shall indicate the HttpPushUri-provided software is applied when the StartUpdate action of the update service is invoked."/> + <Annotation Term="Redfish.Revisions"> + <Collection> + <Record> + <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/> + <PropertyValue Property="Version" String="v1_11_0"/> + </Record> + </Collection> + </Annotation> + </Member> </EnumType> </Schema> @@ -646,7 +670,7 @@ <Annotation Term="OData.Description" String="The update parameters used with MultipartHttpPushUri software update."/> <Annotation Term="OData.LongDescription" String="This type shall contain the update parameters when passing the update image when using the URI specified by the MultipartHttpPushUri property to push a software image."/> <Property Name="Targets" Type="Collection(Edm.String)"> - <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> + <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/> <Annotation Term="OData.Description" String="An array of URIs that indicate where to apply the update image."/> <Annotation Term="OData.LongDescription" String="This property shall contain zero or more URIs that indicate where to apply the update image when using the URI specified by the MultipartHttpPushUri property to push a software image. These targets should correspond to software inventory instances or their related items. If this property is not present or contains no targets, the service shall apply the software image to all applicable targets, as determined by the service."/> <Annotation Term="OData.IsURL"/> @@ -762,16 +786,22 @@ <Property Name="VerifyRemoteServerCertificate" Type="Edm.Boolean"> <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/> <Annotation Term="OData.Description" String="An indication of whether the service will verify the certificate of the server referenced by the ImageURI property in SimpleUpdate prior to sending the transfer request."/> - <Annotation Term="OData.LongDescription" String="This property shall indicate whether whether the service will verify the certificate of the server referenced by the ImageURI property in SimpleUpdate prior to sending the transfer request."/> + <Annotation Term="OData.LongDescription" String="This property shall indicate whether whether the service will verify the certificate of the server referenced by the ImageURI property in SimpleUpdate prior to sending the transfer request. If this property is not supported by the service, it shall be assumed to be `false`. This property should default to `false` in order to maintain compatibility with older clients."/> </Property> </EntityType> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_9_1"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to clarify the behavior of VerifyRemoteServerCertificate when not supported or configured."/> + <EntityType Name="UpdateService" BaseType="UpdateService.v1_9_0.UpdateService"/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_10_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2021.2"/> - <EntityType Name="UpdateService" BaseType="UpdateService.v1_8_3.UpdateService"> + <EntityType Name="UpdateService" BaseType="UpdateService.v1_9_1.UpdateService"> <NavigationProperty Name="ClientCertificates" Type="CertificateCollection.CertificateCollection" ContainsTarget="true" Nullable="false"> <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> <Annotation Term="OData.Description" String="The link to a collection of client identity certificates provided to the server referenced by the ImageURI property in SimpleUpdate."/> @@ -781,5 +811,35 @@ </EntityType> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_10_1"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to clarify the behavior of VerifyRemoteServerCertificate when not supported or configured."/> + <EntityType Name="UpdateService" BaseType="UpdateService.v1_10_0.UpdateService"/> + </Schema> + + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_11_0"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="Redfish.Release" String="2021.4"/> + <Annotation Term="OData.Description" String="This version was created to add `OnStartUpdateRequest` to ApplyTime."/> + + <EntityType Name="UpdateService" BaseType="UpdateService.v1_10_1.UpdateService"/> + + <ComplexType Name="HttpPushUriOptions" BaseType="UpdateService.v1_4_0.HttpPushUriOptions"> + <Property Name="ForceUpdate" Type="Edm.Boolean" Nullable="false"> + <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/> + <Annotation Term="OData.Description" String="An indication of whether the service should bypass update policies when applying the HttpPushUri-provided image."/> + <Annotation Term="OData.LongDescription" String="This property shall indicate whether the service should bypass update policies when applying the HttpPushUri-provided image, such as allowing a component to be downgraded. Services may contain update policies that are never bypassed, such as minimum version enforcement. If this property is not present, it shall be assumed to be `false`."/> + </Property> + </ComplexType> + + <ComplexType Name="UpdateParameters" BaseType="UpdateService.v1_8_0.UpdateParameters"> + <Property Name="ForceUpdate" Type="Edm.Boolean" Nullable="false"> + <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/> + <Annotation Term="OData.Description" String="An indication of whether the service should bypass update policies when applying the provided image. The default is `false`."/> + <Annotation Term="OData.LongDescription" String="This property shall indicate whether the service should bypass update policies when applying the provided image, such as allowing a component to be downgraded. Services may contain update policies that are never bypassed, such as minimum version enforcement. If the client does not provide this parameter, the service shall default this value to `false`."/> + </Property> + </ComplexType> + </Schema> + </edmx:DataServices> </edmx:Edmx> diff --git a/static/redfish/v1/schema/VirtualMedia_v1.xml b/static/redfish/v1/schema/VirtualMedia_v1.xml index e16a3cdccb..5bd9403304 100644 --- a/static/redfish/v1/schema/VirtualMedia_v1.xml +++ b/static/redfish/v1/schema/VirtualMedia_v1.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!----> <!--################################################################################ --> -<!--# Redfish Schema: VirtualMedia v1.5.0 --> +<!--# Redfish Schema: VirtualMedia v1.5.1 --> <!--# --> <!--# For a detailed change log, see the README file contained in the DSP8010 bundle, --> <!--# available at http://www.dmtf.org/standards/redfish --> @@ -469,7 +469,7 @@ <Property Name="VerifyCertificate" Type="Edm.Boolean"> <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/> <Annotation Term="OData.Description" String="An indication of whether the service will verify the certificate of the server referenced by the Image property prior to completing the remote media connection."/> - <Annotation Term="OData.LongDescription" String="This property shall indicate whether whether the service will verify the certificate of the server referenced by the Image property prior to completing the remote media connection."/> + <Annotation Term="OData.LongDescription" String="This property shall indicate whether whether the service will verify the certificate of the server referenced by the Image property prior to completing the remote media connection. If this property is not supported by the service, it shall be assumed to be `false`. This property should default to `false` in order to maintain compatibility with older clients."/> </Property> </EntityType> </Schema> @@ -480,6 +480,12 @@ <EntityType Name="VirtualMedia" BaseType="VirtualMedia.v1_4_0.VirtualMedia"/> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VirtualMedia.v1_4_2"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to clarify the behavior of VerifyCertificate when not supported or configured."/> + <EntityType Name="VirtualMedia" BaseType="VirtualMedia.v1_4_1.VirtualMedia"/> + </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VirtualMedia.v1_5_0"> <Annotation Term="Redfish.OwningEntity" String="DMTF"/> <Annotation Term="Redfish.Release" String="2021.2"/> @@ -494,5 +500,11 @@ </EntityType> </Schema> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VirtualMedia.v1_5_1"> + <Annotation Term="Redfish.OwningEntity" String="DMTF"/> + <Annotation Term="OData.Description" String="This version was created to clarify the behavior of VerifyCertificate when not supported or configured."/> + <EntityType Name="VirtualMedia" BaseType="VirtualMedia.v1_5_0.VirtualMedia"/> + </Schema> + </edmx:DataServices> </edmx:Edmx> |