diff options
| author | Ed Tanous <edtanous@google.com> | 2021-07-01 18:46:46 +0300 |
|---|---|---|
| committer | Ed Tanous <edtanous@google.com> | 2021-07-01 18:47:26 +0300 |
| commit | d0dbeefd444d3c701db2b3f654ac024ebd79a640 (patch) | |
| tree | 6770d4739f62b55df7852c502994e6968b6a7728 /redfish-core/lib/log_services.hpp | |
| parent | 753d034d9fb0f2dbd240f5f0ae51371dd3a28369 (diff) | |
| download | bmcweb-d0dbeefd444d3c701db2b3f654ac024ebd79a640.tar.xz | |
Revert "log_services: Add AdditionalDataURI to Post Code log entries"
This reverts commit 0ef217f4e89016e8f49f487fe65934b934aab077.
This commit requires 753d034d9fb0f2dbd240f5f0ae51371dd3a28369 to
function, which is also being reverted as part of fixing a regression.
Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: Ie6cfa6bb247d66f7c0d0291a07982bbd54d104c4
Diffstat (limited to 'redfish-core/lib/log_services.hpp')
| -rw-r--r-- | redfish-core/lib/log_services.hpp | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/redfish-core/lib/log_services.hpp b/redfish-core/lib/log_services.hpp index b772bf1ddc..31f046e1d7 100644 --- a/redfish-core/lib/log_services.hpp +++ b/redfish-core/lib/log_services.hpp @@ -499,7 +499,7 @@ inline void } } - thisEntry["@odata.type"] = "#LogEntry.v1_8_0.LogEntry"; + thisEntry["@odata.type"] = "#LogEntry.v1_7_0.LogEntry"; thisEntry["@odata.id"] = dumpPath + entryID; thisEntry["Id"] = entryID; thisEntry["EntryType"] = "Event"; @@ -621,7 +621,7 @@ inline void } asyncResp->res.jsonValue["@odata.type"] = - "#LogEntry.v1_8_0.LogEntry"; + "#LogEntry.v1_7_0.LogEntry"; asyncResp->res.jsonValue["@odata.id"] = dumpPath + entryID; asyncResp->res.jsonValue["Id"] = entryID; asyncResp->res.jsonValue["EntryType"] = "Event"; @@ -1131,7 +1131,7 @@ static int fillEventLogEntryJson(const std::string& logEntryID, // Fill in the log entry with the gathered data logEntryJson = { - {"@odata.type", "#LogEntry.v1_8_0.LogEntry"}, + {"@odata.type", "#LogEntry.v1_4_0.LogEntry"}, {"@odata.id", "/redfish/v1/Systems/system/LogServices/EventLog/Entries/" + logEntryID}, @@ -1913,7 +1913,7 @@ static int fillBMCJournalLogEntryJson(const std::string& bmcJournalLogEntryID, // Fill in the log entry with the gathered data bmcJournalLogEntryJson = { - {"@odata.type", "#LogEntry.v1_8_0.LogEntry"}, + {"@odata.type", "#LogEntry.v1_4_0.LogEntry"}, {"@odata.id", "/redfish/v1/Managers/bmc/LogServices/Journal/Entries/" + bmcJournalLogEntryID}, {"Name", "BMC Journal Entry"}, @@ -2414,7 +2414,7 @@ static void std::string crashdumpURI = "/redfish/v1/Systems/system/LogServices/Crashdump/Entries/" + logID + "/" + filename; - logEntryJson = {{"@odata.type", "#LogEntry.v1_8_0.LogEntry"}, + logEntryJson = {{"@odata.type", "#LogEntry.v1_7_0.LogEntry"}, {"@odata.id", "/redfish/v1/Systems/system/" "LogServices/Crashdump/Entries/" + logID}, @@ -2935,7 +2935,7 @@ static void fillPostCodeEntry( // add to AsyncResp logEntryArray.push_back({}); nlohmann::json& bmcLogEntry = logEntryArray.back(); - bmcLogEntry = {{"@odata.type", "#LogEntry.v1_8_0.LogEntry"}, + bmcLogEntry = {{"@odata.type", "#LogEntry.v1_4_0.LogEntry"}, {"@odata.id", "/redfish/v1/Systems/system/LogServices/" "PostCodes/Entries/" + postcodeEntryID}, @@ -2947,13 +2947,6 @@ static void fillPostCodeEntry( {"EntryType", "Event"}, {"Severity", std::move(severity)}, {"Created", entryTimeStr}}; - - if (std::get<std::vector<uint8_t>>(code.second).size()) - { - bmcLogEntry["AdditionalDataURI"] = - "/redfish/v1/Systems/system/LogServices/PostCodes/Entries/" + - postcodeEntryID + "/attachment"; - } } } |