From 40e7fea29c31dc16b31119986b0a4adc06f7e52f Mon Sep 17 00:00:00 2001
From: Asmitha Karunanithi <asmitk01@in.ibm.com>
Date: Mon, 22 Jun 2020 03:40:15 -0500
Subject: Redfish: Minor changes in the Oem schemas for dump

In this commit, CollectDiagnisticData action in
OemLogService schema is updated with two parameters.

It also includes dereferencing the unused namespace
in metadata xml file.

Tested-By:
Redfish Validator - Passed

Signed-off-by: Asmitha Karunanithi <asmitk01@in.ibm.com>
Change-Id: I093ddaef9fa786767b2853e235571a4664ee759c
---
 static/redfish/v1/schema/OemLogEntry_v1.xml   |  4 ++--
 static/redfish/v1/schema/OemLogService_v1.xml | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

(limited to 'static/redfish/v1/schema')

diff --git a/static/redfish/v1/schema/OemLogEntry_v1.xml b/static/redfish/v1/schema/OemLogEntry_v1.xml
index 2bee4f53c0..de571381e9 100644
--- a/static/redfish/v1/schema/OemLogEntry_v1.xml
+++ b/static/redfish/v1/schema/OemLogEntry_v1.xml
@@ -31,7 +31,7 @@
             <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 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"/>
@@ -58,7 +58,7 @@
           <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."/>
+          <Annotation Term="OData.Description" String="Indicates Operating system(OS) diagnostic data."/>
         </Member>
         <Member Name="OEM">
           <Annotation Term="OData.Description" String="Indicates OEM diagnostic data."/>
diff --git a/static/redfish/v1/schema/OemLogService_v1.xml b/static/redfish/v1/schema/OemLogService_v1.xml
index 6f59ea0a43..d76db2af5f 100644
--- a/static/redfish/v1/schema/OemLogService_v1.xml
+++ b/static/redfish/v1/schema/OemLogService_v1.xml
@@ -23,8 +23,32 @@
         <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>
-- 
cgit v1.2.3