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
diff --git a/static/redfish/v1/JsonSchemas/OemLogEntry/index.json b/static/redfish/v1/JsonSchemas/OemLogEntry/index.json
index 31756d0..b38ac51 100644
--- a/static/redfish/v1/JsonSchemas/OemLogEntry/index.json
+++ b/static/redfish/v1/JsonSchemas/OemLogEntry/index.json
@@ -13,7 +13,7 @@
"enumDescriptions": {
"Manager": "Indicates Manager diagnostic data.",
"OEM": "Indicates OEM diagnostic data.",
- "OS": "Indicates Operation system(OS) diagnostic data.",
+ "OS": "Indicates Operating system(OS) diagnostic data.",
"PreOS": "Indicates Pre-OS diagnostic data."
},
"type": "string"
@@ -38,7 +38,7 @@
"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 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",
@@ -83,4 +83,4 @@
"owningEntity": "OpenBMC",
"release": "1.0",
"title": "#OemLogEntry.v1_0_0"
-}
\ No newline at end of file
+}
diff --git a/static/redfish/v1/JsonSchemas/OemLogService/index.json b/static/redfish/v1/JsonSchemas/OemLogService/index.json
index cc2981a..5a9ba08 100644
--- a/static/redfish/v1/JsonSchemas/OemLogService/index.json
+++ b/static/redfish/v1/JsonSchemas/OemLogService/index.json
@@ -30,7 +30,22 @@
"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": {},
+ "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.",
@@ -57,6 +72,21 @@
}
},
"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",
diff --git a/static/redfish/v1/schema/OemLogEntry_v1.xml b/static/redfish/v1/schema/OemLogEntry_v1.xml
index 2bee4f5..de57138 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 6f59ea0..d76db2a 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>