diff options
| author | Ed Tanous <edtanous@google.com> | 2022-09-27 05:53:36 +0300 |
|---|---|---|
| committer | Ed Tanous <ed@tanous.net> | 2023-02-08 02:15:15 +0300 |
| commit | 5b5574ace856c7f787528ab8f5e5352a90f2a6cb (patch) | |
| tree | aedf147dd8d61ce7f201526181525bc4ad212e6a /static | |
| parent | 353163e99b8394e98adae000c72abc0578ec1459 (diff) | |
| download | bmcweb-5b5574ace856c7f787528ab8f5e5352a90f2a6cb.tar.xz | |
Fix OemAccountService schema
This schema as-written broke a bunch of Redfish specification rules for
schemas, naming and other things. This commit starts to fix them.
It can be used as a starting point for fixing the existing schemas.
This working through testing.
Tested: OpenBMCAccountService_v1.xml now passes the redfish odata schema
validator.
Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: Id991794344b8b7d36af3c44bba7214bf025deec8
Diffstat (limited to 'static')
| -rw-r--r-- | static/redfish/v1/schema/OpenBMCAccountService_v1.xml (renamed from static/redfish/v1/schema/OemAccountService_v1.xml) | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/static/redfish/v1/schema/OemAccountService_v1.xml b/static/redfish/v1/schema/OpenBMCAccountService_v1.xml index 7d58b2baa0..66b00bbc32 100644 --- a/static/redfish/v1/schema/OemAccountService_v1.xml +++ b/static/redfish/v1/schema/OpenBMCAccountService_v1.xml @@ -17,15 +17,30 @@ <edmx:DataServices> - <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="OemAccountService"> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="OpenBMCAccountService"> <Annotation Term="Redfish.OwningEntity" String="OpenBMC"/> + <Annotation Term="OData.Description" String="OpenBMC extensions to the standard account service."/> + <Annotation Term="Redfish.Uris"> + <Collection> + <String>/redfish/v1/AccountService#/OpenBMCAccountService</String> + </Collection> + </Annotation> </Schema> - <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="OemAccountService.v1_0_0"> + <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="OpenBMCAccountService.v1_0_0"> <Annotation Term="Redfish.OwningEntity" String="OpenBMC"/> - <Annotation Term="Redfish.Release" String="1.0"/> - <ComplexType Name="AuthMethodsConfig" BaseType="Resource.OemObject"> + <ComplexType Name="AccountService" BaseType="Resource.OemObject"> + <Annotation Term="OData.Description" String="OpenBMC OEM Extension for AccountService."/> + <Annotation Term="OData.LongDescription" String="OpenBMC OEM Extension for AccountService providing info about authentication methods."/> + + <Property Name="AuthMethods" Type="OpenBMCAccountService.v1_0_0.AuthMethodsConfig"> + <Annotation Term="OData.Description" String="Authorization Methods configuration."/> + <Annotation Term="OData.LongDescription" String="Configuration describing which auth methods are enabled."/> + </Property> + </ComplexType> + + <ComplexType Name="AuthMethodsConfig"> <Annotation Term="OData.AdditionalProperties" Bool="false"/> <Annotation Term="OData.Description" String="Authorization Methods configuration."/> <Annotation Term="OData.LongDescription" String="Configuration describing which auth methods are enabled."/> @@ -61,17 +76,8 @@ </Property> </ComplexType> - <!--Base entity type for array members--> - <EntityType Name="AccountService" BaseType="Resource.OemObject" Abstract="true"> - <Annotation Term="OData.Description" String="OEM Extension for AccountService"/> - <Annotation Term="OData.LongDescription" String="OEM Extension for AccountService providing info about TLS Auth."/> - - <Property Name="AuthMethods" Type="OemAccountService.v1_0_0.AuthMethodsConfig"> - <Annotation Term="OData.Description" String="Authorization Methods configuration."/> - <Annotation Term="OData.LongDescription" String="Configuration describing which auth methods are enabled."/> - </Property> - </EntityType> </Schema> </edmx:DataServices> </edmx:Edmx> + |