Move to 2020.1
Make changes to update_schemas.py needed for the move and run
update_schemas.py.
Need 1.3.6 or later version of Redfish-Service-Validator.
CI uses the master branch of Redfish-Service-Validator, which has
this fix.
Redfish-Service-Validators before 1.3.6 will incorrectly throw errors in
message registries like (Task Event Message Registry)
/redfish/v1/Registries/TaskEvent/TaskEvent and (Base Message Registry)
/redfish/v1/Registries/Base/Base.
For more information:
https://redfishforum.com/thread/323/validator-errors-when-moving-release
This does introduce some "warnDeprecated" due to "Severity" becoming
Deprecated in MessageRegistry v1_4_0. Since all bmcweb Registries are
<v1_4_0, not a real problem. Redfish has no Base Message Registry and
Task Event Message Registry available to move to something that
uses MessageRegistry v1_4_0. Will take up with Redfish.
2020.1 includes new features like AutoRebot (Boot -> AutomaticRetry),
factory reset (ResetToDefaults action), and Modified Event Log property
which are in OpenBMC's D-Bus interfaces today.
Tested: Built bmcweb, loaded on a Witherspoon, and ran
the validator. Validator passed.
See new schemas:
curl -k https://${bmc}/redfish/v1/JsonSchemas/SecureBootDatabase
{
"@odata.context": "/redfish/v1/$metadata#JsonSchemaFile.JsonSchemaFile",
"@odata.id": "/redfish/v1/JsonSchemas/SecureBootDatabase",
"@odata.type": "#JsonSchemaFile.v1_0_2.JsonSchemaFile",
"Name": "SecureBootDatabase Schema File",
Change-Id: If30fcc50276aea44d8a77ed547ee0cbd72e4cf1a
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
diff --git a/static/redfish/v1/JsonSchemas/ServiceRoot/ServiceRoot.json b/static/redfish/v1/JsonSchemas/ServiceRoot/ServiceRoot.json
index c024650..0f20f1c 100644
--- a/static/redfish/v1/JsonSchemas/ServiceRoot/ServiceRoot.json
+++ b/static/redfish/v1/JsonSchemas/ServiceRoot/ServiceRoot.json
@@ -1,9 +1,54 @@
{
- "$id": "http://redfish.dmtf.org/schemas/v1/ServiceRoot.v1_6_0.json",
+ "$id": "http://redfish.dmtf.org/schemas/v1/ServiceRoot.v1_7_0.json",
"$ref": "#/definitions/ServiceRoot",
"$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": {
+ "DeepOperations": {
+ "additionalProperties": false,
+ "description": "The information about deep operations that the service supports.",
+ "longDescription": "This type shall contain information about deep operations that the service supports.",
+ "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": {
+ "DeepPATCH": {
+ "description": "An indication of whether the service supports the deep PATCH operation.",
+ "longDescription": "This property shall indicate whether this service supports the Redfish Specification-defined deep PATCH operation.",
+ "readonly": true,
+ "type": "boolean",
+ "versionAdded": "v1_7_0"
+ },
+ "DeepPOST": {
+ "description": "An indication of whether the service supports the deep POST operation.",
+ "longDescription": "This property shall indicate whether this service supports the Redfish Specification-defined deep POST operation.",
+ "readonly": true,
+ "type": "boolean",
+ "versionAdded": "v1_7_0"
+ },
+ "MaxLevels": {
+ "description": "The maximum levels of resources allowed in deep operations.",
+ "longDescription": "This property shall contain the maximum levels of resources allowed in deep operations.",
+ "maximum": 6,
+ "minimum": 1,
+ "readonly": true,
+ "type": "integer",
+ "versionAdded": "v1_7_0"
+ }
+ },
+ "type": "object"
+ },
"Expand": {
"additionalProperties": false,
"description": "The information about the use of $expand in the service.",
@@ -118,6 +163,12 @@
}
},
"properties": {
+ "DeepOperations": {
+ "$ref": "#/definitions/DeepOperations",
+ "description": "The information about deep operations that the service supports.",
+ "longDescription": "This property shall contain information about deep operations that the service supports.",
+ "versionAdded": "v1_7_0"
+ },
"ExcerptQuery": {
"description": "An indication of whether the service supports the excerpt query parameter.",
"longDescription": "This property shall indicate whether this service supports the excerpt query parameter.",
@@ -404,6 +455,6 @@
}
},
"owningEntity": "DMTF",
- "release": "2019.4",
- "title": "#ServiceRoot.v1_6_0.ServiceRoot"
+ "release": "2020.1",
+ "title": "#ServiceRoot.v1_7_0.ServiceRoot"
}
\ No newline at end of file