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/PCIeFunction/PCIeFunction.json b/static/redfish/v1/JsonSchemas/PCIeFunction/PCIeFunction.json
index 94e628c..a607d06 100644
--- a/static/redfish/v1/JsonSchemas/PCIeFunction/PCIeFunction.json
+++ b/static/redfish/v1/JsonSchemas/PCIeFunction/PCIeFunction.json
@@ -1,14 +1,15 @@
{
+ "$id": "http://redfish.dmtf.org/schemas/v1/PCIeFunction.v1_2_3.json",
"$ref": "#/definitions/PCIeFunction",
"$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"
@@ -71,7 +73,7 @@
"MultimediaController": "A multimedia controller.",
"NetworkController": "A network controller.",
"NonEssentialInstrumentation": "A non-essential instrumentation.",
- "Other": "A other class. The function Device Class Id needs to be verified.",
+ "Other": "A other class. The function Device Class Id needs to be verified.",
"ProcessingAccelerators": "A processing accelerators.",
"Processor": "A processor.",
"SatelliteCommunicationsController": "A satellite communications controller.",
@@ -89,17 +91,17 @@
"Virtual"
],
"enumDescriptions": {
- "Physical": "A physical PCie function.",
+ "Physical": "A physical PCIe function.",
"Virtual": "A virtual PCIe function."
},
"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": "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_.]+$": {
+ "^([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",
@@ -114,80 +116,74 @@
},
"properties": {
"Drives": {
- "description": "An array of references to the drives which the PCIe device produces.",
+ "description": "An array of links to the drives that the PCIe device produces.",
"items": {
"$ref": "http://redfish.dmtf.org/schemas/v1/Drive.json#/definitions/Drive"
},
- "longDescription": "The value of this property shall reference a resource of type Drive that represents the storage drives associated with this resource.",
+ "longDescription": "This property shall link to a Resource of type Drive that represents the storage drives associated with this Resource.",
"readonly": true,
"type": "array"
},
"Drives@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"
},
"EthernetInterfaces": {
- "description": "An array of references to the ethernet interfaces which the PCIe device produces.",
+ "description": "An array of links to the Ethernet interfaces that the PCIe device produces.",
"items": {
"$ref": "http://redfish.dmtf.org/schemas/v1/EthernetInterface.json#/definitions/EthernetInterface"
},
- "longDescription": "The value of this property shall reference a resource of type EthernetInterface that represents the network interfaces associated with this resource.",
+ "longDescription": "This property shall link to a Resource of type EthernetInterface that represents the network interfaces associated with this Resource.",
"readonly": true,
"type": "array"
},
"EthernetInterfaces@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"
},
"NetworkDeviceFunctions": {
- "description": "An array of references to the Network Device Functions which the PCIe device produces.",
+ "description": "An array of links to the network device functions that the PCIe device produces.",
"items": {
"$ref": "http://redfish.dmtf.org/schemas/v1/NetworkDeviceFunction.json#/definitions/NetworkDeviceFunction"
},
- "longDescription": "The value of this property shall be an array of references to resources of type NetworkDeviceFunction that represents the network device functions associated with this resource.",
+ "longDescription": "This property shall contain an array of links to Resources of the NetworkDeviceFunction type that represents the network device functions associated with this Resource.",
"readonly": true,
- "type": "array"
+ "type": "array",
+ "versionAdded": "v1_2_0"
},
"NetworkDeviceFunctions@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."
},
"PCIeDevice": {
- "anyOf": [
- {
- "$ref": "http://redfish.dmtf.org/schemas/v1/PCIeDevice.json#/definitions/PCIeDevice"
- },
- {
- "type": "null"
- }
- ],
- "description": "A reference to the PCIeDevice on which this function resides.",
- "longDescription": "The value of this property shall be a reference to the resource that this function is a part of and shall reference a resource of type PCIeDevice.",
+ "$ref": "http://redfish.dmtf.org/schemas/v1/PCIeDevice.json#/definitions/PCIeDevice",
+ "description": "The link to the PCIe device on which this function resides.",
+ "longDescription": "This property shall contain a link to a Resource of type PCIeDevice of which this function is a part.",
"readonly": true
},
"StorageControllers": {
- "description": "An array of references to the storage controllers which the PCIe device produces.",
+ "description": "An array of links to the storage controllers that the PCIe device produces.",
"items": {
"$ref": "http://redfish.dmtf.org/schemas/v1/Storage.json#/definitions/StorageController"
},
- "longDescription": "The value of this property shall reference a resource of type StorageController that represents the storage controllers associated with this resource.",
+ "longDescription": "This property shall link to a Resource of type StorageController that represents the storage controllers associated with this Resource.",
"readonly": true,
"type": "array"
},
"StorageControllers@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",
@@ -205,10 +201,10 @@
},
"PCIeFunction": {
"additionalProperties": false,
- "description": "This is the schema definition for the PCIeFunction resource. It represents the properties of a PCIeFunction attached to a System.",
- "longDescription": "This resource shall be used to represent a PCIeFunction attached to a System.",
+ "description": "The schema definition for the PCIeFunction Resource. It represents the properties of a PCIeFunction attached to a System.",
+ "longDescription": "This Resource shall represent a PCIeFunction 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",
@@ -223,25 +219,26 @@
},
"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"
},
"ClassCode": {
"description": "The Class Code of this PCIe function.",
- "longDescription": "The value of this property shall be the PCI Class Code of the PCIe device function.",
+ "longDescription": "This property shall contain the PCI Class Code of the PCIe device function.",
"pattern": "^0[xX](([a-fA-F]|[0-9]){2}){3}$",
"readonly": true,
"type": [
@@ -262,13 +259,13 @@
},
"DeviceClass": {
"$ref": "#/definitions/DeviceClass",
- "description": "The class for this PCIe Function.",
- "longDescription": "The value of this property shall be the device class of the PCIe device function such as Storage, Network, Memory etc.",
+ "description": "The class for this PCIe function.",
+ "longDescription": "This property shall contain the device class of the PCIe device function, such as storage, network, or memory.",
"readonly": true
},
"DeviceId": {
"description": "The Device ID of this PCIe function.",
- "longDescription": "The value of this property shall be the PCI Device ID of the PCIe device function.",
+ "longDescription": "This property shall contain the PCI Device ID of the PCIe device function.",
"pattern": "^0[xX](([a-fA-F]|[0-9]){2}){2}$",
"readonly": true,
"type": [
@@ -277,8 +274,8 @@
]
},
"FunctionId": {
- "description": "The the PCIe Function identifier.",
- "longDescription": "The value of this property shall the PCIe device function number within a given PCIe device.",
+ "description": "The PCIe Function Number.",
+ "longDescription": "This property shall contain the PCIe Function Number within a given PCIe device.",
"readonly": true,
"type": [
"integer",
@@ -287,8 +284,8 @@
},
"FunctionType": {
"$ref": "#/definitions/FunctionType",
- "description": "The type of the PCIe Function.",
- "longDescription": "The value of this property shall be the function type of the PCIe device function such as Physical or Virtual.",
+ "description": "The type of the PCIe function.",
+ "longDescription": "This property shall contain the function type of the PCIe device function such as Physical or Virtual.",
"readonly": true
},
"Id": {
@@ -297,8 +294,8 @@
},
"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."
},
"Name": {
"$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
@@ -306,12 +303,12 @@
},
"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."
},
"RevisionId": {
"description": "The Revision ID of this PCIe function.",
- "longDescription": "The value of this property shall be the PCI Revision ID of the PCIe device function.",
+ "longDescription": "This property shall contain the PCI Revision ID of the PCIe device function.",
"pattern": "^0[xX](([a-fA-F]|[0-9]){2}){1}$",
"readonly": true,
"type": [
@@ -321,12 +318,12 @@
},
"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."
},
"SubsystemId": {
"description": "The Subsystem ID of this PCIe function.",
- "longDescription": "The value of this property shall be the PCI Subsystem ID of the PCIe device function.",
+ "longDescription": "This property shall contain the PCI Subsystem ID of the PCIe device function.",
"pattern": "^0[xX](([a-fA-F]|[0-9]){2}){2}$",
"readonly": true,
"type": [
@@ -336,7 +333,7 @@
},
"SubsystemVendorId": {
"description": "The Subsystem Vendor ID of this PCIe function.",
- "longDescription": "The value of this property shall be the PCI Subsystem Vendor ID of the PCIe device function.",
+ "longDescription": "This property shall contain the PCI Subsystem Vendor ID of the PCIe device function.",
"pattern": "^0[xX](([a-fA-F]|[0-9]){2}){2}$",
"readonly": true,
"type": [
@@ -346,7 +343,7 @@
},
"VendorId": {
"description": "The Vendor ID of this PCIe function.",
- "longDescription": "The value of this property shall be the PCI Vendor ID of the PCIe device function.",
+ "longDescription": "This property shall contain the PCI Vendor ID of the PCIe device function.",
"pattern": "^0[xX](([a-fA-F]|[0-9]){2}){2}$",
"readonly": true,
"type": [
@@ -365,5 +362,6 @@
}
},
"owningEntity": "DMTF",
- "title": "#PCIeFunction.v1_2_1.PCIeFunction"
+ "release": "2018.1",
+ "title": "#PCIeFunction.v1_2_3.PCIeFunction"
}
\ No newline at end of file