Update Redfish schemas to 2019.2
Note, the DMTF changed the format of the schema file pack yet again, so
the script changes now to compensate for that.
Tested:
Ran schema validator. One unrelated failure in LogEntry, and 4 new
warnings in PCIe devices (we're using a deprecated property). All other
endpoints pass.
Signed-off-by: Ed Tanous <ed.tanous@intel.com>
Change-Id: I81c030a7c5a6a32cc12a5e7e02a9441b7891bc5d
diff --git a/static/redfish/v1/JsonSchemas/PCIeDevice/PCIeDevice.json b/static/redfish/v1/JsonSchemas/PCIeDevice/PCIeDevice.json
index 4f7c224..3358583 100644
--- a/static/redfish/v1/JsonSchemas/PCIeDevice/PCIeDevice.json
+++ b/static/redfish/v1/JsonSchemas/PCIeDevice/PCIeDevice.json
@@ -1,14 +1,15 @@
{
+ "$id": "http://redfish.dmtf.org/schemas/v1/PCIeDevice.v1_4_0.json",
"$ref": "#/definitions/PCIeDevice",
"$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
- "copyright": "Copyright 2014-2018 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+ "copyright": "Copyright 2014-2019 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_.]+$": {
+ "^([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.",
"type": [
"array",
@@ -24,8 +25,9 @@
"properties": {
"Oem": {
"$ref": "#/definitions/OemActions",
- "description": "This property contains the available OEM specific actions for this resource.",
- "longDescription": "This property shall contain any additional OEM 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.",
+ "versionAdded": "v1_1_0"
}
},
"type": "object"
@@ -38,17 +40,17 @@
],
"enumDescriptions": {
"MultiFunction": "A multi-function PCIe device.",
- "Simulated": "A PCIe device which is not currently physically present, but is being simulated by the PCIe infrastructure.",
+ "Simulated": "A PCIe device that is not currently physically present, but is being simulated by the PCIe infrastructure.",
"SingleFunction": "A single-function PCIe device."
},
"type": "string"
},
"Links": {
"additionalProperties": false,
- "description": "Contains references to other resources that are related to this resource.",
- "longDescription": "This type, as described by the Redfish Specification, shall contain references to resources that are related to, but not contained by (subordinate to), this resource.",
+ "description": "The links to other Resources that are related to this Resource.",
+ "longDescription": "The Redfish Specification-described type shall contain links to Resources related to but not subordinate to this Resource.",
"patternProperties": {
- "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+ "^([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.",
"type": [
"array",
@@ -63,43 +65,45 @@
},
"properties": {
"Chassis": {
- "description": "An array of references to the chassis in which the PCIe device is contained.",
+ "description": "An array of links to the chassis in which the PCIe device is contained.",
"items": {
"$ref": "http://redfish.dmtf.org/schemas/v1/Chassis.json#/definitions/Chassis"
},
- "longDescription": "The value of this property shall reference a resource of type Chassis that represents the physical container associated with this resource.",
+ "longDescription": "This property shall link to a Resource of type Chassis that represents the physical container associated with this Resource.",
"readonly": true,
"type": "array"
},
"Chassis@odata.count": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
+ "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
},
"Oem": {
"$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
- "description": "Oem extension object.",
- "longDescription": "This object represents the Oem property. All values for resources described by this schema shall comply to the requirements as described in the Redfish specification."
+ "description": "The OEM extension property.",
+ "longDescription": "This property shall contain the OEM extensions. All values for properties contained in this object shall conform to the Redfish Specification-described requirements."
},
"PCIeFunctions": {
- "description": "An array of references to PCIeFunctions exposed by this device.",
+ "deprecated": "This property has been deprecated in favor of the PCIeFunctions property in the root that provides a link to a Resource Collection.",
+ "description": "An array of links to PCIeFunctions exposed by this device.",
"items": {
"$ref": "http://redfish.dmtf.org/schemas/v1/PCIeFunction.json#/definitions/PCIeFunction"
},
- "longDescription": "The value of this property shall be a reference to the resources that this device exposes and shall reference a resource of type PCIeFunction.",
+ "longDescription": "This property shall contain a link to the Resources of the PCIeFunction type that this device exposes.",
"readonly": true,
- "type": "array"
+ "type": "array",
+ "versionDeprecated": "v1_4_0"
},
"PCIeFunctions@odata.count": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
+ "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
}
},
"type": "object"
},
"OemActions": {
"additionalProperties": true,
- "description": "The available OEM specific actions for this resource.",
- "longDescription": "This type shall contain any additional OEM 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_.]+$": {
+ "^([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.",
"type": [
"array",
@@ -117,10 +121,10 @@
},
"PCIeDevice": {
"additionalProperties": false,
- "description": "This is the schema definition for the PCIeDevice resource. It represents the properties of a PCIeDevice attached to a System.",
- "longDescription": "This resource shall be used to represent a PCIeDevice attached to a System.",
+ "description": "The PCIeDevice schema describes the properties of a PCIe device that is attached to a system.",
+ "longDescription": "This Resource contains a PCIeDevice that is attached to a system.",
"patternProperties": {
- "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+ "^([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.",
"type": [
"array",
@@ -135,31 +139,33 @@
},
"properties": {
"@odata.context": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/context"
+ "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/context"
},
"@odata.etag": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/etag"
+ "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/etag"
},
"@odata.id": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/id"
+ "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id"
},
"@odata.type": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/type"
+ "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
},
"Actions": {
"$ref": "#/definitions/Actions",
- "description": "The available actions for this resource.",
- "longDescription": "The Actions 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.",
+ "versionAdded": "v1_1_0"
},
"Assembly": {
"$ref": "http://redfish.dmtf.org/schemas/v1/Assembly.json#/definitions/Assembly",
- "description": "A reference to the Assembly resource associated with this PCIe device.",
- "longDescription": "The value of this property shall be a link to a resource of type Assembly.",
- "readonly": true
+ "description": "The link to the assembly Resource associated with this PCIe device.",
+ "longDescription": "This property shall contain a link to a Resource of type assembly.",
+ "readonly": true,
+ "versionAdded": "v1_2_0"
},
"AssetTag": {
- "description": "The user assigned asset tag for this PCIe device.",
- "longDescription": "The value of this property shall be an identifying string used to track the PCIe device for inventory purposes.",
+ "description": "The user-assigned asset tag for this PCIe device.",
+ "longDescription": "This property shall contain an identifying string that tracks the PCIe device for inventory purposes.",
"readonly": false,
"type": [
"string",
@@ -180,12 +186,12 @@
"DeviceType": {
"$ref": "#/definitions/DeviceType",
"description": "The device type for this PCIe device.",
- "longDescription": "The value of this property shall be the device type of the PCIe device such as SingleFunction or MultiFunction.",
+ "longDescription": "This property shall contain the device type of the PCIe device such as SingleFunction or MultiFunction.",
"readonly": true
},
"FirmwareVersion": {
"description": "The version of firmware for this PCIe device.",
- "longDescription": "The value of this property shall be the firmware version of the PCIe device.",
+ "longDescription": "This property shall contain the firmware version of the PCIe device.",
"readonly": true,
"type": [
"string",
@@ -198,12 +204,12 @@
},
"Links": {
"$ref": "#/definitions/Links",
- "description": "The links object contains the links to other resources that are related to this resource.",
- "longDescription": "The Links property, as described by the Redfish Specification, shall contain references to resources that are related to, but not contained by (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."
},
"Manufacturer": {
- "description": "This is the manufacturer of this PCIe device.",
- "longDescription": "The value of this property shall be the name of the organization responsible for producing the PCIe device. This organization might be the entity from whom the PCIe device is purchased, but this is not necessarily true.",
+ "description": "The manufacturer of this PCIe device.",
+ "longDescription": "This property shall contain the name of the organization responsible for producing the PCIe device. This organization might be the entity from whom the PCIe device is purchased, but this is not necessarily true.",
"readonly": true,
"type": [
"string",
@@ -211,8 +217,8 @@
]
},
"Model": {
- "description": "This is the model number for the PCIe device.",
- "longDescription": "The value of this property shall be the name by which the manufacturer generally refers to the PCIe device.",
+ "description": "The model number for the PCIe device.",
+ "longDescription": "This property shall contain the name by which the manufacturer generally refers to the PCIe device.",
"readonly": true,
"type": [
"string",
@@ -225,24 +231,25 @@
},
"Oem": {
"$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
- "description": "This is the manufacturer/provider specific extension moniker used to divide the Oem object into sections.",
- "longDescription": "The value of this string shall be of the format for the reserved word *Oem*."
+ "description": "The OEM extension property.",
+ "longDescription": "This property shall contain the OEM extensions. All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
+ },
+ "PCIeFunctions": {
+ "$ref": "http://redfish.dmtf.org/schemas/v1/PCIeFunctionCollection.json#/definitions/PCIeFunctionCollection",
+ "description": "The link to the collection of PCIe functions associated with this PCIe device.",
+ "longDescription": "This property shall contain a link to a Resource Collection of type PCIeFunctionCollection.",
+ "readonly": true,
+ "versionAdded": "v1_4_0"
},
"PCIeInterface": {
- "anyOf": [
- {
- "$ref": "#/definitions/PCIeInterface"
- },
- {
- "type": "null"
- }
- ],
+ "$ref": "#/definitions/PCIeInterface",
"description": "The PCIe interface details for this PCIe device.",
- "longDescription": "This object shall contain details on the PCIe interface used to connect this PCIe Device to its host or upstream switch."
+ "longDescription": "This object shall contain details for the PCIe interface that connects this PCIe device to its host or upstream switch.",
+ "versionAdded": "v1_3_0"
},
"PartNumber": {
"description": "The part number for this PCIe device.",
- "longDescription": "The value of this property shall be a part number assigned by the organization that is responsible for producing or manufacturing the PCIe device.",
+ "longDescription": "This property shall contain a part number assigned by the organization that is responsible for producing or manufacturing the PCIe device.",
"readonly": true,
"type": [
"string",
@@ -250,8 +257,8 @@
]
},
"SKU": {
- "description": "This is the SKU for this PCIe device.",
- "longDescription": "The value of this property shall be the stock-keeping unit number for this PCIe device.",
+ "description": "The SKU for this PCIe device.",
+ "longDescription": "This property shall contain the stock-keeping unit number for this PCIe device.",
"readonly": true,
"type": [
"string",
@@ -260,7 +267,7 @@
},
"SerialNumber": {
"description": "The serial number for this PCIe device.",
- "longDescription": "The value of this property shall be a manufacturer-allocated number used to identify the PCIe device.",
+ "longDescription": "This property shall contain a manufacturer-allocated number that identifies the PCIe device.",
"readonly": true,
"type": [
"string",
@@ -269,8 +276,8 @@
},
"Status": {
"$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
- "description": "This property describes the status and health of the resource and its children.",
- "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."
}
},
"required": [
@@ -283,10 +290,10 @@
},
"PCIeInterface": {
"additionalProperties": false,
- "description": "This is the definition for a PCI Interface object.",
- "longDescription": "These properties shall be the definition for a PCIe Interface for a Redfish implementation.",
+ "description": "This type defines a PCI interface.",
+ "longDescription": "These properties shall contain the definition for a PCIe Interface for a Redfish implementation.",
"patternProperties": {
- "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+ "^([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.",
"type": [
"array",
@@ -301,24 +308,26 @@
},
"properties": {
"LanesInUse": {
- "description": "This is the number of PCIe lanes in use by this device.",
- "longDescription": "The value of this property shall be the number of PCIe lanes in use by this device, which shall be equal or less than the value of MaxLanes.",
+ "description": "The number of PCIe lanes in use by this device.",
+ "longDescription": "This property shall contain the number of PCIe lanes in use by this device, which shall be equal to or less than the MaxLanes property value.",
"maximum": 32,
"readonly": true,
"type": [
"integer",
"null"
- ]
+ ],
+ "versionAdded": "v1_3_0"
},
"MaxLanes": {
- "description": "This is the number of PCIe lanes supported by this device.",
- "longDescription": "The value of this property shall be the maximum number of PCIe lanes supported by this device.",
+ "description": "The number of PCIe lanes supported by this device.",
+ "longDescription": "This property shall contain the maximum number of PCIe lanes supported by this device.",
"maximum": 32,
"readonly": true,
"type": [
"integer",
"null"
- ]
+ ],
+ "versionAdded": "v1_3_0"
},
"MaxPCIeType": {
"anyOf": [
@@ -330,13 +339,15 @@
}
],
"description": "The highest version of the PCIe specification supported by this device.",
- "longDescription": "The value of this property shall be the maximum PCIe specification that this device supports.",
- "readonly": true
+ "longDescription": "This property shall contain the maximum PCIe specification that this device supports.",
+ "readonly": true,
+ "versionAdded": "v1_3_0"
},
"Oem": {
"$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
- "description": "Oem extension object.",
- "longDescription": "This object represents the Oem property. All values for resources described by this schema shall comply to the requirements as described in the Redfish specification."
+ "description": "The OEM extension property.",
+ "longDescription": "This property shall contain the OEM extensions. All values for properties contained in this object shall conform to the Redfish Specification-described requirements.",
+ "versionAdded": "v1_3_0"
},
"PCIeType": {
"anyOf": [
@@ -348,30 +359,15 @@
}
],
"description": "The version of the PCIe specification in use by this device.",
- "longDescription": "The value of this property shall be the negotiated PCIe interface version in use by this device.",
- "readonly": true
+ "longDescription": "This property shall contain the negotiated PCIe interface version in use by this device.",
+ "readonly": true,
+ "versionAdded": "v1_3_0"
}
},
"type": "object"
- },
- "PCIeTypes": {
- "enum": [
- "Gen1",
- "Gen2",
- "Gen3",
- "Gen4",
- "Gen5"
- ],
- "enumDescriptions": {
- "Gen1": "A PCIe v1.0 slot.",
- "Gen2": "A PCIe v2.0 slot.",
- "Gen3": "A PCIe v3.0 slot.",
- "Gen4": "A PCIe v4.0 slot.",
- "Gen5": "A PCIe v5.0 slot."
- },
- "type": "string"
}
},
"owningEntity": "DMTF",
- "title": "#PCIeDevice.v1_3_0.PCIeDevice"
+ "release": "2019.2",
+ "title": "#PCIeDevice.v1_4_0.PCIeDevice"
}
\ No newline at end of file