Rename Systems EventLog route handler
Rename the route handler to clearly indicate, that the
handler handles the ComputerSystem redfish resource.
Tested: Code compiles.
Change-Id: Ib722427ab53f35b2270fe6e102614f21fe28ffcb
Signed-off-by: Oliver Brewka <oliver.brewka@9elements.com>
diff --git a/redfish-core/lib/systems_logservices_dbus_eventlog.hpp b/redfish-core/lib/systems_logservices_dbus_eventlog.hpp
index e90ee09..1851071 100644
--- a/redfish-core/lib/systems_logservices_dbus_eventlog.hpp
+++ b/redfish-core/lib/systems_logservices_dbus_eventlog.hpp
@@ -192,7 +192,7 @@
eventlog_utils::downloadEventLogEntry(asyncResp, entryId, "System");
}
-inline void requestRoutesDBusEventLogEntryCollection(App& app)
+inline void requestRoutesSystemsDBusEventLogEntryCollection(App& app)
{
BMCWEB_ROUTE(app, "/redfish/v1/Systems/<str>/LogServices/EventLog/Entries/")
.privileges(redfish::privileges::getLogEntryCollection)
@@ -200,7 +200,7 @@
handleSystemsDBusEventLogEntryCollection, std::ref(app)));
}
-inline void requestRoutesDBusEventLogEntry(App& app)
+inline void requestRoutesSystemsDBusEventLogEntry(App& app)
{
BMCWEB_ROUTE(
app, "/redfish/v1/Systems/<str>/LogServices/EventLog/Entries/<str>/")
@@ -226,7 +226,7 @@
/**
* DBusLogServiceActionsClear class supports POST method for ClearLog action.
*/
-inline void requestRoutesDBusLogServiceActionsClear(App& app)
+inline void requestRoutesSystemsDBusLogServiceActionsClear(App& app)
{
/**
* Function handles POST method request.
@@ -243,7 +243,7 @@
handleSystemsDBusLogServiceActionsClear, std::ref(app)));
}
-inline void requestRoutesDBusEventLogEntryDownload(App& app)
+inline void requestRoutesSystemsDBusEventLogEntryDownload(App& app)
{
BMCWEB_ROUTE(
app,
diff --git a/redfish-core/lib/systems_logservices_journal_eventlog.hpp b/redfish-core/lib/systems_logservices_journal_eventlog.hpp
index ca810bf..330c98a 100644
--- a/redfish-core/lib/systems_logservices_journal_eventlog.hpp
+++ b/redfish-core/lib/systems_logservices_journal_eventlog.hpp
@@ -110,7 +110,7 @@
asyncResp);
}
-inline void requestRoutesJournalEventLogEntryCollection(App& app)
+inline void requestRoutesSystemsJournalEventLogEntryCollection(App& app)
{
BMCWEB_ROUTE(app, "/redfish/v1/Systems/<str>/LogServices/EventLog/Entries/")
.privileges(redfish::privileges::getLogEntryCollection)
@@ -118,7 +118,7 @@
handleSystemsLogServiceEventLogLogEntryCollection, std::ref(app)));
}
-inline void requestRoutesJournalEventLogEntry(App& app)
+inline void requestRoutesSystemsJournalEventLogEntry(App& app)
{
BMCWEB_ROUTE(
app, "/redfish/v1/Systems/<str>/LogServices/EventLog/Entries/<str>/")
@@ -127,7 +127,7 @@
handleSystemsLogServiceEventLogEntriesGet, std::ref(app)));
}
-inline void requestRoutesJournalEventLogClear(App& app)
+inline void requestRoutesSystemsJournalEventLogClear(App& app)
{
BMCWEB_ROUTE(
app,
diff --git a/redfish-core/src/redfish.cpp b/redfish-core/src/redfish.cpp
index d7c43ed..297dcf8 100644
--- a/redfish-core/src/redfish.cpp
+++ b/redfish-core/src/redfish.cpp
@@ -126,16 +126,16 @@
requestRoutesSystemsEventLogService(app);
if constexpr (BMCWEB_REDFISH_DBUS_LOG)
{
- requestRoutesDBusLogServiceActionsClear(app);
- requestRoutesDBusEventLogEntryCollection(app);
- requestRoutesDBusEventLogEntry(app);
- requestRoutesDBusEventLogEntryDownload(app);
+ requestRoutesSystemsDBusLogServiceActionsClear(app);
+ requestRoutesSystemsDBusEventLogEntryCollection(app);
+ requestRoutesSystemsDBusEventLogEntry(app);
+ requestRoutesSystemsDBusEventLogEntryDownload(app);
}
else
{
- requestRoutesJournalEventLogEntryCollection(app);
- requestRoutesJournalEventLogEntry(app);
- requestRoutesJournalEventLogClear(app);
+ requestRoutesSystemsJournalEventLogEntryCollection(app);
+ requestRoutesSystemsJournalEventLogEntry(app);
+ requestRoutesSystemsJournalEventLogClear(app);
}
}