Add Privileges schema to allow list
The allow list should contain all schemas implemented by bmcweb.
The allow list was missing the Privileges schema. The Privileges schema
is referenced in the Role schema here:
"AssignedPrivileges": {
"description": "The Redfish privileges for this role.",
"items": {
"$ref": "http://redfish.dmtf.org/schemas/v1/Privileges.json#/definitions/PrivilegeType"
https://redfish.dmtf.org/schemas/v1/Role.v1_3_1.json
In OpenBMC CI Redfish Validator testing the following error was hit 3
times:
ERROR - ConnectionError on http://redfish.dmtf.org/schemas/v1/Privileges_v1.xml:
ConnectionError(ProtocolError('Connection aborted.',
RemoteDisconnected('Remote end closed connection without response')))
Network glitch somewhere but inspired this change.
Long term not sure if the allow list makes sense. While still used today
(and for the immediate future) it should attempt to accurately reflect
the implemented schemas in bmcweb.
The allow list was added in 349a2ac3 to save space.
Information on the CI Redfish Validator testing can be found at
https://github.com/openbmc/openbmc-test-automation/search?q=Redfish-Service-Validator
The test redownloads the schemas each time.
Tested: Validator passed.
See the new schema:
{
"@odata.id": "/redfish/v1/JsonSchemas/Privileges"
},
Change-Id: Iaf3de36b211efab4115a17fd43f0263b8bd3107f
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
diff --git a/static/redfish/v1/$metadata/index.xml b/static/redfish/v1/$metadata/index.xml
index 3fc3b03..eba38bf 100644
--- a/static/redfish/v1/$metadata/index.xml
+++ b/static/redfish/v1/$metadata/index.xml
@@ -1541,6 +1541,14 @@
<edmx:Include Namespace="Power.v1_7_0"/>
<edmx:Include Namespace="Power.v1_7_1"/>
</edmx:Reference>
+ <edmx:Reference Uri="/redfish/v1/schema/Privileges_v1.xml">
+ <edmx:Include Namespace="Privileges"/>
+ <edmx:Include Namespace="Privileges.v1_0_0"/>
+ <edmx:Include Namespace="Privileges.v1_0_2"/>
+ <edmx:Include Namespace="Privileges.v1_0_3"/>
+ <edmx:Include Namespace="Privileges.v1_0_4"/>
+ <edmx:Include Namespace="Privileges.v1_0_5"/>
+ </edmx:Reference>
<edmx:Reference Uri="/redfish/v1/schema/Processor_v1.xml">
<edmx:Include Namespace="Processor"/>
<edmx:Include Namespace="Processor.v1_0_0"/>
diff --git a/static/redfish/v1/JsonSchemas/Privileges/Privileges.json b/static/redfish/v1/JsonSchemas/Privileges/Privileges.json
new file mode 100644
index 0000000..56e88ec
--- /dev/null
+++ b/static/redfish/v1/JsonSchemas/Privileges/Privileges.json
@@ -0,0 +1,9 @@
+{
+ "$id": "http://redfish.dmtf.org/schemas/v1/Privileges.v1_0_5.json",
+ "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
+ "copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+ "definitions": {},
+ "owningEntity": "DMTF",
+ "release": "1.0",
+ "title": "#Privileges.v1_0_5"
+}
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Privileges/index.json b/static/redfish/v1/JsonSchemas/Privileges/index.json
new file mode 100644
index 0000000..b2e2e7a
--- /dev/null
+++ b/static/redfish/v1/JsonSchemas/Privileges/index.json
@@ -0,0 +1,21 @@
+{
+ "@odata.context": "/redfish/v1/$metadata#JsonSchemaFile.JsonSchemaFile",
+ "@odata.id": "/redfish/v1/JsonSchemas/Privileges",
+ "@odata.type": "#JsonSchemaFile.v1_0_2.JsonSchemaFile",
+ "Name": "Privileges Schema File",
+ "Schema": "#Privileges.Privileges",
+ "Description": "Privileges Schema File Location",
+ "Id": "Privileges",
+ "Languages": [
+ "en"
+ ],
+ "Languages@odata.count": 1,
+ "Location": [
+ {
+ "Language": "en",
+ "PublicationUri": "http://redfish.dmtf.org/schemas/v1/Privileges.json",
+ "Uri": "/redfish/v1/JsonSchemas/Privileges/Privileges.json"
+ }
+ ],
+ "Location@odata.count": 1
+}
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/index.json b/static/redfish/v1/JsonSchemas/index.json
index 48ea318..86c5342 100644
--- a/static/redfish/v1/JsonSchemas/index.json
+++ b/static/redfish/v1/JsonSchemas/index.json
@@ -4,7 +4,7 @@
"@odata.type": "#JsonSchemaFileCollection.JsonSchemaFileCollection",
"Name": "JsonSchemaFile Collection",
"Description": "Collection of JsonSchemaFiles",
- "Members@odata.count": 56,
+ "Members@odata.count": 57,
"Members": [
{
"@odata.id": "/redfish/v1/JsonSchemas/AccountService"
@@ -106,6 +106,9 @@
"@odata.id": "/redfish/v1/JsonSchemas/Power"
},
{
+ "@odata.id": "/redfish/v1/JsonSchemas/Privileges"
+ },
+ {
"@odata.id": "/redfish/v1/JsonSchemas/Processor"
},
{
diff --git a/static/redfish/v1/schema/Privileges_v1.xml b/static/redfish/v1/schema/Privileges_v1.xml
new file mode 100644
index 0000000..e2dfade
--- /dev/null
+++ b/static/redfish/v1/schema/Privileges_v1.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!---->
+<!--################################################################################ -->
+<!--# Redfish Schema: Privileges v1.0.5 -->
+<!--# -->
+<!--# For a detailed change log, see the README file contained in the DSP8010 bundle, -->
+<!--# available at http://www.dmtf.org/standards/redfish -->
+<!--# Copyright 2014-2021 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://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+ <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+ </edmx:Reference>
+
+ <edmx:DataServices>
+
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Privileges">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+
+ <EnumType Name="PrivilegeType">
+ <Member Name="Login">
+ <Annotation Term="OData.Description" String="Can log in to the service and read Resources."/>
+ </Member>
+ <Member Name="ConfigureManager">
+ <Annotation Term="OData.Description" String="Can configure managers."/>
+ </Member>
+ <Member Name="ConfigureUsers">
+ <Annotation Term="OData.Description" String="Can configure users and their accounts."/>
+ </Member>
+ <Member Name="ConfigureSelf">
+ <Annotation Term="OData.Description" String="Can change the password for the current user account and log out of their own sessions."/>
+ </Member>
+ <Member Name="ConfigureComponents">
+ <Annotation Term="OData.Description" String="Can configure components that this service manages."/>
+ </Member>
+ <Member Name="NoAuth">
+ <Annotation Term="OData.Description" String="Authentication is not required."/>
+ <Annotation Term="OData.LongDescription" String="This value shall be used to indicate an operation does not require authentication. This privilege shall not be used in Redfish Roles."/>
+ <Annotation Term="Redfish.Revisions">
+ <Collection>
+ <Record>
+ <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+ <PropertyValue Property="Version" String="2019.3"/>
+ </Record>
+ </Collection>
+ </Annotation>
+ </Member>
+ <Member Name="ConfigureCompositionInfrastructure">
+ <Annotation Term="OData.Description" String="Can view and configure composition service resources."/>
+ <Annotation Term="OData.LongDescription" String="This value shall be used to indicate the user can view and configure composition service resources without matching the Client property in the ResourceBlock or CompositionReservation resources."/>
+ <Annotation Term="Redfish.Revisions">
+ <Collection>
+ <Record>
+ <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+ <PropertyValue Property="Version" String="2021.1"/>
+ </Record>
+ </Collection>
+ </Annotation>
+ </Member>
+ </EnumType>
+ </Schema>
+
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Privileges.v1_0_0">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="Redfish.Release" String="1.0"/>
+
+ <Term Name="OemGetPrivileges" Type="Collection(Edm.String)" Nullable="false">
+ <Annotation Term="OData.Description" String="OEM HTTP GET operation privileges might be defined on a Link element to provide read privileges for the referenced resources, or on individual elements to override the privileges for that element."/>
+ </Term>
+ <Term Name="OemPostPrivileges" Type="Collection(Edm.String)" Nullable="false">
+ <Annotation Term="OData.Description" String="OEM HTTP POST operation privileges might be defined on a Link element to provide create privileges for the referenced resources, or on individual elements to override the privileges for that element."/>
+ </Term>
+ <Term Name="OemPatchPutPrivileges" Type="Collection(Edm.String)" Nullable="false">
+ <Annotation Term="OData.Description" String="OEM HTTP PATCH/PUT operation privileges might be defined on a Link element to provide update privileges for the referenced resources, or on individual elements to override the privileges for that element."/>
+ </Term>
+ <Term Name="OemDeletePrivileges" Type="Collection(Edm.String)" Nullable="false">
+ <Annotation Term="OData.Description" String="OEM HTTP DELETE operation privileges might be defined on a Link element to provide update privileges for the referenced resources, or on individual elements to override the privileges for that element."/>
+ </Term>
+ </Schema>
+
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Privileges.v1_0_2">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to show that annotations in previous namespaces were updated."/>
+ </Schema>
+
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Privileges.v1_0_3">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to show that annotations in previous namespaces were updated."/>
+ </Schema>
+
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Privileges.v1_0_4">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version deprecates the versioned PrivilegeType definition to use an unversioned definition."/>
+ </Schema>
+
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Privileges.v1_0_5">
+ <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+ <Annotation Term="OData.Description" String="This version was created to update descriptions that this schema defines."/>
+ </Schema>
+
+ </edmx:DataServices>
+</edmx:Edmx>