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/Fabric/Fabric.json b/static/redfish/v1/JsonSchemas/Fabric/Fabric.json
index 331b46f..ba0d9aa 100644
--- a/static/redfish/v1/JsonSchemas/Fabric/Fabric.json
+++ b/static/redfish/v1/JsonSchemas/Fabric/Fabric.json
@@ -1,13 +1,13 @@
{
- "$id": "http://redfish.dmtf.org/schemas/v1/Fabric.v1_1_0.json",
+ "$id": "http://redfish.dmtf.org/schemas/v1/Fabric.v1_1_1.json",
"$ref": "#/definitions/Fabric",
"$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"
@@ -34,7 +34,7 @@
"Fabric": {
"additionalProperties": false,
"description": "The Fabric schema represents a simple fabric consisting of one or more switches, zero or more endpoints, and zero or more zones.",
- "longDescription": "This Resource shall represent a simple switchable fabric for a Redfish implementation.",
+ "longDescription": "This resource shall represent a simple switchable fabric 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.",
@@ -70,7 +70,7 @@
"AddressPools": {
"$ref": "http://redfish.dmtf.org/schemas/v1/AddressPoolCollection.json#/definitions/AddressPoolCollection",
"description": "The collection of links to the address pools that this fabric contains.",
- "longDescription": "This property shall contain a link to a Resource Collection of type AddressPoolCollection.",
+ "longDescription": "This property shall contain a link to a resource collection of type AddressPoolCollection.",
"readonly": true,
"versionAdded": "v1_1_0"
},
@@ -88,7 +88,7 @@
"Endpoints": {
"$ref": "http://redfish.dmtf.org/schemas/v1/EndpointCollection.json#/definitions/EndpointCollection",
"description": "The collection of links to the endpoints that this fabric contains.",
- "longDescription": "This property shall contain a link to the Resources of the Endpoint type that this fabric uses.",
+ "longDescription": "This property shall contain a link to a resource collection of type EndpointCollection.",
"readonly": true
},
"FabricType": {
@@ -110,12 +110,12 @@
},
"Links": {
"$ref": "#/definitions/Links",
- "description": "The links to other Resources that are related to this Resource.",
- "longDescription": "This property shall contain links to Resources that are related to but are not contained by or subordinate to this Resource."
+ "description": "The links to other resources that are related to this resource.",
+ "longDescription": "This property shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."
},
"MaxZones": {
"description": "The maximum number of zones the switch can currently configure.",
- "longDescription": "This property shall contain the maximum number of zones the switch can currently configure. This value may change based on changes in the logical or physical configuration of the system.",
+ "longDescription": "This property shall contain the maximum number of zones the switch can currently configure. Changes in the logical or physical configuration of the system might change this value.",
"readonly": true,
"type": [
"integer",
@@ -133,19 +133,19 @@
},
"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 any status or health properties of the Resource."
+ "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."
},
"Switches": {
"$ref": "http://redfish.dmtf.org/schemas/v1/SwitchCollection.json#/definitions/SwitchCollection",
"description": "The collection of links to the switches that this fabric contains.",
- "longDescription": "This property shall contain a link to the Resources of the Switch type that this fabric uses.",
+ "longDescription": "This property shall contain a link to a resource collection of type SwitchCollection.",
"readonly": true
},
"Zones": {
"$ref": "http://redfish.dmtf.org/schemas/v1/ZoneCollection.json#/definitions/ZoneCollection",
"description": "The collection of links to the zones that this fabric contains.",
- "longDescription": "This property shall contain a link to the Resources of the Zone type that this fabric uses.",
+ "longDescription": "This property shall contain a link to a resource collection of type ZoneCollection.",
"readonly": true
}
},
@@ -159,8 +159,8 @@
},
"Links": {
"additionalProperties": false,
- "description": "The links to other Resources that are related to this Resource.",
- "longDescription": "This Redfish Specification-described type shall contain links to Resources that are related to but are not contained by or subordinate to this Resource.",
+ "description": "The links to other resources that are related to this resource.",
+ "longDescription": "This Redfish Specification-described type shall contain links to resources that are related to but are not contained by, or subordinate to, 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.",
@@ -186,8 +186,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.",
@@ -208,5 +208,5 @@
},
"owningEntity": "DMTF",
"release": "2019.4",
- "title": "#Fabric.v1_1_0.Fabric"
+ "title": "#Fabric.v1_1_1.Fabric"
}
\ No newline at end of file