Update schema files to 2018.2
Redfish schema 2018.2 was released on September 20th, 2018. While there
aren't any plans to utilize any of the new services, it makes sense to
keep up to date with the latest static data.
This commit was largely done automatically using the update_schemas.py
script.
Change-Id: Ieaa9f1ab2a47244ef201cfe9a064744d7d156745
Signed-off-by: Ed Tanous <ed.tanous@intel.com>
diff --git a/static/redfish/v1/JsonSchemas/PCIeDevice/PCIeDevice.json b/static/redfish/v1/JsonSchemas/PCIeDevice/PCIeDevice.json
index 824a52a..4f7c224 100644
--- a/static/redfish/v1/JsonSchemas/PCIeDevice/PCIeDevice.json
+++ b/static/redfish/v1/JsonSchemas/PCIeDevice/PCIeDevice.json
@@ -1,18 +1,19 @@
{
"$ref": "#/definitions/PCIeDevice",
- "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema.v1_3_0.json",
- "copyright": "Copyright 2014-2017 Distributed Management Task Force, Inc. (DMTF). For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+ "$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",
"definitions": {
"Actions": {
"additionalProperties": false,
"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|Privileges)\\.[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",
"boolean",
+ "integer",
"number",
"null",
"object",
@@ -22,7 +23,9 @@
},
"properties": {
"Oem": {
- "$ref": "#/definitions/OemActions"
+ "$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."
}
},
"type": "object"
@@ -45,11 +48,12 @@
"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.",
"patternProperties": {
- "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message|Privileges)\\.[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",
"boolean",
+ "integer",
"number",
"null",
"object",
@@ -68,7 +72,7 @@
"type": "array"
},
"Chassis@odata.count": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_1.json#/definitions/count"
+ "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
},
"Oem": {
"$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
@@ -85,7 +89,7 @@
"type": "array"
},
"PCIeFunctions@odata.count": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_1.json#/definitions/count"
+ "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
}
},
"type": "object"
@@ -95,11 +99,12 @@
"description": "The available OEM specific actions for this resource.",
"longDescription": "This type shall contain any additional OEM actions for this resource.",
"patternProperties": {
- "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message|Privileges)\\.[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",
"boolean",
+ "integer",
"number",
"null",
"object",
@@ -113,12 +118,14 @@
"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.",
"patternProperties": {
- "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message|Privileges)\\.[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",
"boolean",
+ "integer",
"number",
"null",
"object",
@@ -128,13 +135,16 @@
},
"properties": {
"@odata.context": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_1.json#/definitions/context"
+ "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/context"
+ },
+ "@odata.etag": {
+ "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/etag"
},
"@odata.id": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_1.json#/definitions/id"
+ "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/id"
},
"@odata.type": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_1.json#/definitions/type"
+ "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/type"
},
"Actions": {
"$ref": "#/definitions/Actions",
@@ -188,7 +198,8 @@
},
"Links": {
"$ref": "#/definitions/Links",
- "description": "The links object contains the links to other resources that are related to this resource."
+ "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."
},
"Manufacturer": {
"description": "This is the manufacturer of this PCIe device.",
@@ -217,6 +228,18 @@
"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*."
},
+ "PCIeInterface": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/PCIeInterface"
+ },
+ {
+ "type": "null"
+ }
+ ],
+ "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."
+ },
"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.",
@@ -245,22 +268,110 @@
]
},
"Status": {
- "anyOf": [
- {
- "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status"
- },
- {
- "type": "null"
- }
- ]
+ "$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."
}
},
"required": [
+ "@odata.id",
+ "@odata.type",
"Id",
"Name"
],
"type": "object"
+ },
+ "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.",
+ "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.",
+ "type": [
+ "array",
+ "boolean",
+ "integer",
+ "number",
+ "null",
+ "object",
+ "string"
+ ]
+ }
+ },
+ "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.",
+ "maximum": 32,
+ "readonly": true,
+ "type": [
+ "integer",
+ "null"
+ ]
+ },
+ "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.",
+ "maximum": 32,
+ "readonly": true,
+ "type": [
+ "integer",
+ "null"
+ ]
+ },
+ "MaxPCIeType": {
+ "anyOf": [
+ {
+ "$ref": "http://redfish.dmtf.org/schemas/v1/PCIeDevice.json#/definitions/PCIeTypes"
+ },
+ {
+ "type": "null"
+ }
+ ],
+ "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
+ },
+ "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."
+ },
+ "PCIeType": {
+ "anyOf": [
+ {
+ "$ref": "http://redfish.dmtf.org/schemas/v1/PCIeDevice.json#/definitions/PCIeTypes"
+ },
+ {
+ "type": "null"
+ }
+ ],
+ "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
+ }
+ },
+ "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"
}
},
- "title": "#PCIeDevice.v1_2_0.PCIeDevice"
+ "owningEntity": "DMTF",
+ "title": "#PCIeDevice.v1_3_0.PCIeDevice"
}
\ No newline at end of file