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>

1 files changed, 42 insertions, 42 deletions

diff --git a/static/redfish/v1/JsonSchemas/Sensor/Sensor.json b/static/redfish/v1/JsonSchemas/Sensor/Sensor.json
index b12179f4e0..bdf9e7cbd9 100644
--- a/static/redfish/v1/JsonSchemas/Sensor/Sensor.json
+++ b/static/redfish/v1/JsonSchemas/Sensor/Sensor.json
@@ -1,13 +1,13 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Sensor.v1_1_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Sensor.v1_1_1.json",
     "$ref": "#/definitions/Sensor",
     "$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.",
@@ -28,8 +28,8 @@
                 },
                 "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"
@@ -49,8 +49,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.",
@@ -163,7 +163,7 @@
         "Sensor": {
             "additionalProperties": false,
             "description": "The Sensor schema describes a sensor and its properties.",
-            "longDescription": "This Resource represents a Sensor for a Redfish implementation.",
+            "longDescription": "This resource shall represent a sensor for 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.",
@@ -203,12 +203,12 @@
                 },
                 "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."
                 },
                 "AdjustedMaxAllowableOperatingValue": {
                     "description": "The adjusted maximum allowable operating value for this equipment based on the environmental conditions.",
-                    "longDescription": "This property shall contain the adjusted maximum allowable operating value for the equipment that this sensor monitors, as specified by a standards body, manufacturer, or both.  The value is adjusted based on environmental conditions.  For example, liquid inlet temperature may be adjusted based on the available liquid pressure.",
+                    "longDescription": "This property shall contain the adjusted maximum allowable operating value for the equipment that this sensor monitors, as specified by a standards body, manufacturer, or both.  The value is adjusted based on environmental conditions.  For example, liquid inlet temperature can be adjusted based on the available liquid pressure.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -217,7 +217,7 @@
                 },
                 "AdjustedMinAllowableOperatingValue": {
                     "description": "The adjusted minimum allowable operating value for this equipment based on the environmental conditions.",
-                    "longDescription": "This property shall contain the adjusted minimum allowable operating value for the equipment that this sensor monitors, as specified by a standards body, manufacturer, or both.  This value is adjusted based on environmental conditions.  For example, liquid inlet temperature may be adjusted based on the available liquid pressure.",
+                    "longDescription": "This property shall contain the adjusted minimum allowable operating value for the equipment that this sensor monitors, as specified by a standards body, manufacturer, or both.  This value is adjusted based on environmental conditions.  For example, liquid inlet temperature can be adjusted based on the available liquid pressure.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -227,7 +227,7 @@
                 "ApparentVA": {
                     "description": "The product of voltage and current for an AC circuit, in Volt-Ampere units.",
                     "excerpt": "SensorPower",
-                    "longDescription": "This property shall contain the product of VoltageRMS multiplied by CurrentRMS for a circuit.  This property may appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
+                    "longDescription": "This property shall contain the product of VoltageRMS multiplied by CurrentRMS for a circuit.  This property can appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -300,9 +300,9 @@
                     "versionAdded": "v1_1_0"
                 },
                 "LoadPercent": {
-                    "deprecated": "This property has been deprecated in favor of using a Sensor instance with a ReadingType of `Percent` to show utilization values when needed.",
+                    "deprecated": "This property has been deprecated in favor of using a sensor instance with a ReadingType of `Percent` to show utilization values when needed.",
                     "description": "The power load utilization for this sensor.",
-                    "longDescription": "This property shall indicate the power load utilization percent for this sensor.  This property may appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
+                    "longDescription": "This property shall indicate the power load utilization percent for this sensor.  This property can appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -393,7 +393,7 @@
                 "PowerFactor": {
                     "description": "The power factor for this sensor.",
                     "excerpt": "SensorPower",
-                    "longDescription": "This property shall identify the quotient of PowerRealWatts and PowerApparentVA for a circuit.  PowerFactor is expressed in unit-less 1/100ths.  This property may appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
+                    "longDescription": "This property shall identify the quotient of PowerRealWatts and PowerApparentVA 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.",
                     "maximum": 1,
                     "minimum": 0,
                     "readonly": true,
@@ -414,7 +414,7 @@
                 "ReactiveVAR": {
                     "description": "The square root of the difference term of squared ApparentVA and squared Power (Reading) for a circuit, in var units.",
                     "excerpt": "SensorPower",
-                    "longDescription": "This property shall contain the arithmetic mean of product terms of instantaneous voltage and quadrature current measurements calculated over an integer number of line cycles for a circuit.  This property may appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
+                    "longDescription": "This property shall contain the arithmetic mean of product terms of instantaneous voltage and quadrature current measurements calculated over an integer number of line cycles for a circuit.  This property can appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -518,8 +518,8 @@
                 },
                 "Status": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
-                    "description": "The status and health of the Resource and its subordinate or dependent Resources.",
-                    "longDescription": "This property shall contain the status and health of the Resource and its children."
+                    "description": "The status and health of the resource and its subordinate or dependent resources.",
+                    "longDescription": "This property shall contain any status or health properties of the resource."
                 },
                 "THDPercent": {
                     "description": "The total harmonic distortion (THD).",
@@ -563,7 +563,7 @@
             "additionalProperties": false,
             "description": "The Sensor schema describes a sensor and its properties.",
             "excerpt": "SensorArray",
-            "longDescription": "This Resource represents a Sensor for a Redfish implementation.",
+            "longDescription": "This resource shall represent a sensor for 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.",
@@ -580,10 +580,10 @@
             },
             "properties": {
                 "DataSourceUri": {
-                    "description": "The link to the Resource that provides the data for this sensor.",
+                    "description": "The link to the resource that provides the data for this sensor.",
                     "excerptCopyOnly": true,
                     "format": "uri-reference",
-                    "longDescription": "This property shall contain a URI to the Resource that provides the source of the Excerpt contained within this copy.",
+                    "longDescription": "This property shall contain a URI to the resource that provides the source of the excerpt contained within this copy.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -635,7 +635,7 @@
             "additionalProperties": false,
             "description": "The Sensor schema describes a sensor and its properties.",
             "excerpt": "SensorCurrent",
-            "longDescription": "This Resource represents a Sensor for a Redfish implementation.",
+            "longDescription": "This resource shall represent a sensor for 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.",
@@ -663,10 +663,10 @@
                     "versionAdded": "v1_1_0"
                 },
                 "DataSourceUri": {
-                    "description": "The link to the Resource that provides the data for this sensor.",
+                    "description": "The link to the resource that provides the data for this sensor.",
                     "excerptCopyOnly": true,
                     "format": "uri-reference",
-                    "longDescription": "This property shall contain a URI to the Resource that provides the source of the Excerpt contained within this copy.",
+                    "longDescription": "This property shall contain a URI to the resource that provides the source of the excerpt contained within this copy.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -701,7 +701,7 @@
             "additionalProperties": false,
             "description": "The Sensor schema describes a sensor and its properties.",
             "excerpt": "SensorEnergykWh",
-            "longDescription": "This Resource represents a Sensor for a Redfish implementation.",
+            "longDescription": "This resource shall represent a sensor for 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.",
@@ -718,10 +718,10 @@
             },
             "properties": {
                 "DataSourceUri": {
-                    "description": "The link to the Resource that provides the data for this sensor.",
+                    "description": "The link to the resource that provides the data for this sensor.",
                     "excerptCopyOnly": true,
                     "format": "uri-reference",
-                    "longDescription": "This property shall contain a URI to the Resource that provides the source of the Excerpt contained within this copy.",
+                    "longDescription": "This property shall contain a URI to the resource that provides the source of the excerpt contained within this copy.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -767,7 +767,7 @@
             "additionalProperties": false,
             "description": "The Sensor schema describes a sensor and its properties.",
             "excerpt": "Sensor",
-            "longDescription": "This Resource represents a Sensor for a Redfish implementation.",
+            "longDescription": "This resource shall represent a sensor for 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.",
@@ -784,10 +784,10 @@
             },
             "properties": {
                 "DataSourceUri": {
-                    "description": "The link to the Resource that provides the data for this sensor.",
+                    "description": "The link to the resource that provides the data for this sensor.",
                     "excerptCopyOnly": true,
                     "format": "uri-reference",
-                    "longDescription": "This property shall contain a URI to the Resource that provides the source of the Excerpt contained within this copy.",
+                    "longDescription": "This property shall contain a URI to the resource that provides the source of the excerpt contained within this copy.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -811,7 +811,7 @@
             "additionalProperties": false,
             "description": "The Sensor schema describes a sensor and its properties.",
             "excerpt": "SensorPower",
-            "longDescription": "This Resource represents a Sensor for a Redfish implementation.",
+            "longDescription": "This resource shall represent a sensor for 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.",
@@ -830,7 +830,7 @@
                 "ApparentVA": {
                     "description": "The product of voltage and current for an AC circuit, in Volt-Ampere units.",
                     "excerpt": "SensorPower",
-                    "longDescription": "This property shall contain the product of VoltageRMS multiplied by CurrentRMS for a circuit.  This property may appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
+                    "longDescription": "This property shall contain the product of VoltageRMS multiplied by CurrentRMS for a circuit.  This property can appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -839,10 +839,10 @@
                     "units": "V.A"
                 },
                 "DataSourceUri": {
-                    "description": "The link to the Resource that provides the data for this sensor.",
+                    "description": "The link to the resource that provides the data for this sensor.",
                     "excerptCopyOnly": true,
                     "format": "uri-reference",
-                    "longDescription": "This property shall contain a URI to the Resource that provides the source of the Excerpt contained within this copy.",
+                    "longDescription": "This property shall contain a URI to the resource that provides the source of the excerpt contained within this copy.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -852,7 +852,7 @@
                 "PowerFactor": {
                     "description": "The power factor for this sensor.",
                     "excerpt": "SensorPower",
-                    "longDescription": "This property shall identify the quotient of PowerRealWatts and PowerApparentVA for a circuit.  PowerFactor is expressed in unit-less 1/100ths.  This property may appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
+                    "longDescription": "This property shall identify the quotient of PowerRealWatts and PowerApparentVA 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.",
                     "maximum": 1,
                     "minimum": 0,
                     "readonly": true,
@@ -864,7 +864,7 @@
                 "ReactiveVAR": {
                     "description": "The square root of the difference term of squared ApparentVA and squared Power (Reading) for a circuit, in var units.",
                     "excerpt": "SensorPower",
-                    "longDescription": "This property shall contain the arithmetic mean of product terms of instantaneous voltage and quadrature current measurements calculated over an integer number of line cycles for a circuit.  This property may appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
+                    "longDescription": "This property shall contain the arithmetic mean of product terms of instantaneous voltage and quadrature current measurements calculated over an integer number of line cycles for a circuit.  This property can appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -889,7 +889,7 @@
             "additionalProperties": false,
             "description": "The Sensor schema describes a sensor and its properties.",
             "excerpt": "SensorVoltage",
-            "longDescription": "This Resource represents a Sensor for a Redfish implementation.",
+            "longDescription": "This resource shall represent a sensor for 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.",
@@ -917,10 +917,10 @@
                     "versionAdded": "v1_1_0"
                 },
                 "DataSourceUri": {
-                    "description": "The link to the Resource that provides the data for this sensor.",
+                    "description": "The link to the resource that provides the data for this sensor.",
                     "excerptCopyOnly": true,
                     "format": "uri-reference",
-                    "longDescription": "This property shall contain a URI to the Resource that provides the source of the Excerpt contained within this copy.",
+                    "longDescription": "This property shall contain a URI to the resource that provides the source of the excerpt contained within this copy.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -1078,5 +1078,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2019.4",
-    "title": "#Sensor.v1_1_0.Sensor"
+    "title": "#Sensor.v1_1_1.Sensor"
 }
\ No newline at end of file