summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGunnar Mills <gmills@us.ibm.com>2020-02-06 15:29:57 -0600
committerGunnar Mills <gmills@us.ibm.com>2020-02-07 19:07:33 +0000
commit4f50ae4b71fc0821f0013cbf586579f7c9a17a2c (patch)
treecef7d7434207cffbe18f8b85c006d2edd62310cc
parentcd17b26c893ba9dd1dcb0d56d725f2892c57e125 (diff)
downloadbmcweb-4f50ae4b71fc0821f0013cbf586579f7c9a17a2c.tar.gz
bmcweb-4f50ae4b71fc0821f0013cbf586579f7c9a17a2c.zip
Move Crashdump to OemCrashdump
All other Oem Schemas start with Oem. This is used by the update_schemas.py to determine an Oem schema and is a reasonable requirement for Oem schemas. https://github.com/openbmc/bmcweb/blob/a3268f98f308ca7c8660b1ace44d5b9a40be204b/scripts/update_schemas.py#L43 Tested: Ran the validator against this change on a Witherspoon with BMCWEB_ENABLE_REDFISH_CPU_LOG enabled and OemCheck true. Validator passed. Might be worth running on a system that actually uses BMCWEB_ENABLE_REDFISH_CPU_LOG. curl -k https://${bmc}/redfish/v1/Systems/system/LogServices/Crashdump { "@odata.context": "/redfish/v1/$metadata#LogService.LogService", "@odata.id": "/redfish/v1/Systems/system/LogServices/Crashdump", "@odata.type": "#LogService.v1_1_0.LogService", "Actions": { "#LogService.ClearLog": { "target": "/redfish/v1/Systems/system/LogServices/Crashdump/Actions/LogService.ClearLog" }, "Oem": { "#Crashdump.OnDemand": { "target": "/redfish/v1/Systems/system/LogServices/Crashdump/Actions/Oem/Crashdump.OnDemand" } } }, "Description": "Oem Crashdump Service", "Entries": { "@odata.id": "/redfish/v1/Systems/system/LogServices/Crashdump/Entries" }, "Id": "Oem Crashdump", "MaxNumberOfRecords": 3, "Name": "Open BMC Oem Crashdump Service", "OverWritePolicy": "WrapsWhenFull" } Change-Id: Iacc11be1284b99c2ed9a6c2ca0a936bd97855afb Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
-rw-r--r--redfish-core/lib/log_services.hpp6
-rw-r--r--static/redfish/v1/$metadata/index.xml4
-rw-r--r--static/redfish/v1/JsonSchemas/OemCrashdump/OemCrashdump.json (renamed from static/redfish/v1/JsonSchemas/Crashdump/Crashdump.json)6
-rw-r--r--static/redfish/v1/JsonSchemas/OemCrashdump/index.json (renamed from static/redfish/v1/JsonSchemas/Crashdump/index.json)14
-rw-r--r--static/redfish/v1/schema/OemCrashdump_v1.xml (renamed from static/redfish/v1/schema/Crashdump_v1.xml)2
5 files changed, 16 insertions, 16 deletions
diff --git a/redfish-core/lib/log_services.hpp b/redfish-core/lib/log_services.hpp
index 9bf661a..4a5992f 100644
--- a/redfish-core/lib/log_services.hpp
+++ b/redfish-core/lib/log_services.hpp
@@ -1499,9 +1499,9 @@ class CrashdumpService : public Node
"#LogService.v1_1_0.LogService";
asyncResp->res.jsonValue["@odata.context"] =
"/redfish/v1/$metadata#LogService.LogService";
- asyncResp->res.jsonValue["Name"] = "Open BMC Crashdump Service";
- asyncResp->res.jsonValue["Description"] = "Crashdump Service";
- asyncResp->res.jsonValue["Id"] = "Crashdump";
+ asyncResp->res.jsonValue["Name"] = "Open BMC Oem Crashdump Service";
+ asyncResp->res.jsonValue["Description"] = "Oem Crashdump Service";
+ asyncResp->res.jsonValue["Id"] = "Oem Crashdump";
asyncResp->res.jsonValue["OverWritePolicy"] = "WrapsWhenFull";
asyncResp->res.jsonValue["MaxNumberOfRecords"] = 3;
asyncResp->res.jsonValue["Entries"] = {
diff --git a/static/redfish/v1/$metadata/index.xml b/static/redfish/v1/$metadata/index.xml
index c6da3e6..a5a2fcb 100644
--- a/static/redfish/v1/$metadata/index.xml
+++ b/static/redfish/v1/$metadata/index.xml
@@ -1883,8 +1883,8 @@
<edmx:Reference Uri="/redfish/v1/schema/OemManager_v1.xml">
<edmx:Include Namespace="OemManager"/>
</edmx:Reference>
- <edmx:Reference Uri="/redfish/v1/schema/Crashdump_v1.xml">
- <edmx:Include Namespace="Crashdump.v1_0_0"/>
+ <edmx:Reference Uri="/redfish/v1/schema/OemCrashdump_v1.xml">
+ <edmx:Include Namespace="OemCrashdump.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/schema/OemComputerSystem_v1.xml">
<edmx:Include Namespace="OemComputerSystem"/>
diff --git a/static/redfish/v1/JsonSchemas/Crashdump/Crashdump.json b/static/redfish/v1/JsonSchemas/OemCrashdump/OemCrashdump.json
index 0ce3f3d..604b719 100644
--- a/static/redfish/v1/JsonSchemas/Crashdump/Crashdump.json
+++ b/static/redfish/v1/JsonSchemas/OemCrashdump/OemCrashdump.json
@@ -1,5 +1,5 @@
{
- "$id": "http://redfish.dmtf.org/schemas/v1/Crashdump.v1_0_0.json",
+ "$id": "http://redfish.dmtf.org/schemas/v1/OemCrashdump.v1_0_0.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": {
@@ -116,5 +116,5 @@
"type": "object"
}
},
- "title": "#Crashdump.v1_0_0"
-} \ No newline at end of file
+ "title": "#OemCrashdump.v1_0_0"
+}
diff --git a/static/redfish/v1/JsonSchemas/Crashdump/index.json b/static/redfish/v1/JsonSchemas/OemCrashdump/index.json
index 4f9e533..7a19e8e 100644
--- a/static/redfish/v1/JsonSchemas/Crashdump/index.json
+++ b/static/redfish/v1/JsonSchemas/OemCrashdump/index.json
@@ -1,11 +1,11 @@
{
"@odata.context": "/redfish/v1/$metadata#JsonSchemaFile.JsonSchemaFile",
- "@odata.id": "/redfish/v1/JsonSchemas/Crashdump",
+ "@odata.id": "/redfish/v1/JsonSchemas/OemCrashdump",
"@odata.type": "#JsonSchemaFile.v1_0_2.JsonSchemaFile",
- "Name": "Crashdump Schema File",
- "Schema": "#Crashdump.Crashdump",
- "Description": "Crashdump Schema File Location",
- "Id": "Crashdump",
+ "Name": "Oem Crashdump Schema File",
+ "Schema": "#OemCrashdump.OemCrashdump",
+ "Description": "Oem Crashdump Schema File Location",
+ "Id": "OemCrashdump",
"Languages": [
"en"
],
@@ -13,8 +13,8 @@
"Location": [
{
"Language": "en",
- "Uri": "/redfish/v1/JsonSchemas/Crashdump/Crashdump.json"
+ "Uri": "/redfish/v1/JsonSchemas/OemCrashdump/OemCrashdump.json"
}
],
"Location@odata.count": 1
-} \ No newline at end of file
+}
diff --git a/static/redfish/v1/schema/Crashdump_v1.xml b/static/redfish/v1/schema/OemCrashdump_v1.xml
index db9dde0..10e5ff6 100644
--- a/static/redfish/v1/schema/Crashdump_v1.xml
+++ b/static/redfish/v1/schema/OemCrashdump_v1.xml
@@ -9,7 +9,7 @@
</edmx:Reference>
<edmx:DataServices>
- <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Crashdump.v1_0_0">
+ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="OemCrashdump.v1_0_0">
<Action Name="OnDemand" IsBound="true">
<Parameter Name="LogService" Type="LogService.v1_0_0.OemActions"/>
<Annotation Term="OData.Description" String="This action is used to trigger a new on-demand crashdump." />
OpenPOWER on IntegriCloud