entry: remove AdditionalData2

The 'AdditionalData2' property was a temporary addition to ease the
transition from an array to a dictionary for the additional data.
All users have been migrated to use the dictionary style and from the
'AdditionalData' property, so the '2' property can be removed.

Tested: Loaded an existing log database and observed dbus objects
are created successfully and with the 'AdditionalData2' field missing.
Created a new event with `log-create` CLI and observed new entry is
created successfully in dbus.

Signed-off-by: Patrick Williams <[email protected]>
Change-Id: Ica3a9e5730eca8a7cf7755b769189347220e1639

Author: williamspatrick

elog_entry.hpp

@@ -77,7 +77,6 @@ class Entry : public EntryIfaces
         updateTimestamp(timestampErr, true);
         message(std::move(msgErr), true);
         additionalData(std::move(additionalDataErr), true);
-        additionalData2(additionalData(), true);
         associations(std::move(objects), true);
         // Store a copy of associations in case we need to recreate
         assocs = associations();

elog_serialize.cpp

@@ -31,7 +31,7 @@ namespace logging
 template <class Archive>
 void save(Archive& a, const Entry& e, const std::uint32_t /*version*/)
 {
-    a(e.id(), e.severity(), e.timestamp(), e.message(), e.additionalData2(),
+    a(e.id(), e.severity(), e.timestamp(), e.message(), e.additionalData(),
       e.associations(), e.resolved(), e.version(), e.updateTimestamp(),
       e.eventId(), e.resolution());
 }
@@ -109,7 +109,6 @@ void load(Archive& a, Entry& e, const std::uint32_t version)
     e.timestamp(timestamp, true);
     e.message(message, true);
     e.additionalData(additionalData, true);
-    e.additionalData2(additionalData, true);
     e.sdbusplus::server::xyz::openbmc_project::logging::Entry::resolved(
         resolved, true);
     e.associations(associations, true);

log_manager.cpp

@@ -454,7 +454,7 @@ void Manager::doExtensionLogCreate(const Entry& entry, const FFDCEntries& ffdc)
         try
         {
             create(entry.message(), entry.id(), entry.timestamp(),
-                   entry.severity(), entry.additionalData2(), assocs, ffdc);
+                   entry.severity(), entry.additionalData(), assocs, ffdc);
         }
         catch (const std::exception& e)
         {

test/serialization_test_properties.cpp

@@ -37,7 +37,6 @@ TEST_F(TestSerialization, testProperties)
     EXPECT_EQ(input->timestamp(), output->timestamp());
     EXPECT_EQ(input->message(), output->message());
     EXPECT_EQ(input->additionalData(), output->additionalData());
-    EXPECT_EQ(input->additionalData2(), output->additionalData2());
     EXPECT_EQ(input->resolved(), output->resolved());
     EXPECT_EQ(input->associations(), output->associations());
     EXPECT_EQ(input->version(), output->version());