Move to 2019.3
Make changes to update_schemas.py needed for the move and run
update_schemas.py.
old path (2019.2)
DSP8010_2019.2/DSP8010_2019.2/json-schema/MemoryMetrics.v1_1_2.json
DSP8010_2019.2/DSP8010_2019.2/openapi/Memory.v1_0_3.yaml
DSP8010_2019.2/DSP8010_2019.2/csdl/AccelerationFunction_v1.xml
new path (2019.3)
DSP8010_2019.3/csdl/Memory_v1.xml
DSP8010_2019.3/json-schema/UpdateService.v1_1_2.json
DSP8010_2019.3/openapi/Zone.v1_3_1.yaml
To see an overview of 2019.3 see
https://www.dmtf.org/sites/default/files/Redfish_Release_2019.3_Overview.pdf
Tested: Built bmcweb, loaded on a Witherspoon, and ran
the validator. No errors.
Change-Id: I0deaf88b884d65fffa31fcf66183ed61a930a073
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
diff --git a/static/redfish/v1/JsonSchemas/ManagerAccount/ManagerAccount.json b/static/redfish/v1/JsonSchemas/ManagerAccount/ManagerAccount.json
index aa89377..d880982 100644
--- a/static/redfish/v1/JsonSchemas/ManagerAccount/ManagerAccount.json
+++ b/static/redfish/v1/JsonSchemas/ManagerAccount/ManagerAccount.json
@@ -1,9 +1,22 @@
{
- "$id": "http://redfish.dmtf.org/schemas/v1/ManagerAccount.v1_3_1.json",
+ "$id": "http://redfish.dmtf.org/schemas/v1/ManagerAccount.v1_4_0.json",
"$ref": "#/definitions/ManagerAccount",
"$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",
"definitions": {
+ "AccountTypes": {
+ "enum": [
+ "Redfish",
+ "SNMP",
+ "OEM"
+ ],
+ "enumDescriptions": {
+ "OEM": "OEM account type.",
+ "Redfish": "Allow access to the Redfish Service.",
+ "SNMP": "Allow access to SNMP services."
+ },
+ "type": "string"
+ },
"Actions": {
"additionalProperties": false,
"description": "The available actions for this Resource.",
@@ -96,6 +109,23 @@
"@odata.type": {
"$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
},
+ "AccountTypes": {
+ "description": "The account types.",
+ "items": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/AccountTypes"
+ },
+ {
+ "type": "null"
+ }
+ ]
+ },
+ "longDescription": "This property shall contain an array of the various account types that apply to the account. If this property is not provided by the client, the default value shall be an array with the single value `Redfish`.",
+ "readonly": false,
+ "type": "array",
+ "versionAdded": "v1_4_0"
+ },
"Actions": {
"$ref": "#/definitions/Actions",
"description": "The available actions for this Resource.",
@@ -145,6 +175,19 @@
"$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
"readonly": true
},
+ "OEMAccountTypes": {
+ "description": "The OEM account types.",
+ "items": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "longDescription": "This property shall contain an array of the OEM account types for this account. This property shall be valid when AccountTypes contains `OEM`.",
+ "readonly": false,
+ "type": "array",
+ "versionAdded": "v1_4_0"
+ },
"Oem": {
"$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
"description": "The OEM extension property.",
@@ -175,6 +218,19 @@
"readonly": false,
"type": "string"
},
+ "SNMP": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/SNMPUserInfo"
+ },
+ {
+ "type": "null"
+ }
+ ],
+ "description": "The SNMP settings for this account.",
+ "longDescription": "This property shall contain the SNMP settings for this account when AccountTypes contains `SNMP`.",
+ "versionAdded": "v1_4_0"
+ },
"UserName": {
"description": "The user name for the account.",
"longDescription": "This property shall contain the user name for this account.",
@@ -186,7 +242,8 @@
"@odata.id",
"@odata.type",
"Id",
- "Name"
+ "Name",
+ "AccountTypes"
],
"requiredOnCreate": [
"Password",
@@ -215,9 +272,117 @@
},
"properties": {},
"type": "object"
+ },
+ "SNMPAuthenticationProtocols": {
+ "enum": [
+ "None",
+ "HMAC_MD5",
+ "HMAC_SHA96"
+ ],
+ "enumDescriptions": {
+ "HMAC_MD5": "HMAC-MD5-96 authentication.",
+ "HMAC_SHA96": "HMAC-SHA-96 authentication.",
+ "None": "No authentication."
+ },
+ "enumLongDescriptions": {
+ "HMAC_MD5": "This value shall indicate authentication conforms to the RFC3414-defined HMAC-MD5-96 authentication protocol.",
+ "HMAC_SHA96": "This value shall indicate authentication conforms to the RFC3414-defined HMAC-SHA-96 authentication protocol.",
+ "None": "This value shall indicate authentication is not required."
+ },
+ "type": "string"
+ },
+ "SNMPEncryptionProtocols": {
+ "enum": [
+ "None",
+ "CBC_DES",
+ "CFB128_AES128"
+ ],
+ "enumDescriptions": {
+ "CBC_DES": "CBC-DES encryption.",
+ "CFB128_AES128": "CFB128-AES-128 encryption.",
+ "None": "No encryption."
+ },
+ "enumLongDescriptions": {
+ "CBC_DES": "This value shall indicate encryption conforms to the RFC3414-defined CBC-DES encryption protocol.",
+ "CFB128_AES128": "This value shall indicate encryption conforms to the RFC3414-defined CFB128-AES-128 encryption protocol.",
+ "None": "This value shall indicate there is no encryption."
+ },
+ "type": "string"
+ },
+ "SNMPUserInfo": {
+ "additionalProperties": false,
+ "description": "The SNMP settings for an account.",
+ "longDescription": "This object shall contain the SNMP settings for an account.",
+ "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": {
+ "AuthenticationKey": {
+ "description": "The secret authentication key for SNMPv3.",
+ "longDescription": "This property shall contain the key for SNMPv3 authentication. The value shall be `null` in responses.",
+ "pattern": "(^[A-Za-z0-9]+$)|(^\\*+$)",
+ "readonly": false,
+ "type": [
+ "string",
+ "null"
+ ],
+ "versionAdded": "v1_4_0"
+ },
+ "AuthenticationProtocol": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/SNMPAuthenticationProtocols"
+ },
+ {
+ "type": "null"
+ }
+ ],
+ "description": "The authentication protocol for SNMPv3.",
+ "longDescription": "This property shall contain the SNMPv3 authentication protocol.",
+ "readonly": false,
+ "versionAdded": "v1_4_0"
+ },
+ "EncryptionKey": {
+ "description": "The secret authentication key used in SNMPv3.",
+ "longDescription": "This property shall contain the key for SNMPv3 encryption. The value shall be `null` in responses.",
+ "pattern": "(^[A-Za-z0-9]+$)|(^\\*+$)",
+ "readonly": false,
+ "type": [
+ "string",
+ "null"
+ ],
+ "versionAdded": "v1_4_0"
+ },
+ "EncryptionProtocol": {
+ "anyOf": [
+ {
+ "$ref": "#/definitions/SNMPEncryptionProtocols"
+ },
+ {
+ "type": "null"
+ }
+ ],
+ "description": "The encryption protocol for SNMPv3.",
+ "longDescription": "This property shall contain the SNMPv3 encryption protocol.",
+ "readonly": false,
+ "versionAdded": "v1_4_0"
+ }
+ },
+ "type": "object"
}
},
"owningEntity": "DMTF",
- "release": "2019.1",
- "title": "#ManagerAccount.v1_3_1.ManagerAccount"
+ "release": "2019.3",
+ "title": "#ManagerAccount.v1_4_0.ManagerAccount"
}
\ No newline at end of file