Move to 2020.2
Point update_schemas.py at 2020.2 and run the script.
An overview of 2020.2 can be found at:
https://www.dmtf.org/sites/default/files/Redfish_Release_2020.2_Overview.pdf
Tested: Loaded on a Witherspoon and ran the validator.
See the new schemas.
Change-Id: Idb6cbc58efe484dcffa0cc22deff3a4746af67ed
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
diff --git a/static/redfish/v1/JsonSchemas/MetricDefinition/MetricDefinition.json b/static/redfish/v1/JsonSchemas/MetricDefinition/MetricDefinition.json
index 1a979a8..a950465 100644
--- a/static/redfish/v1/JsonSchemas/MetricDefinition/MetricDefinition.json
+++ b/static/redfish/v1/JsonSchemas/MetricDefinition/MetricDefinition.json
@@ -1,13 +1,13 @@
{
- "$id": "http://redfish.dmtf.org/schemas/v1/MetricDefinition.v1_0_3.json",
+ "$id": "http://redfish.dmtf.org/schemas/v1/MetricDefinition.v1_0_4.json",
"$ref": "#/definitions/MetricDefinition",
"$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
- "copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+ "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
"definitions": {
"Actions": {
"additionalProperties": false,
- "description": "The available actions for this Resource.",
- "longDescription": "This type shall contain the available actions for this Resource.",
+ "description": "The available actions for this resource.",
+ "longDescription": "This type shall contain the available actions for this resource.",
"patternProperties": {
"^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
"description": "This property shall specify a valid odata or Redfish property.",
@@ -25,8 +25,8 @@
"properties": {
"Oem": {
"$ref": "#/definitions/OemActions",
- "description": "The available OEM-specific actions for this Resource.",
- "longDescription": "This property shall contain the available OEM-specific actions for this Resource."
+ "description": "The available OEM-specific actions for this resource.",
+ "longDescription": "This property shall contain the available OEM-specific actions for this resource."
}
},
"type": "object"
@@ -131,7 +131,7 @@
],
"enumDescriptions": {
"Boolean": "The JSON boolean definition.",
- "DateTime": "The JSON string definition with the 'date-time' format.",
+ "DateTime": "The JSON string definition with the date-time format.",
"Decimal": "The JSON decimal definition.",
"Enumeration": "The JSON string definition with a set of defined enumerations.",
"Integer": "The JSON integer definition.",
@@ -143,7 +143,7 @@
"MetricDefinition": {
"additionalProperties": false,
"description": "The MetricDefinition schema describes the metadata information for a metric.",
- "longDescription": "This Resource shall contain the metadata information for a metric.",
+ "longDescription": "This resource shall contain the metadata information for a metric in a Redfish implementation.",
"patternProperties": {
"^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
"description": "This property shall specify a valid odata or Redfish property.",
@@ -182,8 +182,8 @@
},
"Actions": {
"$ref": "#/definitions/Actions",
- "description": "The available actions for this Resource.",
- "longDescription": "This property shall contain the available actions for this Resource."
+ "description": "The available actions for this resource.",
+ "longDescription": "This property shall contain the available actions for this resource."
},
"Calculable": {
"anyOf": [
@@ -223,12 +223,12 @@
}
]
},
- "longDescription": "This property shall list the metric properties that are part of the synthesis calculation. When MetricType=Synthesis, this property may be present.",
+ "longDescription": "This property shall list the metric properties that are part of the synthesis calculation. When MetricType=Synthesis, this property can be present.",
"type": "array"
},
"CalculationTimeInterval": {
"description": "The time interval over which the metric calculation is performed.",
- "longDescription": "This property shall specify the time interval over the metric calculation is performed. The format of the value shall conform to the Duration format.",
+ "longDescription": "This property shall specify the time interval over the metric calculation is performed.",
"pattern": "-?P(\\d+D)?(T(\\d+H)?(\\d+M)?(\\d+(.\\d+)?S)?)?",
"readonly": false,
"type": [
@@ -264,7 +264,7 @@
"null"
]
},
- "longDescription": "The values of the property shall specify the possible values of the discrete metic. This property shall have values when the MetricType property has the value 'Discrete'.",
+ "longDescription": "The values of the property shall specify the possible values of the discrete metic. This property shall have values when the MetricType property is `Discrete`.",
"readonly": false,
"type": "array"
},
@@ -287,7 +287,7 @@
},
"IsLinear": {
"description": "An indication of whether the metric values are linear versus non-linear.",
- "longDescription": "This property shall indicate whether the metric values are linear versus non-linear. Linear metrics may use a greater than relation to compared them. An example of linear metrics include performance metrics. Examples of non-linear metrics include error codes.",
+ "longDescription": "This property shall indicate whether the metric values are linear versus non-linear. Linear metrics can use a greater than relation to compared them. An example of linear metrics include performance metrics. Examples of non-linear metrics include error codes.",
"readonly": false,
"type": [
"boolean",
@@ -296,7 +296,7 @@
},
"MaxReadingRange": {
"description": "Maximum value for metric reading.",
- "longDescription": "The value shall indicate the highest possible value for a related MetricValue. The value shall have the units specified in the property Units. The property is not meaningful, when the MetricType property has the value 'Discrete'.",
+ "longDescription": "The value shall indicate the highest possible value for a related MetricValue. The value shall have the units specified in the property Units. The property is not meaningful when the MetricType property is `Discrete`.",
"readonly": true,
"type": [
"number",
@@ -325,7 +325,7 @@
"null"
]
},
- "longDescription": "This array property shall list the URIs with wildcards and property identifiers that this metric defines. A set of curly braces shall delimit each wildcard in the URI. The corresponding entry in the Wildcard property shall replace each wildcard. After a URI with wildcards replaces its wildcards, it shall identify a Resource property to which the metric definition applies. The property identifiers portion of the URI shall follow RFC6901-defined JSON fragment notation rules.",
+ "longDescription": "This array property shall list the URIs with wildcards and property identifiers that this metric defines. A set of curly braces shall delimit each wildcard in the URI. The corresponding entry in the Wildcard property shall replace each wildcard. After a URI with wildcards replaces its wildcards, it shall identify a resource property to which the metric definition applies. The property identifiers portion of the URI shall follow RFC6901-defined JSON fragment notation rules.",
"readonly": false,
"type": "array"
},
@@ -344,7 +344,7 @@
},
"MinReadingRange": {
"description": "Minimum value for metric reading.",
- "longDescription": "This property shall contain the lowest possible value for the metric reading. The value shall have the units specified in the property Units. The property is not meaningful, when the MetricType property has the value 'Discrete'.",
+ "longDescription": "This property shall contain the lowest possible value for the metric reading. The value shall have the units specified in the property Units. The property is not meaningful when the MetricType property is `Discrete`.",
"readonly": true,
"type": [
"number",
@@ -375,7 +375,7 @@
},
"Precision": {
"description": "Number of significant digits in the metric reading.",
- "longDescription": "This property shall specify the number of significant digits in the metric reading. The property is not meaningful, when the MetricType property has the value 'Discrete'.",
+ "longDescription": "This property shall specify the number of significant digits in the metric reading. The property is not meaningful when the MetricType property is `Discrete`.",
"readonly": true,
"type": [
"integer",
@@ -384,7 +384,7 @@
},
"SensingInterval": {
"description": "The time interval between when a metric is updated.",
- "longDescription": "This property shall specify the time interval between when a metric is updated. The format of the value shall conform to the Duration format.",
+ "longDescription": "This property shall specify the time interval between when a metric is updated.",
"pattern": "-?P(\\d+D)?(T(\\d+H)?(\\d+M)?(\\d+(.\\d+)?S)?)?",
"readonly": false,
"type": [
@@ -394,7 +394,7 @@
},
"TimestampAccuracy": {
"description": "The accuracy of the timestamp.",
- "longDescription": "This property shall specify the expected + or - variability of the timestamp. The format of the value shall conform to the Duration format.",
+ "longDescription": "This property shall specify the expected + or - variability of the timestamp.",
"pattern": "-?P(\\d+D)?(T(\\d+H)?(\\d+M)?(\\d+(.\\d+)?S)?)?",
"readonly": true,
"type": [
@@ -452,8 +452,8 @@
},
"OemActions": {
"additionalProperties": true,
- "description": "The available OEM-specific actions for this Resource.",
- "longDescription": "This type shall contain the available OEM-specific actions for this Resource.",
+ "description": "The available OEM-specific actions for this resource.",
+ "longDescription": "This type shall contain the available OEM-specific actions for this resource.",
"patternProperties": {
"^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
"description": "This property shall specify a valid odata or Redfish property.",
@@ -517,5 +517,5 @@
},
"owningEntity": "DMTF",
"release": "2018.2",
- "title": "#MetricDefinition.v1_0_3.MetricDefinition"
+ "title": "#MetricDefinition.v1_0_4.MetricDefinition"
}
\ No newline at end of file