Update Redfish Schema to 2018.1

Change-Id: I4e5d5d49b4524c8a4d73ae0117fcf7e9aedfbb79
diff --git a/static/redfish/v1/schema/AccountService_v1.xml b/static/redfish/v1/schema/AccountService_v1.xml
old mode 100755
new mode 100644
index 1a28145..0d1b4ab
--- a/static/redfish/v1/schema/AccountService_v1.xml
+++ b/static/redfish/v1/schema/AccountService_v1.xml
@@ -1,153 +1,413 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!---->

-<!--################################################################################       -->

-<!--# Redfish Schema:  AccountService   v1.1.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-2016 Distributed Management Task Force, Inc. (DMTF).                  -->

-<!--# For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright -->

-<!--################################################################################       -->

-<!---->

-<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">

-

-  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">

-    <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>

-  </edmx:Reference>

-  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Measures.V1.xml">

-    <edmx:Include Namespace="Org.OData.Measures.V1" Alias="Measures"/>

-  </edmx:Reference>

-  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">

-    <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>

-  </edmx:Reference>

-  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">

-    <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>

-    <edmx:Include Namespace="Validation.v1_0_0" Alias="Validation"/>

-  </edmx:Reference>

-  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">

-    <edmx:Include Namespace="Resource"/>

-    <edmx:Include Namespace="Resource.v1_0_0"/>

-  </edmx:Reference>

-  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ManagerAccountCollection_v1.xml">

-    <edmx:Include Namespace="ManagerAccountCollection"/>

-  </edmx:Reference>

-  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RoleCollection_v1.xml">

-    <edmx:Include Namespace="RoleCollection"/>

-  </edmx:Reference>

-  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/PrivilegeRegistry_v1.xml">

-    <edmx:Include Namespace="PrivilegeRegistry"/>

-  </edmx:Reference>

-

-  <edmx:DataServices>

-

-    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService">

-

-      <EntityType Name="AccountService" BaseType="Resource.v1_0_0.Resource" Abstract="true">

-        <Annotation Term="OData.Description" String="Account Service contains properties common to all user accounts, such as password requirements, and control features such as account lockout.  It 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="Capabilities.InsertRestrictions">

-          <Record>

-            <PropertyValue Property="Insertable" Bool="false"/>

-          </Record>

-        </Annotation>

-        <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."/>

-          </Record>

-        </Annotation>

-        <Annotation Term="Capabilities.DeleteRestrictions">

-          <Record>

-            <PropertyValue Property="Deletable" Bool="false"/>

-          </Record>

-        </Annotation>

-      </EntityType>

-

-    </Schema>

-

-    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_0_0">

-

-      <EntityType Name="AccountService" BaseType="AccountService.AccountService">

-        <Property Name="Status" Type="Resource.Status" Nullable="false"/>

-        <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."/>

-        </Property>

-        <Property Name="AuthFailureLoggingThreshold" Type="Edm.Int64" Nullable="false">

-          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>

-          <Annotation Term="OData.Description" String="This is the number of authorization failures that need to occur 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="Validation.Minimum" Int="0"/>

-        </Property>

-        <Property Name="MinPasswordLength" Type="Edm.Int16" Nullable="false">

-          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>

-          <Annotation Term="OData.Description" String="This is 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="Validation.Minimum" Int="0"/>

-        </Property>

-        <Property Name="MaxPasswordLength" Type="Edm.Int16" Nullable="false">

-          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>

-          <Annotation Term="OData.Description" String="This is 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="Validation.Minimum" Int="0"/>

-        </Property>

-        <Property Name="AccountLockoutThreshold" Type="Edm.Int16" Nullable="true">

-          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>

-          <Annotation Term="OData.Description" String="The number of failed login attempts before a user account is locked for a specified duration (0=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="Validation.Minimum" Int="0"/>

-        </Property>

-        <Property Name="AccountLockoutDuration" Type="Edm.Int32" Nullable="true">

-          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>

-          <Annotation Term="OData.Description" String="The time in seconds an account is locked after the account lockout threshold is met. Must be >= AccountLockoutResetAfter. If set to 0, no lockout will occur."/>

-          <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="Validation.Minimum" Int="0"/>

-          <Annotation Term="Measures.Unit" String="s"/>

-        </Property>

-        <Property Name="AccountLockoutCounterResetAfter" Type="Edm.Int32" Nullable="false">

-          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>

-          <Annotation Term="OData.Description" String="The interval of time in seconds since the last failed login attempt at which point the lockout threshold counter for the account is reset to zero. Must be less than or equal to AccountLockoutDuration."/>

-          <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="Validation.Minimum" Int="0"/>

-          <Annotation Term="Measures.Unit" String="s"/>

-        </Property>

-        <NavigationProperty Name="Accounts" Type="ManagerAccountCollection.ManagerAccountCollection" Nullable="false">

-          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>

-          <Annotation Term="OData.Description" String="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.AutoExpandReferences"/>

-        </NavigationProperty>

-        <NavigationProperty Name="Roles" Type="RoleCollection.RoleCollection" Nullable="false">

-          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>

-          <Annotation Term="OData.Description" String="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.AutoExpandReferences"/>

-        </NavigationProperty>

-      </EntityType>

-

-    </Schema>

-

-    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_0_2">

-      <Annotation Term="OData.Description" String="This version was created to show annotations in previous namespaces were updated."/>

-      <EntityType Name="AccountService" BaseType="AccountService.v1_0_0.AccountService"/>

-    </Schema>

-

-    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_0_3">

-      <Annotation Term="OData.Description" String="This version was created to add explicit Permissions annotations to all properties for clarity."/>

-      <EntityType Name="AccountService" BaseType="AccountService.v1_0_2.AccountService"/>

-    </Schema>

-

-    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_1_0">

-      <EntityType Name="AccountService" BaseType="AccountService.v1_0_3.AccountService">

-        <NavigationProperty Name="PrivilegeMap" Type="PrivilegeRegistry.PrivilegeRegistry" Nullable="false">

-          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>

-          <Annotation Term="OData.Description" String="A reference to the Privilege mapping defining 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.AutoExpandReferences"/>

-        </NavigationProperty>

-      </EntityType>

-    </Schema>

-

-  </edmx:DataServices>

-</edmx:Edmx>

+<?xml version="1.0" encoding="UTF-8"?>
+<!---->
+<!--################################################################################       -->
+<!--# Redfish Schema:  AccountService   v1.3.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 Distributed Management Task Force, Inc. (DMTF).                  -->
+<!--# For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright -->
+<!--################################################################################       -->
+<!---->
+<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
+
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
+    <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Measures.V1.xml">
+    <edmx:Include Namespace="Org.OData.Measures.V1" Alias="Measures"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+    <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+    <edmx:Include Namespace="Validation.v1_0_0" Alias="Validation"/>
+    <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
+    <edmx:Include Namespace="Resource"/>
+    <edmx:Include Namespace="Resource.v1_0_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ManagerAccountCollection_v1.xml">
+    <edmx:Include Namespace="ManagerAccountCollection"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RoleCollection_v1.xml">
+    <edmx:Include Namespace="RoleCollection"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/PrivilegeRegistry_v1.xml">
+    <edmx:Include Namespace="PrivilegeRegistry"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ExternalAccountProviderCollection_v1.xml">
+    <edmx:Include Namespace="ExternalAccountProviderCollection"/>
+  </edmx:Reference>
+
+  <edmx:DataServices>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService">
+      <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="Capabilities.InsertRestrictions">
+          <Record>
+            <PropertyValue Property="Insertable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <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."/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="false"/>
+          </Record>
+        </Annotation>
+      </EntityType>
+
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_0_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+
+      <EntityType Name="AccountService" BaseType="AccountService.AccountService">
+        <Property Name="Status" Type="Resource.Status" Nullable="false"/>
+        <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."/>
+        </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="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="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="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="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="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="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.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.AutoExpandReferences"/>
+        </NavigationProperty>
+      </EntityType>
+
+    </Schema>
+
+    <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."/>
+      <EntityType Name="AccountService" BaseType="AccountService.v1_0_0.AccountService"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_0_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add explicit Permissions annotations to all properties for clarity."/>
+      <EntityType Name="AccountService" BaseType="AccountService.v1_0_2.AccountService"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_0_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix supported types."/>
+      <EntityType Name="AccountService" BaseType="AccountService.v1_0_3.AccountService"/>
+    </Schema>
+
+    <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."/>
+      <EntityType Name="AccountService" BaseType="AccountService.v1_0_4.AccountService"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_1_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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.AutoExpandReferences"/>
+        </NavigationProperty>
+      </EntityType>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_1_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix supported types."/>
+      <EntityType Name="AccountService" BaseType="AccountService.v1_1_0.AccountService"/>
+    </Schema>
+
+    <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."/>
+      <EntityType Name="AccountService" BaseType="AccountService.v1_1_1.AccountService"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_2_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+        </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."/>
+        <Property Name="Oem" Type="AccountService.v1_2_0.OemActions" Nullable="false"/>
+      </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."/>
+      </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."/>
+      <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."/>
+      <EntityType Name="AccountService" BaseType="AccountService.v1_2_1.AccountService"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_3_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+
+      <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."/>
+        </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."/>
+        </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."/>
+        </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."/>
+        </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."/>
+        </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."/>
+        </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."/>
+        </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."/>
+        <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."/>
+        </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."/>
+        </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."/>
+        </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>
+        <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>
+        <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."/>
+        </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."/>
+        </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."/>
+        </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."/>
+        </Member>
+        <Member Name="OEM">
+          <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."/>
+        <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."/>
+        </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."/>
+        </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."/>
+        </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."/>
+        </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."/>
+        </Property>
+        <Property Name="Oem" Type="Resource.Oem" Nullable="false"/>
+      </ComplexType>
+
+      <EnumType Name="AuthenticationTypes">
+        <Member Name="Token">
+          <Annotation Term="OData.Description" String="An opaque authentication token."/>
+        </Member>
+        <Member Name="KerberosKeytab">
+          <Annotation Term="OData.Description" String="A kerberos keytab."/>
+        </Member>
+        <Member Name="UsernameAndPassword">
+          <Annotation Term="OData.Description" String="Username and password combination."/>
+        </Member>
+        <Member Name="OEM">
+          <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."/>
+        </Property>
+        <Property Name="Oem" Type="Resource.Oem" Nullable="false"/>
+      </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."/>
+        <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."/>
+        </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."/>
+        </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."/>
+        </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."/>
+        </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."/>
+        <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."/>
+        </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."/>
+        </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."/>
+        </Property>
+        <Property Name="Oem" Type="Resource.Oem" Nullable="false"/>
+      </ComplexType>
+
+    </Schema>
+
+  </edmx:DataServices>
+</edmx:Edmx>