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/SerialInterface/SerialInterface.json b/static/redfish/v1/JsonSchemas/SerialInterface/SerialInterface.json
index 6a96070..1890108 100644
--- a/static/redfish/v1/JsonSchemas/SerialInterface/SerialInterface.json
+++ b/static/redfish/v1/JsonSchemas/SerialInterface/SerialInterface.json
@@ -1,13 +1,13 @@
{
- "$id": "http://redfish.dmtf.org/schemas/v1/SerialInterface.v1_1_5.json",
+ "$id": "http://redfish.dmtf.org/schemas/v1/SerialInterface.v1_1_6.json",
"$ref": "#/definitions/SerialInterface",
"$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": {
"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_]*$": {
"description": "This property shall specify a valid odata or Redfish property.",
@@ -25,8 +25,8 @@
"properties": {
"Oem": {
"$ref": "#/definitions/OemActions",
- "description": "The available OEM-specific actions for this Resource.",
- "longDescription": "This property shall contain the available OEM-specific 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"
}
},
@@ -45,15 +45,15 @@
"230400"
],
"enumDescriptions": {
- "115200": "A bit rate of 115200bps.",
- "1200": "A bit rate of 1200bps.",
- "19200": "A bit rate of 19200bps.",
- "230400": "A bit rate of 230400bps.",
- "2400": "A bit rate of 2400bps.",
- "38400": "A bit rate of 38400bps.",
- "4800": "A bit rate of 4800bps.",
- "57600": "A bit rate of 57600bps.",
- "9600": "A bit rate of 9600bps."
+ "115200": "A bit rate of 115200 bit/s.",
+ "1200": "A bit rate of 1200 bit/s.",
+ "19200": "A bit rate of 19200 bit/s.",
+ "230400": "A bit rate of 230400 bit/s.",
+ "2400": "A bit rate of 2400 bit/s.",
+ "38400": "A bit rate of 38400 bit/s.",
+ "4800": "A bit rate of 4800 bit/s.",
+ "57600": "A bit rate of 57600 bit/s.",
+ "9600": "A bit rate of 9600 bit/s."
},
"type": "string"
},
@@ -112,8 +112,8 @@
},
"OemActions": {
"additionalProperties": true,
- "description": "The available OEM-specific actions for this Resource.",
- "longDescription": "This type shall contain the available OEM-specific 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_]*$": {
"description": "This property shall specify a valid odata or Redfish property.",
@@ -164,7 +164,7 @@
"SerialInterface": {
"additionalProperties": false,
"description": "The SerialInterface schema describes an asynchronous serial interface, such as an RS-232 interface, available to a system or device.",
- "longDescription": "This Resource contains SerialInterface Resources as part of the Redfish Specification.",
+ "longDescription": "This resource contains SerialInterface resources as part of the Redfish Specification.",
"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.",
@@ -194,13 +194,13 @@
},
"Actions": {
"$ref": "#/definitions/Actions",
- "description": "The available actions for this Resource.",
- "longDescription": "This 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"
},
"BitRate": {
"$ref": "#/definitions/BitRate",
- "description": "The receive and transmit rate of data flow, typically in bits-per-second (bps), over the serial connection.",
+ "description": "The receive and transmit rate of data flow, typically in bits per second (bit/s), over the serial connection.",
"longDescription": "This property shall indicate the transmit and receive speed of the serial connection.",
"readonly": false
},
@@ -320,5 +320,5 @@
},
"owningEntity": "DMTF",
"release": "2017.1",
- "title": "#SerialInterface.v1_1_5.SerialInterface"
+ "title": "#SerialInterface.v1_1_6.SerialInterface"
}
\ No newline at end of file