PEL: Read the compatible system names property
The chassis object in the inventory has (or rather at the time of this
writing: will have) a Names property that contains a list of the
compatible system types for the current system. An example is:
["company-systemA-4G", "company-systemA", "company"].
Add this to the DataInterface class, and remove the previous
'getSystemType' API that was there but was still stubbed out.
Also change all the calls from getSystemType() to the new call
getSystemNames(), and check against all entries in that array to see if
the desired name applies to the current system.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: I86aa0c15c564153fea612f407c161dfe9041fce6
diff --git a/test/openpower-pels/user_header_test.cpp b/test/openpower-pels/user_header_test.cpp
index f37b085..546b480 100644
--- a/test/openpower-pels/user_header_test.cpp
+++ b/test/openpower-pels/user_header_test.cpp
@@ -24,6 +24,7 @@
using namespace openpower::pels;
using ::testing::Return;
+using ::testing::ReturnRef;
TEST(UserHeaderTest, SizeTest)
{
@@ -112,7 +113,9 @@
regEntry.eventScope = 2;
MockDataInterface dataIface;
- EXPECT_CALL(dataIface, getSystemType).WillOnce(Return("systemA"));
+ std::vector<std::string> names{"systemA"};
+
+ EXPECT_CALL(dataIface, getSystemNames).WillOnce(ReturnRef(names));
UserHeader uh(regEntry, phosphor::logging::Entry::Level::Error,
dataIface);
@@ -143,10 +146,14 @@
regEntry.severity = {{"", 0x20}, {"systemB", 0x10}, {"systemA", 0x00}};
MockDataInterface dataIface;
- EXPECT_CALL(dataIface, getSystemType)
- .WillOnce(Return("systemA"))
- .WillOnce(Return("systemB"))
- .WillOnce(Return("systemC"));
+ std::vector<std::string> names1{"systemA"};
+ std::vector<std::string> names2{"systemB"};
+ std::vector<std::string> names3{"systemC"};
+
+ EXPECT_CALL(dataIface, getSystemNames)
+ .WillOnce(ReturnRef(names1))
+ .WillOnce(ReturnRef(names2))
+ .WillOnce(ReturnRef(names3));
{
UserHeader uh(regEntry, phosphor::logging::Entry::Level::Error,
@@ -204,6 +211,9 @@
MockDataInterface dataIface;
+ std::vector<std::string> names{"systemA"};
+ EXPECT_CALL(dataIface, getSystemNames).WillOnce(ReturnRef(names));
+
UserHeader uh(regEntry, phosphor::logging::Entry::Level::Error, dataIface);
ASSERT_EQ(uh.eventType(), 0);