commit 27062605f8ddbafeec691ed9556fe90f2c1ab8d2
author Anthony Wilson <wilsonan@us.ibm.com> Mon Apr 22 02:10:09 2019 -0500
committer Ed Tanous <ed.tanous@intel.com> Wed Jul 03 16:48:58 2019 +0000
tree 79cb1203972e286936cecfcbed4a5fd088d9c08e
parent 08a4e4b592e582c8534f59dc73320763a07a3bbb

bmcweb: Clear up event log entry class names

It wasn't immediately clear what some of the classes
did without digging through the implementation. This
should clear up any confusion between the Journal and
DBus implementations of the event log entry classes.

Tested: Verified changes were present in both implementations
        of event log enttry.

Change-Id: Id0d6bad5c73feb93608ac1ad457235a1d31fe018
Signed-off-by: Anthony Wilson <wilsonan@us.ibm.com>

redfish-core/include/redfish.hpp

diff --git a/redfish-core/include/redfish.hpp b/redfish-core/include/redfish.hpp
index 718b082..44cc74c 100644
--- a/redfish-core/include/redfish.hpp
+++ b/redfish-core/include/redfish.hpp
@@ -83,7 +83,8 @@
         nodes.emplace_back(std::make_unique<EventLogService>(app));
         nodes.emplace_back(std::make_unique<EventLogClear>(app));
 #ifndef BMCWEB_ENABLE_REDFISH_DBUS_LOG_ENTRIES
-        nodes.emplace_back(std::make_unique<EventLogEntryCollection>(app));
+        nodes.emplace_back(
+            std::make_unique<JournalEventLogEntryCollection>(app));
 #endif
 
         nodes.emplace_back(std::make_unique<BMCLogServiceCollection>(app));

redfish-core/lib/log_services.hpp

diff --git a/redfish-core/lib/log_services.hpp b/redfish-core/lib/log_services.hpp
index 063a34c..a12044d 100644
--- a/redfish-core/lib/log_services.hpp
+++ b/redfish-core/lib/log_services.hpp
@@ -652,11 +652,11 @@
     return 0;
 }
 
-class EventLogEntryCollection : public Node
+class JournalEventLogEntryCollection : public Node
 {
   public:
     template <typename CrowApp>
-    EventLogEntryCollection(CrowApp &app) :
+    JournalEventLogEntryCollection(CrowApp &app) :
         Node(app, "/redfish/v1/Systems/system/LogServices/EventLog/Entries/")
     {
         entityPrivileges = {
@@ -876,7 +876,7 @@
                              "/redfish/v1/Systems/system/LogServices/EventLog/"
                              "Entries/" +
                                  std::to_string(*id)},
-                            {"Name", "System DBus Event Log Entry"},
+                            {"Name", "System Event Log Entry"},
                             {"Id", std::to_string(*id)},
                             {"Message", *message},
                             {"EntryType", "Event"},
@@ -999,7 +999,7 @@
                      "/redfish/v1/Systems/system/LogServices/EventLog/"
                      "Entries/" +
                          std::to_string(*id)},
-                    {"Name", "System DBus Event Log Entry"},
+                    {"Name", "System Event Log Entry"},
                     {"Id", std::to_string(*id)},
                     {"Message", *message},
                     {"EntryType", "Event"},