diff options
author | Asmitha Karunanithi <asmitk01@in.ibm.com> | 2020-09-21 18:34:02 +0300 |
---|---|---|
committer | Asmitha Karunanithi <asmitk01@in.ibm.com> | 2020-09-27 11:15:45 +0300 |
commit | d337bb7249e6791d7fc3769e3d8e1ed64c563608 (patch) | |
tree | cce6fc703d768cc65a628be6e6ba58e795e2247d /static/redfish | |
parent | 50626f4f1aaa02daae058617ce0c603874277322 (diff) | |
download | bmcweb-d337bb7249e6791d7fc3769e3d8e1ed64c563608.tar.xz |
Remove OEM schemas and related code for Dump LogServices
In this commit, Oem schemas for Dump LogServices are removed
as per the latest Redfish schemas. Also, the code is changed
w.r.t the latest schema changes.
Redfish Validator Passed.
Signed-off-by: Asmitha Karunanithi <asmitk01@in.ibm.com>
Change-Id: I12c8d283cd54c32e71a2b11857e7c4cce89b9f0a
Diffstat (limited to 'static/redfish')
-rw-r--r-- | static/redfish/v1/$metadata/index.xml | 8 | ||||
-rw-r--r-- | static/redfish/v1/JsonSchemas/OemLogEntry/index.json | 86 | ||||
-rw-r--r-- | static/redfish/v1/JsonSchemas/OemLogService/index.json | 95 | ||||
-rw-r--r-- | static/redfish/v1/schema/OemLogEntry_v1.xml | 72 | ||||
-rw-r--r-- | static/redfish/v1/schema/OemLogService_v1.xml | 56 |
5 files changed, 0 insertions, 317 deletions
diff --git a/static/redfish/v1/$metadata/index.xml b/static/redfish/v1/$metadata/index.xml index 0a3d8789c4..e7f9d6db60 100644 --- a/static/redfish/v1/$metadata/index.xml +++ b/static/redfish/v1/$metadata/index.xml @@ -2714,14 +2714,6 @@ <edmx:Include Namespace="OemAccountService"/> <edmx:Include Namespace="OemAccountService.v1_0_0"/> </edmx:Reference> - <edmx:Reference Uri="/redfish/v1/schema/OemLogService_v1.xml"> - <edmx:Include Namespace="OemLogService"/> - <edmx:Include Namespace="OemLogService.v1_0_0"/> - </edmx:Reference> - <edmx:Reference Uri="/redfish/v1/schema/OemLogEntry_v1.xml"> - <edmx:Include Namespace="OemLogEntry"/> - <edmx:Include Namespace="OemLogEntry.v1_0_0"/> - </edmx:Reference> <edmx:Reference Uri="/redfish/v1/schema/OemSession_v1.xml"> <edmx:Include Namespace="OemSession"/> <edmx:Include Namespace="OemSession.v1_0_0"/> diff --git a/static/redfish/v1/JsonSchemas/OemLogEntry/index.json b/static/redfish/v1/JsonSchemas/OemLogEntry/index.json deleted file mode 100644 index b38ac51b91..0000000000 --- a/static/redfish/v1/JsonSchemas/OemLogEntry/index.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "$id": "http://redfish.dmtf.org/schemas/v1/OemLogEntry.v1_0_0.json", - "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema.v1_2_0.json", - "copyright": "Copyright 2014-2017 Distributed Management Task Force, Inc. (DMTF). For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright", - "definitions": { - "DiagnosticDataType": { - "enum": [ - "Manager", - "PreOS", - "OS", - "OEM" - ], - "enumDescriptions": { - "Manager": "Indicates Manager diagnostic data.", - "OEM": "Indicates OEM diagnostic data.", - "OS": "Indicates Operating system(OS) diagnostic data.", - "PreOS": "Indicates Pre-OS diagnostic data." - }, - "type": "string" - }, - "OpenBmc": { - "additionalProperties": true, - "description": "Oem properties for OpenBmc.", - "patternProperties": { - "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": { - "description": "This property shall specify a valid odata or Redfish property.", - "type": [ - "array", - "boolean", - "integer", - "number", - "null", - "object", - "string" - ] - } - }, - "properties": { - "AdditionalDataSizeBytes": { - "description": "The size of diagnostic data in bytes for the log entry if the entry type is `DUMP`.", - "longDescription": "This property shall contain the size of diagnostic data in bytes for the log entry if the entry type is `DUMP`.", - "readonly": true, - "type": [ - "integer", - "null" - ] - }, - "AdditionalDataURI": { - "description": "The offload URI of the diagnostic data if the entry type is `DUMP`.", - "longDescription": "This property shall contain the offload URI of the diagnostic data if the entry type is `DUMP`.", - "readonly": true, - "type": [ - "string", - "null" - ] - }, - "DiagnosticDataType": { - "anyOf": [ - { - "$ref": "#/definitions/DiagnosticDataType" - }, - { - "type": "null" - } - ], - "description": "The type of diagnostic data entry", - "longDescription": "This property shall contain the type of diagnostic data entry.", - "readonly": true - }, - "OEMDiagnosticDataType": { - "description": "The OEM type of diagnostic data entry", - "longDescription": "This property shall contain the OEM type of diagnostic data entry.", - "readonly": true, - "type": [ - "string", - "null" - ] - } - }, - "type": "object" - } - }, - "owningEntity": "OpenBMC", - "release": "1.0", - "title": "#OemLogEntry.v1_0_0" -} diff --git a/static/redfish/v1/JsonSchemas/OemLogService/index.json b/static/redfish/v1/JsonSchemas/OemLogService/index.json deleted file mode 100644 index 5a9ba086d7..0000000000 --- a/static/redfish/v1/JsonSchemas/OemLogService/index.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "$id": "http://redfish.dmtf.org/schemas/v1/OemLogService.v1_0_0.json", - "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema.v1_2_0.json", - "copyright": "Copyright 2014-2017 Distributed Management Task Force, Inc. (DMTF). For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright", - "definitions": { - "Actions": { - "additionalProperties": false, - "patternProperties": { - "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": { - "description": "This property shall specify a valid odata or Redfish property.", - "type": [ - "array", - "boolean", - "integer", - "number", - "null", - "object", - "string" - ] - } - }, - "properties": { - "#OemLogService.CollectDiagnosticData": { - "$ref": "#/definitions/CollectDiagnosticData" - } - }, - "type": "object" - }, - "CollectDiagnosticData": { - "additionalProperties": false, - "description": "This action is used to trigger the creation of a dump.", - "longDescription": "This action is used to trigger the creation of a dump.", - "parameters": { - "DiagnosticDataType": { - "$ref": "#/definitions/DiagnosticDataType", - "description": "The type of diagnostic data entry", - "longDescription": "This property shall contain the type of diagnostic data entry.", - "readonly": true, - "requiredParameter": true - }, - "OEMDiagnosticDataType": { - "description": "The OEM type of diagnostic data entry", - "longDescription": "This property shall contain the OEM type of diagnostic data entry.", - "readonly": true, - "requiredParameter": true, - "type": "string" - } - }, - "patternProperties": { - "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": { - "description": "This property shall specify a valid odata or Redfish property.", - "type": [ - "array", - "boolean", - "integer", - "number", - "null", - "object", - "string" - ] - } - }, - "properties": { - "target": { - "description": "Link to invoke action", - "format": "uri-reference", - "type": "string" - }, - "title": { - "description": "Friendly action name", - "type": "string" - } - }, - "type": "object" - }, - "DiagnosticDataType": { - "enum": [ - "Manager", - "PreOS", - "OS", - "OEM" - ], - "enumDescriptions": { - "Manager": "Indicates Manager diagnostic data.", - "OEM": "Indicates OEM diagnostic data.", - "OS": "Indicates Operating system(OS) diagnostic data.", - "PreOS": "Indicates Pre-OS diagnostic data." - }, - "type": "string" - } - }, - "owningEntity": "OpenBMC", - "release": "1.0", - "title": "#OemLogService.v1_0_0" -} diff --git a/static/redfish/v1/schema/OemLogEntry_v1.xml b/static/redfish/v1/schema/OemLogEntry_v1.xml deleted file mode 100644 index de571381e9..0000000000 --- a/static/redfish/v1/schema/OemLogEntry_v1.xml +++ /dev/null @@ -1,72 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml"> - <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:DataServices> - - <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="OemLogEntry"> - <Annotation Term="Redfish.OwningEntity" String="OpenBMC"/> - </Schema> - - <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="OemLogEntry.v1_0_0"> - <Annotation Term="Redfish.OwningEntity" String="OpenBMC"/> - <Annotation Term="Redfish.Release" String="1.0"/> - - <ComplexType Name="OpenBmc" BaseType="Resource.OemObject"> - <Annotation Term="OData.AdditionalProperties" Bool="true"/> - <Annotation Term="OData.Description" String="Oem properties for OpenBmc."/> - <Property Name="AdditionalDataSizeBytes" Type="Edm.Int64"> - <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> - <Annotation Term="OData.Description" String="The size of diagnostic data in bytes for the log entry if the entry type is `DUMP`."/> - <Annotation Term="OData.LongDescription" String="This property shall contain the size of diagnostic data in bytes for the log entry if the entry type is `DUMP`."/> - </Property> - <Property Name="AdditionalDataURI" Type="Edm.String"> - <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> - <Annotation Term="OData.Description" String="The offload URI of the diagnostic data if the entry type is `DUMP`."/> - <Annotation Term="OData.LongDescription" String="This property shall contain the offload URI of the diagnostic data if the entry type is `DUMP`."/> - </Property> - <Property Name="DiagnosticDataType" Type="OemLogEntry.v1_0_0.DiagnosticDataType"> - <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> - <Annotation Term="OData.Description" String="The type of diagnostic data entry"/> - <Annotation Term="OData.LongDescription" String="This property shall contain the type of diagnostic data entry."/> - </Property> - <Property Name="OEMDiagnosticDataType" Type="Edm.String"> - <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> - <Annotation Term="OData.Description" String="The OEM type of diagnostic data entry"/> - <Annotation Term="OData.LongDescription" String="This property shall contain the OEM type of diagnostic data entry."/> - </Property> - </ComplexType> - - <EnumType Name="DiagnosticDataType"> - <Member Name="Manager"> - <Annotation Term="OData.Description" String="Indicates Manager diagnostic data."/> - </Member> - <Member Name="PreOS"> - <Annotation Term="OData.Description" String="Indicates Pre-OS diagnostic data."/> - </Member> - <Member Name="OS"> - <Annotation Term="OData.Description" String="Indicates Operating system(OS) diagnostic data."/> - </Member> - <Member Name="OEM"> - <Annotation Term="OData.Description" String="Indicates OEM diagnostic data."/> - </Member> - </EnumType> - - </Schema> - - </edmx:DataServices> -</edmx:Edmx> - diff --git a/static/redfish/v1/schema/OemLogService_v1.xml b/static/redfish/v1/schema/OemLogService_v1.xml deleted file mode 100644 index d76db2af5f..0000000000 --- a/static/redfish/v1/schema/OemLogService_v1.xml +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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/LogService_v1.xml"> - <edmx:Include Namespace="LogService"/> - <edmx:Include Namespace="LogService.v1_0_0"/> - </edmx:Reference> - - <edmx:DataServices> - - <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="OemLogService"> - <Annotation Term="Redfish.OwningEntity" String="OpenBMC"/> - </Schema> - - <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="OemLogService.v1_0_0"> - <Annotation Term="Redfish.OwningEntity" String="OpenBMC"/> - <Annotation Term="Redfish.Release" String="1.0"/> - - <Action Name="CollectDiagnosticData" IsBound="true"> - <Parameter Name="OemLogService" Type="LogService.v1_0_0.OemActions"/> - <Annotation Term="OData.Description" String="This action is used to trigger the creation of a dump." /> - <Annotation Term="OData.LongDescription" String="This action is used to trigger the creation of a dump." /> - <Parameter Name="DiagnosticDataType" Type="OemLogService.v1_0_0.DiagnosticDataType" Nullable="false"> - <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> - <Annotation Term="OData.Description" String="The type of diagnostic data entry"/> - <Annotation Term="OData.LongDescription" String="This property shall contain the type of diagnostic data entry."/> - </Parameter> - <Parameter Name="OEMDiagnosticDataType" Type="Edm.String" Nullable="false"> - <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> - <Annotation Term="OData.Description" String="The OEM type of diagnostic data entry"/> - <Annotation Term="OData.LongDescription" String="This property shall contain the OEM type of diagnostic data entry."/> - </Parameter> - </Action> - - <EnumType Name="DiagnosticDataType"> - <Member Name="Manager"> - <Annotation Term="OData.Description" String="Indicates Manager diagnostic data."/> - </Member> - <Member Name="PreOS"> - <Annotation Term="OData.Description" String="Indicates Pre-OS diagnostic data."/> - </Member> - <Member Name="OS"> - <Annotation Term="OData.Description" String="Indicates Operating system(OS) diagnostic data."/> - </Member> - <Member Name="OEM"> - <Annotation Term="OData.Description" String="Indicates OEM diagnostic data."/> - </Member> - </EnumType> - </Schema> - - </edmx:DataServices> -</edmx:Edmx> - |