Move to 2020.2
Point update_schemas.py at 2020.2 and run the script.
An overview of 2020.2 can be found at:
https://www.dmtf.org/sites/default/files/Redfish_Release_2020.2_Overview.pdf
Tested: Loaded on a Witherspoon and ran the validator.
See the new schemas.
Change-Id: Idb6cbc58efe484dcffa0cc22deff3a4746af67ed
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
diff --git a/static/redfish/v1/JsonSchemas/ExternalAccountProvider/ExternalAccountProvider.json b/static/redfish/v1/JsonSchemas/ExternalAccountProvider/ExternalAccountProvider.json
index 7e5ca20..e747a85 100644
--- a/static/redfish/v1/JsonSchemas/ExternalAccountProvider/ExternalAccountProvider.json
+++ b/static/redfish/v1/JsonSchemas/ExternalAccountProvider/ExternalAccountProvider.json
@@ -1,8 +1,8 @@
{
- "$id": "http://redfish.dmtf.org/schemas/v1/ExternalAccountProvider.v1_1_2.json",
+ "$id": "http://redfish.dmtf.org/schemas/v1/ExternalAccountProvider.v1_1_3.json",
"$ref": "#/definitions/ExternalAccountProvider",
"$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": {
"AccountProviderTypes": {
"enum": [
@@ -15,19 +15,19 @@
"ActiveDirectoryService": "An external Active Directory service.",
"LDAPService": "A generic external LDAP service.",
"OEM": "An OEM-specific external authentication or directory service.",
- "RedfishService": "An external Redfish Service."
+ "RedfishService": "An external Redfish service."
},
"enumLongDescriptions": {
- "ActiveDirectoryService": "The external account provider shall be a Microsoft Active Directory Technical Specification-comformant service. The ServiceAddresses format shall contain a collection of fully qualified domain names (FQDN) or NetBIOS names that links to the set of domain servers for the Active Directory service.",
- "LDAPService": "The external account provider shall be an RFC4511-conformant service. The ServiceAddresses format shall contain a collection of fully qualified domain names (FQDN) that links to the set of LDAP servers for the Service.",
- "RedfishService": "The external account provider shall be a DMTF Redfish Specification-comformant service. The ServiceAddresses format shall contain a collection of URIs that correspond to a Redfish Account Service entity."
+ "ActiveDirectoryService": "The external account provider shall be a Microsoft Active Directory Technical Specification-comformant service. The ServiceAddresses format shall contain a set of fully qualified domain names (FQDN) or NetBIOS names that links to the set of domain servers for the Active Directory service.",
+ "LDAPService": "The external account provider shall be an RFC4511-conformant service. The ServiceAddresses format shall contain a set of fully qualified domain names (FQDN) that links to the set of LDAP servers for the service.",
+ "RedfishService": "The external account provider shall be a DMTF Redfish Specification-comformant service. The ServiceAddresses format shall contain a set of URIs that correspond to a Redfish account service."
},
"type": "string"
},
"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.",
@@ -45,8 +45,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."
}
},
"type": "object"
@@ -84,8 +84,8 @@
"readonly": false
},
"KerberosKeytab": {
- "description": "The Base64-encoded version of the Kerberos keytab for this Service. A PATCH or PUT operation writes the keytab. This property is `null` in responses.",
- "longDescription": "This property shall contain a Base64-encoded version of the Kerberos keytab for this Service. A PATCH or PUT operation writes the keytab. The value shall be `null` in responses.",
+ "description": "The Base64-encoded version of the Kerberos keytab for this service. A PATCH or PUT operation writes the keytab. This property is `null` in responses.",
+ "longDescription": "This property shall contain a Base64-encoded version of the Kerberos keytab for this service. A PATCH or PUT operation writes the keytab. The value shall be `null` in responses.",
"readonly": false,
"type": [
"string",
@@ -98,8 +98,8 @@
"longDescription": "This property shall contain the OEM extensions. All values for properties contained in this object shall conform to the Redfish Specification-described requirements."
},
"Password": {
- "description": "The password for this Service. A PATCH or PUT request writes the password. This property is `null` in responses.",
- "longDescription": "This property shall contain the password for this Service. A PATCH or PUT operation writes the password. The value shall be `null` in responses.",
+ "description": "The password for this service. A PATCH or PUT request writes the password. This property is `null` in responses.",
+ "longDescription": "This property shall contain the password for this service. A PATCH or PUT operation writes the password. The value shall be `null` in responses.",
"readonly": false,
"type": [
"string",
@@ -107,8 +107,8 @@
]
},
"Token": {
- "description": "The token for this Service. A PATCH or PUT operation writes the token. This property is `null` in responses.",
- "longDescription": "This property shall contain the token for this Service. A PATCH or PUT operation writes the token. The value shall be `null` in responses.",
+ "description": "The token for this service. A PATCH or PUT operation writes the token. This property is `null` in responses.",
+ "longDescription": "This property shall contain the token for this service. A PATCH or PUT operation writes the token. The value shall be `null` in responses.",
"readonly": false,
"type": [
"string",
@@ -116,8 +116,8 @@
]
},
"Username": {
- "description": "The user name for the Service.",
- "longDescription": "This property shall contain the user name for this Service.",
+ "description": "The user name for the service.",
+ "longDescription": "This property shall contain the user name for this service.",
"readonly": false,
"type": "string"
}
@@ -141,8 +141,8 @@
},
"ExternalAccountProvider": {
"additionalProperties": false,
- "description": "The remote service that provides accounts for this manager to use for authentication.",
- "longDescription": "The ExternalAccountProvider Schema contains Resources that represent external user account services for this manager.",
+ "description": "The ExternalAccountProvider schema represents a remote service that provides accounts for this manager to use for authentication.",
+ "longDescription": "This resource shall represent a remote authentication service in 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.",
@@ -179,14 +179,14 @@
"type": "null"
}
],
- "description": "The type of external account provider to which this Service connects.",
- "longDescription": "This property shall contain the type of external account provider to which this Service connects.",
+ "description": "The type of external account provider to which this service connects.",
+ "longDescription": "This property shall contain the type of external account provider to which this service connects.",
"readonly": true
},
"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."
},
"Authentication": {
"$ref": "#/definitions/Authentication",
@@ -196,7 +196,7 @@
"Certificates": {
"$ref": "http://redfish.dmtf.org/schemas/v1/CertificateCollection.json#/definitions/CertificateCollection",
"description": "The link to a collection of certificates that the external account provider uses.",
- "longDescription": "This property shall contain a link to a Resource Collection of type CertificateCollection.",
+ "longDescription": "This property shall contain a link to a resource collection of type CertificateCollection that contains certificates the external account provider uses.",
"readonly": true,
"versionAdded": "v1_1_0"
},
@@ -218,12 +218,12 @@
"LDAPService": {
"$ref": "#/definitions/LDAPService",
"description": "The additional mapping information needed to parse a generic LDAP service.",
- "longDescription": "This property shall contain any additional mapping information needed to parse a generic LDAP service. This property should only be present if AccountProviderType is LDAPService."
+ "longDescription": "This property shall contain any additional mapping information needed to parse a generic LDAP service. This property should only be present if AccountProviderType is `LDAPService`."
},
"Links": {
"$ref": "#/definitions/Links",
- "description": "The links to other Resources that are related to this Resource.",
- "longDescription": "The Redfish Specification-define Links Property shall contain links to Resources related to but not subordinate to this Resource."
+ "description": "The links to other resources that are related to this resource.",
+ "longDescription": "This property shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."
},
"Name": {
"$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
@@ -235,7 +235,7 @@
"longDescription": "This property shall contain the OEM extensions. All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
},
"RemoteRoleMapping": {
- "description": "The mapping rules to convert the external account providers account information to the local Redfish Role.",
+ "description": "The mapping rules to convert the external account providers account information to the local Redfish role.",
"items": {
"anyOf": [
{
@@ -246,7 +246,7 @@
}
]
},
- "longDescription": "This property shall contain a collection of the mapping rules to convert the external account providers account information to the local Redfish Role.",
+ "longDescription": "This property shall contain a set of the mapping rules that are used to convert the external account providers account information to the local Redfish role.",
"type": "array"
},
"ServiceAddresses": {
@@ -257,7 +257,7 @@
"null"
]
},
- "longDescription": "This property shall contain the addresses of the account providers to which this external account provider links. The format of this field depends on the type of external account provider. Each item in the array shall contain a single address. Services may define their own behavior for managing multiple addresses.",
+ "longDescription": "This property shall contain the addresses of the account providers to which this external account provider links. The format of this field depends on the type of external account provider. Each item in the array shall contain a single address. Services can define their own behavior for managing multiple addresses.",
"readonly": false,
"type": "array"
},
@@ -302,14 +302,14 @@
},
"properties": {
"BaseDistinguishedNames": {
- "description": "The base distinguished names to search an external LDAP service.",
+ "description": "The base distinguished names to use to search an external LDAP service.",
"items": {
"type": [
"string",
"null"
]
},
- "longDescription": "This property shall contain a collection of base distinguished names to search an external LDAP service.",
+ "longDescription": "This property shall contain an array of base distinguished names to use to search an external LDAP service.",
"readonly": false,
"type": "array"
},
@@ -377,8 +377,8 @@
},
"Links": {
"additionalProperties": false,
- "description": "The links to other Resources that are related to this Resource.",
- "longDescription": "This Redfish Specification-described type shall contain links to Resources related to but not subordinate to this Resource.",
+ "description": "The links to other resources that are related to this resource.",
+ "longDescription": "This Redfish Specification-described type shall contain links to resources that are related to but are not contained by, or subordinate to, 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.",
@@ -404,8 +404,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.",
@@ -425,8 +425,8 @@
},
"RoleMapping": {
"additionalProperties": false,
- "description": "The mapping rules to convert the external account providers account information to the local Redfish Role.",
- "longDescription": "This type shall contain mapping rules to convert the external account providers account information to the local Redfish Role.",
+ "description": "The mapping rules that are used to convert the external account providers account information to the local Redfish role.",
+ "longDescription": "This type shall contain mapping rules that are used to convert the external account providers account information to the local Redfish role.",
"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.",
@@ -443,8 +443,8 @@
},
"properties": {
"LocalRole": {
- "description": "The name of the local Redfish Role to which to map the remote user or group.",
- "longDescription": "This property shall contain the RoleId property value within a Role Resource on this Redfish Service to which to map the remote user or group.",
+ "description": "The name of the local Redfish role to which to map the remote user or group.",
+ "longDescription": "This property shall contain the RoleId property value within a role resource on this Redfish service to which to map the remote user or group.",
"readonly": false,
"type": [
"string",
@@ -457,8 +457,8 @@
"longDescription": "This property shall contain the OEM extensions. All values for properties contained in this object shall conform to the Redfish Specification-described requirements."
},
"RemoteGroup": {
- "description": "The name of the remote group, or the remote role in the case of a Redfish Service, that maps to the local Redfish Role to which this entity links.",
- "longDescription": "This property shall contain the name of the remote group, or the remote role in the case of a Redfish Service, that maps to the local Redfish Role to which this entity links.",
+ "description": "The name of the remote group, or the remote role in the case of a Redfish service, that maps to the local Redfish role to which this entity links.",
+ "longDescription": "This property shall contain the name of the remote group, or the remote role in the case of a Redfish service, that maps to the local Redfish role to which this entity links.",
"readonly": false,
"type": [
"string",
@@ -466,8 +466,8 @@
]
},
"RemoteUser": {
- "description": "The name of the remote user that maps to the local Redfish Role to which this entity links.",
- "longDescription": "This property shall contain the name of the remote user that maps to the local Redfish Role to which this entity links.",
+ "description": "The name of the remote user that maps to the local Redfish role to which this entity links.",
+ "longDescription": "This property shall contain the name of the remote user that maps to the local Redfish role to which this entity links.",
"readonly": false,
"type": [
"string",
@@ -480,5 +480,5 @@
},
"owningEntity": "DMTF",
"release": "2018.3",
- "title": "#ExternalAccountProvider.v1_1_2.ExternalAccountProvider"
+ "title": "#ExternalAccountProvider.v1_1_3.ExternalAccountProvider"
}
\ No newline at end of file