Redfish: Changes in Oem schemas for dump
Implemented Oem schemas for extending LogService and
LogEntry
Signed-off-by: Asmitha Karunanithi <asmitk01@in.ibm.com>
Change-Id: I37d56b33403700ee65cd6ec7dee06395525d335c
diff --git a/static/redfish/v1/schema/OemLogEntry_v1.xml b/static/redfish/v1/schema/OemLogEntry_v1.xml
index facfd4f..d149e49 100644
--- a/static/redfish/v1/schema/OemLogEntry_v1.xml
+++ b/static/redfish/v1/schema/OemLogEntry_v1.xml
@@ -17,33 +17,50 @@
<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." />
- <Action Name="DownloadLog" IsBound="true">
- <Parameter Name="LogEntry" Type="LogEntry.v1_2_0.OemActions"/>
- <Annotation Term="OData.Description" String="The action to download the system dump log entry for this Log Service."/>
- <Annotation Term="OData.LongDescription" String="This action shall download system dump for this Log Service."/>
- </Action>
- <Property Name="SizeInB" Type="Edm.Int64">
+ <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 dump in bytes for the log entry if the entry type is `DUMP`."/>
- <Annotation Term="OData.LongDescription" String="This property shall contain the size in bytes for the log entry if the EntryType is `DUMP`."/>
+ <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 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>
- <EntityType Name="LogEntry" BaseType="Resource.OemObject" Abstract="true">
- <Annotation Term="OData.Description" String="OEM Extension for LogEntry"/>
- <Annotation Term="OData.LongDescription" String="OEM Extension of LogEntry for dump"/>
- </EntityType>
+ <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 Operation system(OS) diagnostic data."/>
+ </Member>
+ <Member Name="OEM">
+ <Annotation Term="OData.Description" String="Indicates OEM diagnostic data."/>
+ </Member>
+ </EnumType>
+
</Schema>
</edmx:DataServices>
diff --git a/static/redfish/v1/schema/OemLogService_v1.xml b/static/redfish/v1/schema/OemLogService_v1.xml
index 95f5e11..47b9404 100644
--- a/static/redfish/v1/schema/OemLogService_v1.xml
+++ b/static/redfish/v1/schema/OemLogService_v1.xml
@@ -4,51 +4,23 @@
<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 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"/>
- <ComplexType Name="OpenBmc" BaseType="Resource.OemObject">
- <Annotation Term="OData.AdditionalProperties" Bool="true"/>
- <Annotation Term="OData.Description" String="Oem properties for OpenBmc." />
- <Action Name="CreateLog" IsBound="true">
- <Parameter Name="LogService" Type="LogService.v1_0_0.OemActions"/>
- <Annotation Term="OData.Description" String="The action to create the log for this Log Service."/>
- <Annotation Term="OData.LongDescription" String="This action is used to trigger a new system dump."/>
- </Action>
- <Property Name="Type" Type="Edm.String">
- <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
- <Annotation Term="OData.Description" String="The entry type"/>
- <Annotation Term="OData.LongDescription" String="This property shall contain the EntryType is `Dump`."/>
- </Property>
- <Property Name="DumpType" Type="Edm.String">
- <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
- <Annotation Term="OData.Description" String="The dump entry type"/>
- <Annotation Term="OData.LongDescription" String="This property shall contain dump entry type."/>
- </Property>
- </ComplexType>
+ <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." />
+ </Action>
- <EntityType Name="LogService" BaseType="Resource.OemObject" Abstract="true">
- <Annotation Term="OData.Description" String="OEM Extension for LogService"/>
- <Annotation Term="OData.LongDescription" String="OEM Extension of LogService for dump"/>
- </EntityType>
</Schema>
</edmx:DataServices>