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/AccountService/AccountService.json b/static/redfish/v1/JsonSchemas/AccountService/AccountService.json
index 3f85367..60ee343 100644
--- a/static/redfish/v1/JsonSchemas/AccountService/AccountService.json
+++ b/static/redfish/v1/JsonSchemas/AccountService/AccountService.json
@@ -1,8 +1,8 @@
{
- "$id": "http://redfish.dmtf.org/schemas/v1/AccountService.v1_7_0.json",
+ "$id": "http://redfish.dmtf.org/schemas/v1/AccountService.v1_7_1.json",
"$ref": "#/definitions/AccountService",
"$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 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."
+ "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"
},
"AccountService": {
"additionalProperties": false,
- "description": "The AccountService schema defines an Account Service. The properties are common to, and enable management of, all user accounts. The properties include the password requirements and control features, such as account lockout. The schema also contains links to the manager accounts and roles.",
- "longDescription": "This Resource shall represent an Account Service for a Redfish implementation. The properties are common to, and enable management of, all user accounts. The properties include the password requirements and control features, such as account lockout.",
+ "description": "The AccountService schema defines an account service. The properties are common to, and enable management of, all user accounts. The properties include the password requirements and control features, such as account lockout. The schema also contains links to the manager accounts and roles.",
+ "longDescription": "This resource shall represent an account service for a Redfish implementation. The properties are common to, and enable management of, all user accounts. The properties include the password requirements and control features, such as account lockout.",
"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.",
@@ -94,31 +94,31 @@
"Accounts": {
"$ref": "http://redfish.dmtf.org/schemas/v1/ManagerAccountCollection.json#/definitions/ManagerAccountCollection",
"description": "The collection of manager accounts.",
- "longDescription": "This property shall contain a link to a Resource Collection of type ManagerAccountCollection.",
+ "longDescription": "This property shall contain a link to a resource collection of type ManagerAccountCollection.",
"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.",
"versionAdded": "v1_2_0"
},
"ActiveDirectory": {
"$ref": "#/definitions/ExternalAccountProvider",
- "description": "The first Active Directory external account provider that this Account Service supports.",
- "longDescription": "This property shall contain the first Active Directory external account provider that this Account Service supports. If the Account Service supports one or more Active Directory services as an external account provider, this entity shall be populated by default. This entity shall not be present in the AdditionalExternalAccountProviders Resource Collection.",
+ "description": "The first Active Directory external account provider that this account service supports.",
+ "longDescription": "This property shall contain the first Active Directory external account provider that this account service supports. If the account service supports one or more Active Directory services as an external account provider, this entity shall be populated by default. This entity shall not be present in the additional external account providers resource collection.",
"versionAdded": "v1_3_0"
},
"AdditionalExternalAccountProviders": {
"$ref": "http://redfish.dmtf.org/schemas/v1/ExternalAccountProviderCollection.json#/definitions/ExternalAccountProviderCollection",
- "description": "The additional external account providers that this Account Service uses.",
- "longDescription": "This property shall contain the additional external account providers that this Account Service uses.",
+ "description": "The additional external account providers that this account service uses.",
+ "longDescription": "This property shall contain a link to a resource collection of type ExternalAccountProviderCollection that represents the additional external account providers that this account service uses.",
"readonly": true,
"versionAdded": "v1_3_0"
},
"AuthFailureLoggingThreshold": {
"description": "The number of authorization failures that are allowed before the failed attempt is logged to the manager log.",
- "longDescription": "This property shall contain the threshold for when an authorization failure is logged. This value represents a modulo function. The failure shall be logged every `n`th occurrence, where `n` represents this property.",
+ "longDescription": "This property shall contain the threshold for when an authorization failure is logged. Logging shall occur after every `n` occurrences of an authorization failure, where `n` represents the value of this property. If the value is `0`, logging of authorization failures shall be disabled.",
"minimum": 0,
"readonly": false,
"type": "integer"
@@ -140,27 +140,27 @@
},
"LDAP": {
"$ref": "#/definitions/ExternalAccountProvider",
- "description": "The first LDAP external account provider that this Account Service supports.",
- "longDescription": "This property shall contain the first LDAP external account provider that this Account Service supports. If the Account Service supports one or more LDAP services as an external account provider, this entity shall be populated by default. This entity shall not be present in the AdditionalExternalAccountProviders Resource Collection.",
+ "description": "The first LDAP external account provider that this account service supports.",
+ "longDescription": "This property shall contain the first LDAP external account provider that this account service supports. If the account service supports one or more LDAP services as an external account provider, this entity shall be populated by default. This entity shall not be present in the additional external account providers resource collection.",
"versionAdded": "v1_3_0"
},
"LocalAccountAuth": {
"$ref": "#/definitions/LocalAccountAuth",
- "description": "An indication of how the Service uses the accounts collection within this Account Service as part of authentication. The enumerated values describe the details for each mode.",
- "longDescription": "This property shall govern how the Service uses the Accounts Resource Collection within this Account Service as part of authentication. The enumerated values describe the details for each mode.",
+ "description": "An indication of how the service uses the accounts collection within this account service as part of authentication. The enumerated values describe the details for each mode.",
+ "longDescription": "This property shall govern how the service uses the manager accounts resource collection within this account service as part of authentication. The enumerated values describe the details for each mode.",
"readonly": false,
"versionAdded": "v1_3_0"
},
"MaxPasswordLength": {
- "description": "The maximum password length for this Account Service.",
- "longDescription": "This property shall contain the maximum password length that the implementation allows for this Account Service.",
+ "description": "The maximum password length for this account service.",
+ "longDescription": "This property shall contain the maximum password length that the implementation allows for this account service.",
"minimum": 0,
"readonly": true,
"type": "integer"
},
"MinPasswordLength": {
- "description": "The minimum password length for this Account Service.",
- "longDescription": "This property shall contain the minimum password length that the implementation allows for this Account Service.",
+ "description": "The minimum password length for this account service.",
+ "longDescription": "This property shall contain the minimum password length that the implementation allows for this account service.",
"minimum": 0,
"readonly": true,
"type": "integer"
@@ -176,20 +176,20 @@
},
"PrivilegeMap": {
"$ref": "http://redfish.dmtf.org/schemas/v1/PrivilegeRegistry.json#/definitions/PrivilegeRegistry",
- "description": "The link to the mapping of the privileges required to complete a requested operation on a URI associated with this Service.",
- "longDescription": "This property shall contain a link to a Resource of type PrivilegeMapping that contains the privileges that are required for a user context to complete a requested operation on a URI associated with this Service.",
+ "description": "The link to the mapping of the privileges required to complete a requested operation on a URI associated with this service.",
+ "longDescription": "This property shall contain a link to a resource of type PrivilegeMapping that contains the privileges that are required for a user context to complete a requested operation on a URI associated with this service.",
"readonly": true,
"versionAdded": "v1_1_0"
},
"Roles": {
"$ref": "http://redfish.dmtf.org/schemas/v1/RoleCollection.json#/definitions/RoleCollection",
- "description": "The collection of Redfish Roles.",
- "longDescription": "This property shall contain a link to a Resource Collection of type RoleCollection.",
+ "description": "The collection of Redfish roles.",
+ "longDescription": "This property shall contain a link to a resource collection of type RoleCollection.",
"readonly": true
},
"ServiceEnabled": {
- "description": "An indication of whether the Account Service is enabled. If `true`, it is enabled. If `false`, it is disabled and users cannot be created, deleted, or modified, and new sessions cannot be started. However, established sessions may still continue to run. Any service, such as the Session Service, that attempts to access the disabled Account Service fails. However, this does not affect HTTP Basic Authentication connections.",
- "longDescription": "This property shall indicate whether the Account Service is enabled. If `true`, it is enabled. If `false`, it is disabled and users cannot be created, deleted, or modified, and new sessions cannot be started. However, established sessions may still continue to run. Any service, such as the Session Service, that attempts to access the disabled Account Service fails. However, this does not affect HTTP Basic Authentication connections.",
+ "description": "An indication of whether the account service is enabled. If `true`, it is enabled. If `false`, it is disabled and users cannot be created, deleted, or modified, and new sessions cannot be started. However, established sessions might still continue to run. Any service, such as the session service, that attempts to access the disabled account service fails. However, this does not affect HTTP Basic Authentication connections.",
+ "longDescription": "This property shall indicate whether the account service is enabled. If `true`, it is enabled. If `false`, it is disabled and users cannot be created, deleted, or modified, and new sessions cannot be started. However, established sessions might still continue to run. Any service, such as the session service, that attempts to access the disabled account service fails. However, this does not affect HTTP Basic Authentication connections.",
"readonly": false,
"type": [
"boolean",
@@ -198,8 +198,8 @@
},
"Status": {
"$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
- "description": "The status and health of the Resource and its subordinate or dependent Resources.",
- "longDescription": "This property shall contain any status or health properties of the Resource."
+ "description": "The status and health of the resource and its subordinate or dependent resources.",
+ "longDescription": "This property shall contain any status or health properties of the resource."
}
},
"required": [
@@ -212,8 +212,8 @@
},
"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.",
@@ -231,8 +231,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_2_0"
}
},
@@ -272,8 +272,8 @@
"versionAdded": "v1_3_0"
},
"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",
@@ -288,8 +288,8 @@
"versionAdded": "v1_3_0"
},
"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",
@@ -298,8 +298,8 @@
"versionAdded": "v1_3_0"
},
"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",
@@ -308,8 +308,8 @@
"versionAdded": "v1_3_0"
},
"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",
"versionAdded": "v1_3_0"
@@ -361,8 +361,8 @@
}
],
"deprecated": "This property is deprecated because the account provider type is known when used in the LDAP and ActiveDirectory objects.",
- "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,
"versionAdded": "v1_3_0",
"versionDeprecated": "v1_5_0"
@@ -376,7 +376,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 certificates of the CertificateCollection type that the external account provider uses.",
+ "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_4_0"
},
@@ -394,7 +394,7 @@
"versionAdded": "v1_7_0"
},
"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": [
{
@@ -405,7 +405,7 @@
}
]
},
- "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.",
+ "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",
"versionAdded": "v1_3_0"
},
@@ -417,7 +417,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",
"versionAdded": "v1_3_0"
@@ -542,16 +542,16 @@
"LocalFirst"
],
"enumDescriptions": {
- "Disabled": "The service never authenticates users based on the Account Service-defined accounts collection.",
- "Enabled": "The service authenticates users based on the Account Service-defined accounts collection.",
- "Fallback": "The service authenticates users based on the Account Service-defined accounts collection only if any external account providers are currently unreachable.",
- "LocalFirst": "The service first authenticates users based on the Account Service-defined accounts collection. If authentication fails, the Service authenticates by using external account providers."
+ "Disabled": "The service never authenticates users based on the account service-defined accounts collection.",
+ "Enabled": "The service authenticates users based on the account service-defined accounts collection.",
+ "Fallback": "The service authenticates users based on the account service-defined accounts collection only if any external account providers are currently unreachable.",
+ "LocalFirst": "The service first authenticates users based on the account service-defined accounts collection. If authentication fails, the service authenticates by using external account providers."
},
"enumLongDescriptions": {
- "Disabled": "The service shall never authenticate users based on the Account Service-defined Accounts Resource Collection.",
- "Enabled": "The service shall authenticate users based on the Account Service-defined Accounts Resource Collection.",
- "Fallback": "The service shall authenticate users based on the Account Service-defined Accounts Resource Collection only if any external account providers are currently unreachable.",
- "LocalFirst": "The service shall first authenticate users based on the Account Service-defined Accounts Resource Collection. If authentication fails, the Service shall authenticate by using external account providers."
+ "Disabled": "The service shall never authenticate users based on the account service-defined manager accounts resource collection.",
+ "Enabled": "The service shall authenticate users based on the account service-defined manager accounts resource collection.",
+ "Fallback": "The service shall authenticate users based on the account service-defined manager accounts resource collection only if any external account providers are currently unreachable.",
+ "LocalFirst": "The service shall first authenticate users based on the account service-defined manager accounts resource collection. If authentication fails, the service shall authenticate by using external account providers."
},
"enumVersionAdded": {
"LocalFirst": "v1_6_0"
@@ -560,8 +560,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.",
@@ -581,8 +581,8 @@
},
"RoleMapping": {
"additionalProperties": false,
- "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.",
+ "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.",
@@ -599,8 +599,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",
@@ -615,8 +615,8 @@
"versionAdded": "v1_3_0"
},
"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",
@@ -625,8 +625,8 @@
"versionAdded": "v1_3_0"
},
"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",
@@ -640,5 +640,5 @@
},
"owningEntity": "DMTF",
"release": "2019.4",
- "title": "#AccountService.v1_7_0.AccountService"
+ "title": "#AccountService.v1_7_1.AccountService"
}
\ No newline at end of file