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/ResourceBlock/ResourceBlock.json b/static/redfish/v1/JsonSchemas/ResourceBlock/ResourceBlock.json
index 5c10443..3ce34d6 100644
--- a/static/redfish/v1/JsonSchemas/ResourceBlock/ResourceBlock.json
+++ b/static/redfish/v1/JsonSchemas/ResourceBlock/ResourceBlock.json
@@ -1,7 +1,7 @@
{
"$ref": "#/definitions/ResourceBlock",
- "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema.v1_4_0.json",
- "copyright": "Copyright 2014-2018 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,
@@ -13,6 +13,7 @@
"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"
@@ -33,13 +36,15 @@
"ComposedAndAvailable",
"Composed",
"Unused",
- "Failed"
+ "Failed",
+ "Unavailable"
],
"enumDescriptions": {
"Composed": "Final successful state of a Resource Block which has participated in composition.",
"ComposedAndAvailable": "Indicates the Resource Block is currently participating in one or more compositions, and is available to be used in more compositions.",
"Composing": "Intermediate state indicating composition is in progress.",
"Failed": "The final composition resulted in failure and manual intervention may be required to fix it.",
+ "Unavailable": "Indicates the Resource Block has been made unavailable by the service, such as due to maintenance being performed on the Resource Block.",
"Unused": "Indicates the Resource Block is free and can participate in composition."
},
"type": "string"
@@ -54,6 +59,7 @@
"type": [
"array",
"boolean",
+ "integer",
"number",
"null",
"object",
@@ -81,7 +87,7 @@
"minimum": 1,
"readonly": true,
"type": [
- "number",
+ "integer",
"null"
]
},
@@ -91,7 +97,7 @@
"minimum": 0,
"readonly": true,
"type": [
- "number",
+ "integer",
"null"
]
},
@@ -138,6 +144,7 @@
"type": [
"array",
"boolean",
+ "integer",
"number",
"null",
"object",
@@ -156,7 +163,7 @@
"type": "array"
},
"Chassis@odata.count": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_2.json#/definitions/count"
+ "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
},
"ComputerSystems": {
"description": "An array of references to the Computer Systems that are composed from this Resource Block.",
@@ -168,7 +175,7 @@
"type": "array"
},
"ComputerSystems@odata.count": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_2.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",
@@ -185,7 +192,7 @@
"type": "array"
},
"Zones@odata.count": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_2.json#/definitions/count"
+ "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
}
},
"type": "object"
@@ -200,6 +207,7 @@
"type": [
"array",
"boolean",
+ "integer",
"number",
"null",
"object",
@@ -220,6 +228,7 @@
"type": [
"array",
"boolean",
+ "integer",
"number",
"null",
"object",
@@ -229,16 +238,16 @@
},
"properties": {
"@odata.context": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_2.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_2.json#/definitions/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_2.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_2.json#/definitions/type"
+ "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/type"
},
"Actions": {
"$ref": "#/definitions/Actions",
@@ -260,7 +269,7 @@
"type": "array"
},
"ComputerSystems@odata.count": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_2.json#/definitions/count"
+ "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
},
"Description": {
"anyOf": [
@@ -283,7 +292,7 @@
"type": "array"
},
"EthernetInterfaces@odata.count": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_2.json#/definitions/count"
+ "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
},
"Id": {
"$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
@@ -304,7 +313,7 @@
"type": "array"
},
"Memory@odata.count": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_2.json#/definitions/count"
+ "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
},
"Name": {
"$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
@@ -320,7 +329,7 @@
"type": "array"
},
"NetworkInterfaces@odata.count": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_2.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",
@@ -337,7 +346,7 @@
"type": "array"
},
"Processors@odata.count": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_2.json#/definitions/count"
+ "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
},
"ResourceBlockType": {
"description": "This property represents the types of resources available on this Resource Block.",
@@ -358,10 +367,12 @@
"type": "array"
},
"SimpleStorage@odata.count": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_2.json#/definitions/count"
+ "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
},
"Status": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/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."
},
"Storage": {
"description": "An array of references to the Storage available in this Resource Block.",
@@ -373,12 +384,14 @@
"type": "array"
},
"Storage@odata.count": {
- "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_2.json#/definitions/count"
+ "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
}
},
"required": [
"CompositionStatus",
"ResourceBlockType",
+ "@odata.id",
+ "@odata.type",
"Id",
"Name"
],
@@ -391,11 +404,13 @@
"Memory",
"Network",
"Storage",
- "ComputerSystem"
+ "ComputerSystem",
+ "Expansion"
],
"enumDescriptions": {
"Compute": "This Resource Block contains both Processor and Memory resources in a manner that creates a compute complex.",
"ComputerSystem": "This Resource Block contains ComputerSystem resources.",
+ "Expansion": "This Resource Block is capable of changing over time based on its configuration. Different types of devices within this Resource Block can be added and removed over time.",
"Memory": "This Resource Block contains Memory resources.",
"Network": "This Resource Block contains Network resources, such as Ethernet Interfaces.",
"Processor": "This Resource Block contains Processor resources.",
@@ -405,5 +420,5 @@
}
},
"owningEntity": "DMTF",
- "title": "#ResourceBlock.v1_1_0.ResourceBlock"
+ "title": "#ResourceBlock.v1_2_0.ResourceBlock"
}
\ No newline at end of file