summaryrefslogtreecommitdiffstats
path: root/test/openpower-pels
diff options
context:
space:
mode:
authorMatt Spinler <spinler@us.ibm.com>2019-09-25 13:29:04 -0500
committerMatt Spinler <spinler@us.ibm.com>2019-10-09 08:13:30 -0500
commit131870c7e9f919c7897f39d29870b87c71c7cba3 (patch)
tree5f216c975e4aa1c3d8bd1976784ae16969250322 /test/openpower-pels
parent14d671fa2311144fe43047486c4938e9c461ce24 (diff)
downloadphosphor-logging-131870c7e9f919c7897f39d29870b87c71c7cba3.tar.gz
phosphor-logging-131870c7e9f919c7897f39d29870b87c71c7cba3.zip
PEL: Create object for every section
When unflattening a PEL, create objects for every PEL section in the log. It will use a factory method to choose which object type to create based on the section ID in the section header. All of these object will go into a vector of Section objects, which is the base class for every PEL section class. The factory will default to creating a Generic object when it doesn't have any other type to create. Signed-off-by: Matt Spinler <spinler@us.ibm.com> Change-Id: Ief0e4df5c586a46cea66ca47b4479e3444815309
Diffstat (limited to 'test/openpower-pels')
-rw-r--r--test/openpower-pels/Makefile.include4
-rw-r--r--test/openpower-pels/pel_test.cpp92
2 files changed, 96 insertions, 0 deletions
diff --git a/test/openpower-pels/Makefile.include b/test/openpower-pels/Makefile.include
index 611a2fa..eacc6ae 100644
--- a/test/openpower-pels/Makefile.include
+++ b/test/openpower-pels/Makefile.include
@@ -20,11 +20,15 @@ check_PROGRAMS += \
pel_objects = \
$(top_builddir)/extensions/openpower-pels/bcd_time.o \
+ $(top_builddir)/extensions/openpower-pels/failing_mtms.o \
+ $(top_builddir)/extensions/openpower-pels/generic.o \
$(top_builddir)/extensions/openpower-pels/log_id.o \
+ $(top_builddir)/extensions/openpower-pels/mtms.o \
$(top_builddir)/extensions/openpower-pels/pel.o \
$(top_builddir)/extensions/openpower-pels/pel_values.o \
$(top_builddir)/extensions/openpower-pels/private_header.o \
$(top_builddir)/extensions/openpower-pels/registry.o \
+ $(top_builddir)/extensions/openpower-pels/section_factory.o \
$(top_builddir)/extensions/openpower-pels/severity.o \
$(top_builddir)/extensions/openpower-pels/user_header.o
diff --git a/test/openpower-pels/pel_test.cpp b/test/openpower-pels/pel_test.cpp
index 6d888b7..8c9faae 100644
--- a/test/openpower-pels/pel_test.cpp
+++ b/test/openpower-pels/pel_test.cpp
@@ -1,4 +1,5 @@
#include "elog_entry.hpp"
+#include "extensions/openpower-pels/generic.hpp"
#include "extensions/openpower-pels/pel.hpp"
#include "pel_utils.hpp"
@@ -124,3 +125,94 @@ TEST_F(PELTest, CreateFromRegistryTest)
// Add more checks as more sections are added
}
+
+// Test that we'll create Generic optional sections for sections that
+// there aren't explicit classes for.
+TEST_F(PELTest, GenericSectionTest)
+{
+ auto data = pelDataFactory(TestPelType::pelSimple);
+
+ std::vector<uint8_t> section1{0x58, 0x58, // ID 'XX'
+ 0x00, 0x18, // Size
+ 0x01, 0x02, // version, subtype
+ 0x03, 0x04, // comp ID
+
+ // some data
+ 0x20, 0x30, 0x05, 0x09, 0x11, 0x1E, 0x1, 0x63,
+ 0x20, 0x31, 0x06, 0x0F, 0x09, 0x22, 0x3A,
+ 0x00};
+
+ std::vector<uint8_t> section2{
+ 0x59, 0x59, // ID 'YY'
+ 0x00, 0x20, // Size
+ 0x01, 0x02, // version, subtype
+ 0x03, 0x04, // comp ID
+
+ // some data
+ 0x20, 0x30, 0x05, 0x09, 0x11, 0x1E, 0x1, 0x63, 0x20, 0x31, 0x06, 0x0F,
+ 0x09, 0x22, 0x3A, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08};
+
+ // Add the new sections at the end
+ data->insert(data->end(), section1.begin(), section1.end());
+ data->insert(data->end(), section2.begin(), section2.end());
+
+ // Increment the section count
+ data->at(27) += 2;
+
+ PEL pel{*data};
+
+ const auto& sections = pel.optionalSections();
+
+ bool foundXX = false;
+ bool foundYY = false;
+
+ // Check that we can find these 2 Generic sections
+ for (const auto& section : sections)
+ {
+ if (section->header().id == 0x5858)
+ {
+ foundXX = true;
+ EXPECT_NE(dynamic_cast<Generic*>(section.get()), nullptr);
+ }
+ else if (section->header().id == 0x5959)
+ {
+ foundYY = true;
+ EXPECT_NE(dynamic_cast<Generic*>(section.get()), nullptr);
+ }
+ }
+
+ EXPECT_TRUE(foundXX);
+ EXPECT_TRUE(foundYY);
+}
+
+// Test that an invalid section will still get a Generic object
+TEST_F(PELTest, InvalidGenericTest)
+{
+ auto data = pelDataFactory(TestPelType::pelSimple);
+
+ // Not a valid section
+ std::vector<uint8_t> section1{0x01, 0x02, 0x03};
+
+ data->insert(data->end(), section1.begin(), section1.end());
+
+ // Increment the section count
+ data->at(27) += 1;
+
+ PEL pel{*data};
+ EXPECT_FALSE(pel.valid());
+
+ const auto& sections = pel.optionalSections();
+
+ bool foundGeneric = false;
+ for (const auto& section : sections)
+ {
+ if (dynamic_cast<Generic*>(section.get()) != nullptr)
+ {
+ foundGeneric = true;
+ EXPECT_EQ(section->valid(), false);
+ break;
+ }
+ }
+
+ EXPECT_TRUE(foundGeneric);
+}
OpenPOWER on IntegriCloud