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/Volume/Volume.json b/static/redfish/v1/JsonSchemas/Volume/Volume.json
index 9325de1..85d2f54 100644
--- a/static/redfish/v1/JsonSchemas/Volume/Volume.json
+++ b/static/redfish/v1/JsonSchemas/Volume/Volume.json
@@ -1,5 +1,5 @@
{
- "$id": "http://redfish.dmtf.org/schemas/swordfish/v1/Volume.v1_4_0.json",
+ "$id": "http://redfish.dmtf.org/schemas/swordfish/v1/Volume.v1_4_1.json",
"$ref": "#/definitions/Volume",
"$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
"copyright": "Copyright 2016-2019 Storage Networking Industry Association (SNIA), USA. All rights reserved. For the full SNIA copyright policy, see http://www.snia.org/about/corporate_info/copyright",
@@ -103,7 +103,8 @@
"type": "string"
}
},
- "type": "object"
+ "type": "object",
+ "versionAdded": "v1_4_0"
},
"CheckConsistency": {
"additionalProperties": false,
@@ -191,7 +192,8 @@
"type": "string"
}
},
- "type": "object"
+ "type": "object",
+ "versionAdded": "v1_4_0"
},
"EncryptionTypes": {
"enum": [
@@ -322,8 +324,8 @@
},
"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."
},
"OwningStorageService": {
"$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/StorageService.json#/definitions/StorageService",
@@ -489,7 +491,8 @@
"type": "string"
}
},
- "type": "object"
+ "type": "object",
+ "versionAdded": "v1_4_0"
},
"ResumeReplication": {
"additionalProperties": false,
@@ -528,7 +531,8 @@
"type": "string"
}
},
- "type": "object"
+ "type": "object",
+ "versionAdded": "v1_4_0"
},
"ReverseReplicationRelationship": {
"additionalProperties": false,
@@ -567,7 +571,8 @@
"type": "string"
}
},
- "type": "object"
+ "type": "object",
+ "versionAdded": "v1_4_0"
},
"SplitReplication": {
"additionalProperties": false,
@@ -606,7 +611,8 @@
"type": "string"
}
},
- "type": "object"
+ "type": "object",
+ "versionAdded": "v1_4_0"
},
"SuspendReplication": {
"additionalProperties": false,
@@ -645,7 +651,8 @@
"type": "string"
}
},
- "type": "object"
+ "type": "object",
+ "versionAdded": "v1_4_0"
},
"Volume": {
"additionalProperties": false,
@@ -900,8 +907,8 @@
},
"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."
},
"Operations": {
"description": "The operations currently running on the Volume.",
@@ -984,7 +991,7 @@
"versionAdded": "v1_2_0"
},
"ReplicaInfo": {
- "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/StorageReplicaInfo.v1_2_0.json#/definitions/ReplicaInfo",
+ "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/StorageReplicaInfo.v1_3_0.json#/definitions/ReplicaInfo",
"description": "Describes this storage volume in its role as a target replica.",
"longDescription": "This property shall describe the replica relationship between this storage volume and a corresponding source volume.",
"versionAdded": "v1_1_0"
@@ -1144,18 +1151,24 @@
"enum": [
"WriteThrough",
"ProtectedWriteBack",
- "UnprotectedWriteBack"
+ "UnprotectedWriteBack",
+ "Off"
],
"enumDescriptions": {
+ "Off": "The write cache is disabled.",
"ProtectedWriteBack": "A caching technique in which the completion of a write request is signaled as soon as the data is in cache, and actual writing to non-volatile media is guaranteed to occur at a later time.",
"UnprotectedWriteBack": "A caching technique in which the completion of a write request is signaled as soon as the data is in cache; actual writing to non-volatile media is not guaranteed to occur at a later time.",
"WriteThrough": "A caching technique in which the completion of a write request is not signaled until data is safely stored on non-volatile media."
},
"enumLongDescriptions": {
+ "Off": "Indicates that the write cache shall be disabled.",
"ProtectedWriteBack": "A caching technique in which the completion of a write request is signaled as soon as the data is in cache, and actual writing to non-volatile media is guaranteed to occur at a later time.",
"UnprotectedWriteBack": "A caching technique in which the completion of a write request is signaled as soon as the data is in cache; actual writing to non-volatile media is not guaranteed to occur at a later time.",
"WriteThrough": "A caching technique in which the completion of a write request is not signaled until data is safely stored on non-volatile media."
},
+ "enumVersionAdded": {
+ "Off": "v1_4_1"
+ },
"type": "string"
},
"WriteCacheStateType": {
@@ -1199,5 +1212,6 @@
}
},
"owningEntity": "SNIA",
- "title": "#Volume.v1_4_0.Volume"
+ "release": "WIP v1.1.0",
+ "title": "#Volume.v1_4_1.Volume"
}
\ No newline at end of file