Update Redfish schemas to 2019.2
Note, the DMTF changed the format of the schema file pack yet again, so
the script changes now to compensate for that.
Tested:
Ran schema validator. One unrelated failure in LogEntry, and 4 new
warnings in PCIe devices (we're using a deprecated property). All other
endpoints pass.
Signed-off-by: Ed Tanous <ed.tanous@intel.com>
Change-Id: I81c030a7c5a6a32cc12a5e7e02a9441b7891bc5d
diff --git a/static/redfish/v1/schema/AccountService_v1.xml b/static/redfish/v1/schema/AccountService_v1.xml
index 192f968..2b63159 100644
--- a/static/redfish/v1/schema/AccountService_v1.xml
+++ b/static/redfish/v1/schema/AccountService_v1.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!---->
<!--################################################################################ -->
-<!--# Redfish Schema: AccountService v1.4.0-->
+<!--# Redfish Schema: AccountService v1.6.0 -->
<!--# -->
<!--# For a detailed change log, see the README file contained in the DSP8010 bundle, -->
<!--# available at http://www.dmtf.org/standards/redfish -->
-<!--# Copyright 2014-2018 DMTF. -->
+<!--# Copyright 2014-2019 DMTF. -->
<!--# For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright -->
<!--################################################################################ -->
<!---->
@@ -50,8 +50,8 @@
<Annotation Term="Redfish.OwningEntity" String="DMTF"/>
<EntityType Name="AccountService" BaseType="Resource.v1_0_0.Resource" Abstract="true">
- <Annotation Term="OData.Description" String="The AccountService schema contains properties for managing user accounts. The properties are common to all user accounts, such as password requirements, and control features such as account lockout. The schema also contains links to the collections of Manager Accounts and Roles."/>
- <Annotation Term="OData.LongDescription" String="This resource shall be used to represent a management account service for a Redfish implementation."/>
+ <Annotation Term="OData.Description" String="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."/>
+ <Annotation Term="OData.LongDescription" String="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."/>
<Annotation Term="Capabilities.InsertRestrictions">
<Record>
<PropertyValue Property="Insertable" Bool="false"/>
@@ -60,7 +60,7 @@
<Annotation Term="Capabilities.UpdateRestrictions">
<Record>
<PropertyValue Property="Updatable" Bool="true"/>
- <Annotation Term="OData.Description" String="The Account Service can be updated to change some properties such as various thresholds and durations."/>
+ <Annotation Term="OData.Description" String="Some properties, such as thresholds and durations, can be updated for the Account Service."/>
</Record>
</Annotation>
<Annotation Term="Capabilities.DeleteRestrictions">
@@ -84,62 +84,62 @@
<EntityType Name="AccountService" BaseType="AccountService.AccountService">
<Property Name="Status" Type="Resource.Status" Nullable="false">
- <Annotation Term="OData.Description" String="This property describes the status and health of the resource and its children."/>
- <Annotation Term="OData.LongDescription" String="This property shall contain any status or health properties of the resource."/>
+ <Annotation Term="OData.Description" String="The status and health of the Resource and its subordinate or dependent Resources."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain any status or health properties of the Resource."/>
</Property>
<Property Name="ServiceEnabled" Type="Edm.Boolean">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
- <Annotation Term="OData.Description" String="Indicates whether this service is enabled. If set to false, the AccountService is disabled. This means no users can be created, deleted or modified. Any service attempting to access the AccountService resource (for example, the Session Service) will fail. New sessions cannot be started when the service is disabled. However, established sessions may still continue operating. This does not affect Basic AUTH connections."/>
- <Annotation Term="OData.LongDescription" String="The value of this property shall be a boolean indicating whether this service is enabled. If this is set to false, the AccountService is disabled. This means no users can be created, deleted or modified. Any service attempting to access the Account Service, like the Session Service, will fail accessing. Thus new sessions cannot be started with the service disabled (though established sessions may still continue operating). Note: this does not affect Basic AUTH connections."/>
+ <Annotation Term="OData.Description" String="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."/>
+ <Annotation Term="OData.LongDescription" String="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."/>
</Property>
<Property Name="AuthFailureLoggingThreshold" Type="Edm.Int64" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
- <Annotation Term="OData.Description" String="The number of authorization failures allowed before the failure attempt is logged to the manager log."/>
- <Annotation Term="OData.LongDescription" String="This property shall reference the threshold for when an authorization failure is logged. This represents a modulo function value, thus the failure shall be logged every nth occurrence where n represents the value of this property."/>
+ <Annotation Term="OData.Description" String="The number of authorization failures that are allowed before the failed attempt is logged to the manager log."/>
+ <Annotation Term="OData.LongDescription" String="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."/>
<Annotation Term="Validation.Minimum" Int="0"/>
</Property>
<Property Name="MinPasswordLength" Type="Edm.Int64" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
- <Annotation Term="OData.Description" String="The minimum password length for this service."/>
- <Annotation Term="OData.LongDescription" String="This property shall reference the minimum password length that the implementation will allow a password to be set to."/>
+ <Annotation Term="OData.Description" String="The minimum password length for this Account Service."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the minimum password length that the implementation allows for this Account Service."/>
<Annotation Term="Validation.Minimum" Int="0"/>
</Property>
<Property Name="MaxPasswordLength" Type="Edm.Int64" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
- <Annotation Term="OData.Description" String="The maximum password length for this service."/>
- <Annotation Term="OData.LongDescription" String="This property shall reference the maximum password length that the implementation will allow a password to be set to."/>
+ <Annotation Term="OData.Description" String="The maximum password length for this Account Service."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the maximum password length that the implementation allows for this Account Service."/>
<Annotation Term="Validation.Minimum" Int="0"/>
</Property>
<Property Name="AccountLockoutThreshold" Type="Edm.Int64" Nullable="true">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
- <Annotation Term="OData.Description" String="The number of failed login attempts allowed before a user account is locked for a specified duration. A value of 0 means it is never locked."/>
- <Annotation Term="OData.LongDescription" String="This property shall reference the threshold of failed login attempts at which point the user's account is locked. If set to 0, no lockout shall ever occur."/>
+ <Annotation Term="OData.Description" String="The number of allowed failed login attempts before a user account is locked for a specified duration. If `0`, the account is never locked."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the threshold of failed login attempts before a user account is locked. If `0`, the account shall never be locked."/>
<Annotation Term="Validation.Minimum" Int="0"/>
</Property>
<Property Name="AccountLockoutDuration" Type="Edm.Int64" Nullable="true">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
- <Annotation Term="OData.Description" String="The time in seconds an account is locked out. The value must be greater than or equal to the value of the AccountLockoutCounterResetAfter property. If set to 0, no lockout occurs."/>
- <Annotation Term="OData.LongDescription" String="This property shall reference the period of time in seconds that an account is locked after the number of failed login attempts reaches the threshold referenced by AccountLockoutThreshold, within the window of time referenced by AccountLockoutCounterResetAfter. The value shall be greater than or equal to the value of AccountLockoutResetAfter. If set to 0, no lockout shall occur."/>
+ <Annotation Term="OData.Description" String="The period of time, in seconds, that an account is locked after the number of failed login attempts reaches the account lockout threshold, within the period between the last failed login attempt and the reset of the lockout threshold counter. If this value is `0`, no lockout will occur. If the AccountLockoutCounterResetEnabled value is `false`, this property is ignored."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the period of time, in seconds, that an account is locked after the number of failed login attempts reaches the AccountLockoutThreshold value, within the AccountLockoutCounterResetAfter window of time. The value shall be greater than or equal to the AccountLockoutResetAfter value. If this value is `0`, no lockout shall occur. If AccountLockoutCounterResetEnabled value is `false`, this property shall be ignored."/>
<Annotation Term="Validation.Minimum" Int="0"/>
<Annotation Term="Measures.Unit" String="s"/>
</Property>
<Property Name="AccountLockoutCounterResetAfter" Type="Edm.Int64" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
- <Annotation Term="OData.Description" String="The interval of time in seconds between the last failed login attempt and reset of the lockout threshold counter. This value must be less than or equal to AccountLockoutDuration. Reset sets the counter to zero."/>
- <Annotation Term="OData.LongDescription" String="This property shall reference the threshold of time in seconds from the last failed login attempt at which point the AccountLockoutThreshold counter (that counts number of failed login attempts) is reset back to zero (at which point AccountLockoutThreshold failures would be required before the account is locked). This value shall be less than or equal to AccountLockoutDuration. The threshold counter also resets to zero after each successful login."/>
+ <Annotation Term="OData.Description" String="The period of time, in seconds, between the last failed login attempt and the reset of the lockout threshold counter. This value must be less than or equal to the AccountLockoutDuration value. A reset sets the counter to `0`."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the period of time, in seconds, from the last failed login attempt when the AccountLockoutThreshold counter, which counts the number of failed login attempts, is reset to `0`. Then, AccountLockoutThreshold failures are required before the account is locked. This value shall be less than or equal to the AccountLockoutDuration value. The threshold counter also resets to `0` after each successful login. If the AccountLockoutCounterResetEnabled value is `false`, this property shall be ignored."/>
<Annotation Term="Validation.Minimum" Int="0"/>
<Annotation Term="Measures.Unit" String="s"/>
</Property>
<NavigationProperty Name="Accounts" Type="ManagerAccountCollection.ManagerAccountCollection" ContainsTarget="true" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
- <Annotation Term="OData.Description" String="A link to a collection of Manager Accounts."/>
- <Annotation Term="OData.LongDescription" String="This property shall contain the link to a collection of type ManagerAccountCollection."/>
+ <Annotation Term="OData.Description" String="The collection of manager accounts."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain a link to a Resource Collection of type ManagerAccountCollection."/>
<Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty>
<NavigationProperty Name="Roles" Type="RoleCollection.RoleCollection" ContainsTarget="true" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
- <Annotation Term="OData.Description" String="A link to a collection of Roles."/>
- <Annotation Term="OData.LongDescription" String="This property shall contain the link to a collection of type RoleCollection."/>
+ <Annotation Term="OData.Description" String="The collection of Redfish Roles."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain a link to a Resource Collection of type RoleCollection."/>
<Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty>
</EntityType>
@@ -148,7 +148,7 @@
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_0_2">
<Annotation Term="Redfish.OwningEntity" String="DMTF"/>
- <Annotation Term="OData.Description" String="This version was created to show annotations in previous namespaces were updated."/>
+ <Annotation Term="OData.Description" String="This version was created to show that annotations in previous namespaces were updated."/>
<EntityType Name="AccountService" BaseType="AccountService.v1_0_0.AccountService"/>
</Schema>
@@ -166,7 +166,7 @@
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_0_5">
<Annotation Term="Redfish.OwningEntity" String="DMTF"/>
- <Annotation Term="OData.Description" String="This version was created to fix supported types. In this case, fixed description and long description for ServiceEnabled."/>
+ <Annotation Term="OData.Description" String="This version was created to fix supported types, which are the ServiceEnabled fixed and long descriptions."/>
<EntityType Name="AccountService" BaseType="AccountService.v1_0_4.AccountService"/>
</Schema>
@@ -176,14 +176,26 @@
<EntityType Name="AccountService" BaseType="AccountService.v1_0_5.AccountService"/>
</Schema>
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_0_7">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to force the regeneration of JSON Schema so that URI properties use the uri-reference format."/>
+ <EntityType Name="AccountService" BaseType="AccountService.v1_0_6.AccountService"/>
+ </Schema>
+
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_0_8">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to update descriptions that this schema defines."/>
+ <EntityType Name="AccountService" BaseType="AccountService.v1_0_7.AccountService"/>
+ </Schema>
+
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_1_0">
<Annotation Term="Redfish.OwningEntity" String="DMTF"/>
<Annotation Term="Redfish.Release" String="2016.3"/>
<EntityType Name="AccountService" BaseType="AccountService.v1_0_3.AccountService">
<NavigationProperty Name="PrivilegeMap" Type="PrivilegeRegistry.PrivilegeRegistry" ContainsTarget="true" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
- <Annotation Term="OData.Description" String="A reference to the Privilege mapping that defines the privileges needed to perform a requested operation on a URI associated with this service."/>
- <Annotation Term="OData.LongDescription" String="The value of this property shall be a link to a resource of type PrivilegeMappoing that defines the privileges a user context needs in order to perform a requested operation on a URI associated with this service."/>
+ <Annotation Term="OData.Description" String="The link to the mapping of the privileges required to complete a requested operation on a URI associated with this Service."/>
+ <Annotation Term="OData.LongDescription" String="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."/>
<Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty>
</EntityType>
@@ -197,7 +209,7 @@
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_1_2">
<Annotation Term="Redfish.OwningEntity" String="DMTF"/>
- <Annotation Term="OData.Description" String="This version was created to fix supported types. In this case, fixed description and long description for ServiceEnabled."/>
+ <Annotation Term="OData.Description" String="This version was created to fix the description for ServiceEnabled."/>
<EntityType Name="AccountService" BaseType="AccountService.v1_1_1.AccountService"/>
</Schema>
@@ -207,42 +219,54 @@
<EntityType Name="AccountService" BaseType="AccountService.v1_1_2.AccountService"/>
</Schema>
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_1_4">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to force the regeneration of JSON Schema so that URI properties use the uri-reference format."/>
+ <EntityType Name="AccountService" BaseType="AccountService.v1_1_3.AccountService"/>
+ </Schema>
+
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_1_5">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to update descriptions that this schema defines."/>
+ <EntityType Name="AccountService" BaseType="AccountService.v1_1_4.AccountService"/>
+ </Schema>
+
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_2_0">
<Annotation Term="Redfish.OwningEntity" String="DMTF"/>
<Annotation Term="Redfish.Release" String="2017.1"/>
<EntityType Name="AccountService" BaseType="AccountService.v1_1_1.AccountService">
<Property Name="Actions" Type="AccountService.v1_2_0.Actions" Nullable="false">
- <Annotation Term="OData.Description" String="The available actions for this resource."/>
- <Annotation Term="OData.LongDescription" String="The Actions property shall contain the available actions for this resource."/>
+ <Annotation Term="OData.Description" String="The available actions for this Resource."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the available actions for this Resource."/>
</Property>
</EntityType>
<ComplexType Name="Actions">
<Annotation Term="OData.AdditionalProperties" Bool="false"/>
- <Annotation Term="OData.Description" String="The available actions for this resource."/>
- <Annotation Term="OData.LongDescription" String="This type shall contain the available actions for this resource."/>
+ <Annotation Term="OData.Description" String="The available actions for this Resource."/>
+ <Annotation Term="OData.LongDescription" String="This type shall contain the available actions for this Resource."/>
<Property Name="Oem" Type="AccountService.v1_2_0.OemActions" Nullable="false">
- <Annotation Term="OData.Description" String="This property contains the available OEM specific actions for this resource."/>
- <Annotation Term="OData.LongDescription" String="This property shall contain any additional OEM actions for this resource."/>
+ <Annotation Term="OData.Description" String="The available OEM-specific actions for this Resource."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the available OEM-specific actions for this Resource."/>
</Property>
</ComplexType>
<ComplexType Name="OemActions">
<Annotation Term="OData.AdditionalProperties" Bool="true"/>
- <Annotation Term="OData.Description" String="The available OEM specific actions for this resource."/>
- <Annotation Term="OData.LongDescription" String="This type shall contain any additional OEM actions for this resource."/>
+ <Annotation Term="OData.Description" String="The available OEM-specific actions for this Resource."/>
+ <Annotation Term="OData.LongDescription" String="This type shall contain the available OEM-specific actions for this Resource."/>
</ComplexType>
</Schema>
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_2_1">
<Annotation Term="Redfish.OwningEntity" String="DMTF"/>
- <Annotation Term="OData.Description" String="This version was created to fix supported types. In this case, fixed description and long description for ServiceEnabled."/>
+ <Annotation Term="OData.Description" String="This version was created to fix the description for ServiceEnabled."/>
<EntityType Name="AccountService" BaseType="AccountService.v1_2_0.AccountService"/>
</Schema>
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_2_2">
<Annotation Term="Redfish.OwningEntity" String="DMTF"/>
- <Annotation Term="OData.Description" String="This version was created to perform editoral updates of descriptions defined in this schema."/>
+ <Annotation Term="OData.Description" String="This version was created to update the descriptions in this schema."/>
<EntityType Name="AccountService" BaseType="AccountService.v1_2_1.AccountService"/>
</Schema>
@@ -252,6 +276,18 @@
<EntityType Name="AccountService" BaseType="AccountService.v1_2_2.AccountService"/>
</Schema>
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_2_4">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to force the regeneration of JSON Schema so that URI properties use the uri-reference format."/>
+ <EntityType Name="AccountService" BaseType="AccountService.v1_2_3.AccountService"/>
+ </Schema>
+
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_2_5">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to update descriptions that this schema defines."/>
+ <EntityType Name="AccountService" BaseType="AccountService.v1_2_4.AccountService"/>
+ </Schema>
+
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_3_0">
<Annotation Term="Redfish.OwningEntity" String="DMTF"/>
<Annotation Term="Redfish.Release" String="2018.1"/>
@@ -259,120 +295,141 @@
<EntityType Name="AccountService" BaseType="AccountService.v1_2_2.AccountService">
<Property Name="LocalAccountAuth" Type="AccountService.v1_3_0.LocalAccountAuth" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
- <Annotation Term="OData.Description" String="Controls when this service will use the accounts defined withing this AccountService as part of authentication."/>
- <Annotation Term="OData.LongDescription" String="This property shall govern how the service uses the Accounts collection within this AccountService as part of authentication. Details about each of the modes are found in the description of the enum values."/>
+ <Annotation Term="OData.Description" String="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."/>
+ <Annotation Term="OData.LongDescription" String="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."/>
</Property>
<Property Name="LDAP" Type="AccountService.v1_3_0.ExternalAccountProvider" Nullable="false">
- <Annotation Term="OData.Description" String="The first LDAP external account provider this AccountService supports."/>
- <Annotation Term="OData.LongDescription" String="This property shall contain the first LDAP external account provider this AccountService supports. If the AccountService supports 1 or more LDAP services as an external account provider this entity must be populated by default. This entity shall not be present in the AdditionalExternalAccountProviders collection."/>
+ <Annotation Term="OData.Description" String="The first LDAP external account provider that this Account Service supports."/>
+ <Annotation Term="OData.LongDescription" String="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."/>
</Property>
<Property Name="ActiveDirectory" Type="AccountService.v1_3_0.ExternalAccountProvider" Nullable="false">
- <Annotation Term="OData.Description" String="The first ActiveDirectory external account provider this AccountService supports."/>
- <Annotation Term="OData.LongDescription" String="This property shall contain the first ActiveDirectory external account provider this AccountService supports. If the AccountService supports 1 or more ActiveDirectory services as an external account provider this entity must be populated by default. This entity shall not be present in the AdditionalExternalAccountProviders collection."/>
+ <Annotation Term="OData.Description" String="The first Active Directory external account provider that this Account Service supports."/>
+ <Annotation Term="OData.LongDescription" String="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."/>
</Property>
<NavigationProperty Name="AdditionalExternalAccountProviders" Type="ExternalAccountProviderCollection.ExternalAccountProviderCollection" ContainsTarget="true" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
- <Annotation Term="OData.Description" String="The additional external account providers this AccountService is using."/>
- <Annotation Term="OData.LongDescription" String="This property shall contain an additional external account providers this AccountService is using."/>
+ <Annotation Term="OData.Description" String="The additional external account providers that this Account Service uses."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the additional external account providers that this Account Service uses."/>
</NavigationProperty>
</EntityType>
<EnumType Name="LocalAccountAuth">
<Member Name="Enabled">
- <Annotation Term="OData.Description" String="Authentication via accounts defined in this AccountService is enabled."/>
- <Annotation Term="OData.LongDescription" String="This value shall be used to indicate that the service will authenticate users based on the Accounts collection within this AccountService."/>
+ <Annotation Term="OData.Description" String="The service authenticates users based on the Account Service-defined accounts collection."/>
+ <Annotation Term="OData.LongDescription" String="The service shall authenticate users based on the Account Service-defined Accounts Resource Collection."/>
</Member>
<Member Name="Disabled">
- <Annotation Term="OData.Description" String="Authentication via accounts defined in this AccountService is disabled."/>
- <Annotation Term="OData.LongDescription" String="This value shall be used to indicate that the service will never authenticate users based on the Accounts collection within this AccountService."/>
+ <Annotation Term="OData.Description" String="The service never authenticates users based on the Account Service-defined accounts collection."/>
+ <Annotation Term="OData.LongDescription" String="The service shall never authenticate users based on the Account Service-defined Accounts Resource Collection."/>
</Member>
<Member Name="Fallback">
- <Annotation Term="OData.Description" String="Authentication via accounts defined in this AccountService is only used if there are external account providers that are currently unreachable."/>
- <Annotation Term="OData.LongDescription" String="This value shall be used to indicate that the service will authenticate users based on the Accounts collection within this AccountService only if there are external account providers that are currently unreachable."/>
+ <Annotation Term="OData.Description" String="The service authenticates users based on the Account Service-defined accounts collection only if any external account providers are currently unreachable."/>
+ <Annotation Term="OData.LongDescription" String="The service shall authenticate users based on the Account Service-defined Accounts Resource Collection only if any external account providers are currently unreachable."/>
+ </Member>
+ <Member Name="LocalFirst">
+ <Annotation Term="OData.Description" String="The service first authenticates users based on the Account Service-defined accounts collection. If authentication fails, the Service authenticates by using external account providers."/>
+ <Annotation Term="OData.LongDescription" String="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."/>
+ <Annotation Term="Redfish.Revisions">
+ <Collection>
+ <Record>
+ <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+ <PropertyValue Property="Version" String="v1_6_0"/>
+ </Record>
+ </Collection>
+ </Annotation>
</Member>
</EnumType>
<ComplexType Name="ExternalAccountProvider">
- <Annotation Term="OData.Description" String="A remote service that can provide accounts for this manager to utilize for authentication."/>
- <Annotation Term="OData.LongDescription" String="This type shall be used to represent resources that represent external user account services for this manager."/>
+ <Annotation Term="OData.Description" String="The external account provider services that can provide accounts for this manager to use for authentication."/>
+ <Annotation Term="OData.LongDescription" String="This type shall contain properties that represent external account provider services that can provide accounts for this manager to use for authentication."/>
<Property Name="AccountProviderType" Type="AccountService.v1_3_0.AccountProviderTypes">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
- <Annotation Term="OData.Description" String="This property contains the type of external account provider this resource references."/>
- <Annotation Term="OData.LongDescription" String="The value of this property shall be the type of external account provider referenced by this resource."/>
+ <Annotation Term="OData.Description" String="The type of external account provider to which this Service connects."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the type of external account provider to which this Service connects."/>
+ <Annotation Term="Redfish.Revisions">
+ <Collection>
+ <Record>
+ <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/>
+ <PropertyValue Property="Version" String="v1_5_0"/>
+ <PropertyValue Property="Description" String="This property is deprecated because the account provider type is known when used in the LDAP and ActiveDirectory objects."/>
+ </Record>
+ </Collection>
+ </Annotation>
</Property>
<Property Name="ServiceEnabled" Type="Edm.Boolean">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
- <Annotation Term="OData.Description" String="This indicates whether this service is enabled."/>
- <Annotation Term="OData.LongDescription" String="The value of this property shall be a boolean indicating whether this service is enabled."/>
+ <Annotation Term="OData.Description" String="An indication of whether this service is enabled."/>
+ <Annotation Term="OData.LongDescription" String="This property shall indicate whether this service is enabled."/>
</Property>
<Property Name="ServiceAddresses" Type="Collection(Edm.String)">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
- <Annotation Term="OData.Description" String="This property contains the addresses of the user account providers this resource references. The format of this field depends on the Type."/>
- <Annotation Term="OData.LongDescription" String="The value of this property shall be the addresses of the account providers this resource references. The format of this field depends on the Type of the ExternalAccountProvider. Each item in the array shall contain a single address. Services may define their own behavior for managing multiple addresses."/>
+ <Annotation Term="OData.Description" String="The addresses of the user account providers to which this external account provider links. The format of this field depends on the type of external account provider."/>
+ <Annotation Term="OData.LongDescription" String="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."/>
</Property>
- <Property Name="Authentication" Type="AccountService.v1_3_0.Authentication">
- <Annotation Term="OData.Description" String="This property contains the authentication information for the external account provider."/>
- <Annotation Term="OData.LongDescription" String="The value of this property shall contain the authentication information for the external account provider."/>
+ <Property Name="Authentication" Type="AccountService.v1_3_0.Authentication" Nullable="false">
+ <Annotation Term="OData.Description" String="The authentication information for the external account provider."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the authentication information for the external account provider."/>
</Property>
- <Property Name="LDAPService" Type="AccountService.v1_3_0.LDAPService">
- <Annotation Term="OData.Description" String="This property contains additional mapping information needed to parse a generic LDAP service."/>
- <Annotation Term="OData.LongDescription" String="The value of this property shall contain any additional mapping information needed to parse a generic LDAP service."/>
+ <Property Name="LDAPService" Type="AccountService.v1_3_0.LDAPService" Nullable="false">
+ <Annotation Term="OData.Description" String="The additional mapping information needed to parse a generic LDAP service."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain any additional mapping information needed to parse a generic LDAP service. This property should only be present inside the LDAP property."/>
</Property>
<Property Name="RemoteRoleMapping" Type="Collection(AccountService.v1_3_0.RoleMapping)">
- <Annotation Term="OData.Description" String="This property contains a collection of the mapping rules to convert the external account providers account information to the local Redfish Role."/>
- <Annotation Term="OData.LongDescription" String="This property shall contain a collection of the mapping rules to convert the external account providers account information to the local Redfish Role."/>
+ <Annotation Term="OData.Description" String="The mapping rules to convert the external account providers account information to the local Redfish Role."/>
+ <Annotation Term="OData.LongDescription" String="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."/>
</Property>
</ComplexType>
<EnumType Name="AccountProviderTypes">
<Member Name="RedfishService">
<Annotation Term="OData.Description" String="An external Redfish Service."/>
- <Annotation Term="OData.LongDescription" String="The external account provider shall be a service conforming to the DMTF Redfish specification. The format of ServiceAddresses shall be a collection of URIs which corresponds to a Redfish AccountService entity."/>
+ <Annotation Term="OData.LongDescription" String="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."/>
</Member>
<Member Name="ActiveDirectoryService">
- <Annotation Term="OData.Description" String="An external Active Directory Service."/>
- <Annotation Term="OData.LongDescription" String="The external account provider shall be a service conforming to the Microsoft Active Directory Technical specification. The format of ServiceAddresses shall be a collection of FQDNs or Netbios names that references the set of domain servers for the Active Directory service."/>
+ <Annotation Term="OData.Description" String="An external Active Directory service."/>
+ <Annotation Term="OData.LongDescription" String="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."/>
</Member>
<Member Name="LDAPService">
- <Annotation Term="OData.Description" String="A generic external LDAP Service."/>
- <Annotation Term="OData.LongDescription" String="The external account provider shall be a service conforming to RFC4511. The format of ServiceAddresses shall be a collection of FQDNs that references the set of LDAP servers for the service."/>
+ <Annotation Term="OData.Description" String="A generic external LDAP service."/>
+ <Annotation Term="OData.LongDescription" String="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."/>
</Member>
<Member Name="OEM">
- <Annotation Term="OData.Description" String="An OEM specific external authentication or directory service."/>
+ <Annotation Term="OData.Description" String="An OEM-specific external authentication or directory service."/>
</Member>
</EnumType>
<ComplexType Name="Authentication">
- <Annotation Term="OData.Description" String="Contains the authentication information for the external service."/>
- <Annotation Term="OData.LongDescription" String="This type shall contain all the required information to authenticate to the external service."/>
+ <Annotation Term="OData.Description" String="The information required to authenticate to the external service."/>
+ <Annotation Term="OData.LongDescription" String="This type shall contain the information required to authenticate to the external service."/>
<Property Name="AuthenticationType" Type="AccountService.v1_3_0.AuthenticationTypes">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
- <Annotation Term="OData.Description" String="This property contains the type of authentication used to connect to the external account provider."/>
- <Annotation Term="OData.LongDescription" String="The value of this property shall be the type of authentication used to connect to the external account provider."/>
+ <Annotation Term="OData.Description" String="The type of authentication used to connect to the external account provider."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the type of authentication used to connect to the external account provider."/>
</Property>
<Property Name="Username" Type="Edm.String" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
- <Annotation Term="OData.Description" String="This property contains the user name for the account service."/>
- <Annotation Term="OData.LongDescription" String="The value of this property shall be the user name for this account service."/>
+ <Annotation Term="OData.Description" String="The user name for the Service."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the user name for this Service."/>
</Property>
<Property Name="Password" Type="Edm.String">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
- <Annotation Term="OData.Description" String="This property is used with a PATCH or PUT to write the password for the account service. This property is null on a GET."/>
- <Annotation Term="OData.LongDescription" String="The value of this property shall be the password for this account service. The value shall be null for GET requests."/>
+ <Annotation Term="OData.Description" String="The password for this Service. A PATCH or PUT request writes the password. This property is `null` in responses."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the password for this Service. A PATCH or PUT operation writes the password. The value shall be `null` in responses."/>
</Property>
<Property Name="Token" Type="Edm.String">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
- <Annotation Term="OData.Description" String="This property is used with a PATCH or PUT to write the token for the account. This property is null on a GET."/>
- <Annotation Term="OData.LongDescription" String="The value of this property shall be the token for this account service. The value shall be null for GET requests."/>
+ <Annotation Term="OData.Description" String="The token for this Service. A PATCH or PUT operation writes the token. This property is `null` in responses."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the token for this Service. A PATCH or PUT operation writes the token. The value shall be `null` in responses."/>
</Property>
<Property Name="KerberosKeytab" Type="Edm.String">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
- <Annotation Term="OData.Description" String="This property is used with a PATCH or PUT to write a base64 encoded version of the kerberos keytab for the account. This property is null on a GET."/>
- <Annotation Term="OData.LongDescription" String="The value of this property shall be a base64 encoded version of the kerberos keytab for this account service. The value shall be null for GET requests."/>
+ <Annotation Term="OData.Description" String="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."/>
+ <Annotation Term="OData.LongDescription" String="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."/>
</Property>
<Property Name="Oem" Type="Resource.Oem" Nullable="false">
- <Annotation Term="OData.Description" String="Oem extension object."/>
- <Annotation Term="OData.LongDescription" String="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."/>
+ <Annotation Term="OData.Description" String="The OEM extension property."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the OEM extensions. All values for properties contained in this object shall conform to the Redfish Specification-described requirements."/>
</Property>
</ComplexType>
@@ -381,75 +438,75 @@
<Annotation Term="OData.Description" String="An opaque authentication token."/>
</Member>
<Member Name="KerberosKeytab">
- <Annotation Term="OData.Description" String="A kerberos keytab."/>
+ <Annotation Term="OData.Description" String="A Kerberos keytab."/>
</Member>
<Member Name="UsernameAndPassword">
- <Annotation Term="OData.Description" String="Username and password combination."/>
+ <Annotation Term="OData.Description" String="A user name and password combination."/>
</Member>
<Member Name="OEM">
- <Annotation Term="OData.Description" String="An OEM specific authentication mechanism."/>
+ <Annotation Term="OData.Description" String="An OEM-specific authentication mechanism."/>
</Member>
</EnumType>
<ComplexType Name="LDAPService">
- <Annotation Term="OData.Description" String="Contains settings for parsing a generic LDAP service."/>
- <Annotation Term="OData.LongDescription" String="This type shall contain all the required settings for parsing a generic LDAP service."/>
- <Property Name="SearchSettings" Type="AccountService.v1_3_0.LDAPSearchSettings">
- <Annotation Term="OData.Description" String="This property contains the settings needed to search an external LDAP service."/>
- <Annotation Term="OData.LongDescription" String="The value of this property shall contain the settings needed to search an external LDAP service."/>
+ <Annotation Term="OData.Description" String="The settings required to parse a generic LDAP service."/>
+ <Annotation Term="OData.LongDescription" String="This type shall contain all required settings to parse a generic LDAP service."/>
+ <Property Name="SearchSettings" Type="AccountService.v1_3_0.LDAPSearchSettings" Nullable="false">
+ <Annotation Term="OData.Description" String="The required settings to search an external LDAP service."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the required settings to search an external LDAP service."/>
</Property>
<Property Name="Oem" Type="Resource.Oem" Nullable="false">
- <Annotation Term="OData.Description" String="Oem extension object."/>
- <Annotation Term="OData.LongDescription" String="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."/>
+ <Annotation Term="OData.Description" String="The OEM extension property."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the OEM extensions. All values for properties contained in this object shall conform to the Redfish Specification-described requirements."/>
</Property>
</ComplexType>
<ComplexType Name="LDAPSearchSettings">
- <Annotation Term="OData.Description" String="Contains settings for searching a generic LDAP service."/>
- <Annotation Term="OData.LongDescription" String="This type shall contain all the required settings for searching a generic LDAP service."/>
+ <Annotation Term="OData.Description" String="The settings to search a generic LDAP service."/>
+ <Annotation Term="OData.LongDescription" String="This type shall contain all required settings to search a generic LDAP service."/>
<Property Name="BaseDistinguishedNames" Type="Collection(Edm.String)">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
- <Annotation Term="OData.Description" String="The base distinguished names to use when searching the LDAP service."/>
- <Annotation Term="OData.LongDescription" String="The value of this property shall be a collection of base distinguished names to use when searching the LDAP service."/>
+ <Annotation Term="OData.Description" String="The base distinguished names to use to search an external LDAP service."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain an array of base distinguished names to use to search an external LDAP service."/>
</Property>
<Property Name="UsernameAttribute" Type="Edm.String">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
- <Annotation Term="OData.Description" String="The attribute name that contains the Username."/>
- <Annotation Term="OData.LongDescription" String="The value of this property shall be the attribute name that contains the Username."/>
+ <Annotation Term="OData.Description" String="The attribute name that contains the LDAP user name entry."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the attribute name that contains the LDAP user name."/>
</Property>
<Property Name="GroupNameAttribute" Type="Edm.String">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
- <Annotation Term="OData.Description" String="The attribute name that contains the name of the Group."/>
- <Annotation Term="OData.LongDescription" String="The value of this property shall be the attribute name that contains the name of the Group."/>
+ <Annotation Term="OData.Description" String="The attribute name that contains the LDAP group name entry."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the attribute name that contains the LDAP group name."/>
</Property>
<Property Name="GroupsAttribute" Type="Edm.String">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
- <Annotation Term="OData.Description" String="The attribute name that contains the Groups for a user."/>
- <Annotation Term="OData.LongDescription" String="The value of this property shall be the attribute name that contains the Groups for a user."/>
+ <Annotation Term="OData.Description" String="The attribute name that contains the groups for a user on the LDAP user entry."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the attribute name that contains the groups for an LDAP user entry."/>
</Property>
</ComplexType>
<ComplexType Name="RoleMapping">
- <Annotation Term="OData.Description" String="Contains mapping rules to convert the external account providers account information to the local Redfish Role."/>
- <Annotation Term="OData.LongDescription" String="This type shall contain mapping rules to convert the external account providers account information to the local Redfish Role."/>
+ <Annotation Term="OData.Description" String="The mapping rules that are used to convert the external account providers account information to the local Redfish Role."/>
+ <Annotation Term="OData.LongDescription" String="This type shall contain mapping rules that are used to convert the external account providers account information to the local Redfish Role."/>
<Property Name="RemoteGroup" Type="Edm.String">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
- <Annotation Term="OData.Description" String="This property is the name of the remote group (or in the case of a Redfish Service, remote role) that will be mapped to the local role referenced by this entity."/>
- <Annotation Term="OData.LongDescription" String="The value of this property shall contain the name of the remote group (or in the case of a Redfish Service, remote role) that will be mapped to the local role referenced by this entity."/>
+ <Annotation Term="OData.Description" String="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."/>
+ <Annotation Term="OData.LongDescription" String="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."/>
</Property>
<Property Name="RemoteUser" Type="Edm.String">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
- <Annotation Term="OData.Description" String="This property is the name of the remote user that will be mapped to the local role referenced by this entity."/>
- <Annotation Term="OData.LongDescription" String="The value of this property shall contain the name of the remote user that will be mapped to the local role referenced by this entity."/>
+ <Annotation Term="OData.Description" String="The name of the remote user that maps to the local Redfish Role to which this entity links."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the name of the remote user that maps to the local Redfish Role to which this entity links."/>
</Property>
<Property Name="LocalRole" Type="Edm.String">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
- <Annotation Term="OData.Description" String="The name of the local role in which to map the remote user or group."/>
- <Annotation Term="OData.LongDescription" String="The value of this property shall contain the value of the RoleId property within a Role resource on this Redfish service in which to map the remote user or group."/>
+ <Annotation Term="OData.Description" String="The name of the local Redfish Role to which to map the remote user or group."/>
+ <Annotation Term="OData.LongDescription" String="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."/>
</Property>
<Property Name="Oem" Type="Resource.Oem" Nullable="false">
- <Annotation Term="OData.Description" String="Oem extension object."/>
- <Annotation Term="OData.LongDescription" String="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."/>
+ <Annotation Term="OData.Description" String="The OEM extension property."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain the OEM extensions. All values for properties contained in this object shall conform to the Redfish Specification-described requirements."/>
</Property>
</ComplexType>
@@ -461,6 +518,18 @@
<EntityType Name="AccountService" BaseType="AccountService.v1_3_0.AccountService"/>
</Schema>
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_3_2">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to force the regeneration of JSON Schema so that URI properties use the uri-reference format. It also clarifies property descriptions in LDAPSearchSettings and adds a missing term to several properties to disallow them from being null."/>
+ <EntityType Name="AccountService" BaseType="AccountService.v1_3_1.AccountService"/>
+ </Schema>
+
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_3_3">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to update the description of the Password, Token, and KerberosKeytab properties. It was also created to clarify the usage of the LDAPService property."/>
+ <EntityType Name="AccountService" BaseType="AccountService.v1_3_2.AccountService"/>
+ </Schema>
+
<Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_4_0">
<Annotation Term="Redfish.OwningEntity" String="DMTF"/>
<Annotation Term="Redfish.Release" String="2018.3"/>
@@ -468,12 +537,52 @@
<ComplexType Name="ExternalAccountProvider" BaseType="AccountService.v1_3_0.ExternalAccountProvider">
<NavigationProperty Name="Certificates" Type="CertificateCollection.CertificateCollection" ContainsTarget="true" Nullable="false">
<Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
- <Annotation Term="OData.Description" String="This is a reference to a collection of certificates used for the external account provider."/>
- <Annotation Term="OData.LongDescription" String="The value of this property shall be a link to a collection of type CertificateCollection."/>
+ <Annotation Term="OData.Description" String="The link to a collection of certificates that the external account provider uses."/>
+ <Annotation Term="OData.LongDescription" String="This property shall contain a link to a Resource Collection of certificates of the CertificateCollection type that the external account provider uses."/>
<Annotation Term="OData.AutoExpandReferences"/>
</NavigationProperty>
</ComplexType>
</Schema>
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_4_1">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to force the regeneration of JSON Schema so that URI properties use the uri-reference format. It also clarifies property descriptions in LDAPSearchSettings and adds a missing term to several properties to disallow them from being null."/>
+ <EntityType Name="AccountService" BaseType="AccountService.v1_4_0.AccountService"/>
+ </Schema>
+
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_4_2">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to update the description of the Password, Token, and KerberosKeytab properties. It was also created to clarify the usage of the LDAPService property."/>
+ <EntityType Name="AccountService" BaseType="AccountService.v1_4_1.AccountService"/>
+ </Schema>
+
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_5_0">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="Redfish.Release" String="2019.1"/>
+ <Annotation Term="OData.Description" String="This version was created to add the AccountLockoutCounterResetEnabled property, update the long descriptions of the AccountLockoutCounterResetAfter and AccountLockoutDuration properties, and deprecate the AccountProviderType property."/>
+
+ <EntityType Name="AccountService" BaseType="AccountService.v1_4_1.AccountService">
+ <Property Name="AccountLockoutCounterResetEnabled" Type="Edm.Boolean" Nullable="false">
+ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+ <Annotation Term="OData.Description" String="An indication of whether the threshold counter is reset after AccountLockoutCounterResetAfter expires. If `true`, it is reset. If `false`, only a successful login resets the threshold counter and if the user reaches the AccountLockoutThreshold limit, the account will be locked out indefinitely and only an administrator-issued reset clears the threshold counter. If this property is absent, the default is `true`."/>
+ <Annotation Term="OData.LongDescription" String="This property shall indicate whether the threshold counter is reset after the AccountLockoutCounterResetAfter expires. If `true`, it is reset. If `false`, only a successful login resets the threshold counter and if the user reaches the AccountLockoutThreshold limit, the account shall be locked out indefinitely and only an administrator-issued reset clears the threshold counter. If this property is absent, the default is `true`."/>
+ </Property>
+ </EntityType>
+ </Schema>
+
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_5_1">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to update the description of the Password, Token, and KerberosKeytab properties. It was also created to clarify the usage of the LDAPService property."/>
+ <EntityType Name="AccountService" BaseType="AccountService.v1_5_0.AccountService"/>
+ </Schema>
+
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_6_0">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="Redfish.Release" String="2019.2"/>
+ <Annotation Term="OData.Description" String="This version was created to add LocalFirst to the LocalAccountAuth enum."/>
+
+ <EntityType Name="AccountService" BaseType="AccountService.v1_5_1.AccountService"/>
+ </Schema>
+
</edmx:DataServices>
</edmx:Edmx>