action: use PDI type
Rather than define our own enumeration for the LED Actions,
reuse the one from Led.Physical's dbus interface.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I4615bed9e87c61d2632fe790bd50892a7f51e2ab
diff --git a/test/led-test-map.hpp b/test/led-test-map.hpp
index 983fad5..86b3587 100644
--- a/test/led-test-map.hpp
+++ b/test/led-test-map.hpp
@@ -8,8 +8,8 @@
singleLedOn = {
{"/xyz/openbmc_project/ledmanager/groups/SingleLed",
{
- {"One", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::Blink},
+ {"One", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::Blink},
}},
};
@@ -17,8 +17,8 @@
singleLedBlink = {
{"/xyz/openbmc_project/ledmanager/groups/SingleLed",
{
- {"One", phosphor::led::Layout::Blink, 0, 0,
- phosphor::led::Layout::Blink},
+ {"One", phosphor::led::Layout::Action::Blink, 0, 0,
+ phosphor::led::Layout::Action::Blink},
}},
};
@@ -26,8 +26,8 @@
singleLedBlinkOverrideOn = {
{"/xyz/openbmc_project/ledmanager/groups/SingleLed",
{
- {"One", phosphor::led::Layout::Blink, 0, 0,
- phosphor::led::Layout::On},
+ {"One", phosphor::led::Layout::Action::Blink, 0, 0,
+ phosphor::led::Layout::Action::On},
}},
};
@@ -35,12 +35,12 @@
multipleLedsOn = {
{"/xyz/openbmc_project/ledmanager/groups/MultipleLeds",
{
- {"One", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Two", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Three", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
+ {"One", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Two", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Three", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
}},
};
@@ -48,12 +48,12 @@
multipleLedsBlink = {
{"/xyz/openbmc_project/ledmanager/groups/MultipleLeds",
{
- {"One", phosphor::led::Layout::Blink, 0, 0,
- phosphor::led::Layout::Blink},
- {"Two", phosphor::led::Layout::Blink, 0, 0,
- phosphor::led::Layout::Blink},
- {"Three", phosphor::led::Layout::Blink, 0, 0,
- phosphor::led::Layout::Blink},
+ {"One", phosphor::led::Layout::Action::Blink, 0, 0,
+ phosphor::led::Layout::Action::Blink},
+ {"Two", phosphor::led::Layout::Action::Blink, 0, 0,
+ phosphor::led::Layout::Action::Blink},
+ {"Three", phosphor::led::Layout::Action::Blink, 0, 0,
+ phosphor::led::Layout::Action::Blink},
}},
};
@@ -61,16 +61,16 @@
multipleLedsOnAndBlink = {
{"/xyz/openbmc_project/ledmanager/groups/MultipleLedsMix",
{
- {"One", phosphor::led::Layout::Blink, 0, 0,
- phosphor::led::Layout::Blink},
- {"Two", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::Blink},
- {"Three", phosphor::led::Layout::Blink, 0, 0,
- phosphor::led::Layout::On},
- {"Four", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::Blink},
- {"Five", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::Blink},
+ {"One", phosphor::led::Layout::Action::Blink, 0, 0,
+ phosphor::led::Layout::Action::Blink},
+ {"Two", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::Blink},
+ {"Three", phosphor::led::Layout::Action::Blink, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Four", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::Blink},
+ {"Five", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::Blink},
}},
};
@@ -78,21 +78,21 @@
twoGroupsWithDistinctLEDsOn = {
{"/xyz/openbmc_project/ledmanager/groups/MultipleLedsASet",
{
- {"One", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::Blink},
- {"Two", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Three", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::Blink},
+ {"One", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::Blink},
+ {"Two", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Three", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::Blink},
}},
{"/xyz/openbmc_project/ledmanager/groups/MultipleLedsBSet",
{
- {"Four", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::Blink},
- {"Five", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::Blink},
- {"Six", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
+ {"Four", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::Blink},
+ {"Five", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::Blink},
+ {"Six", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
}},
};
@@ -100,21 +100,21 @@
twoGroupsWithOneComonLEDOn = {
{"/xyz/openbmc_project/ledmanager/groups/MultipleLedsASet",
{
- {"One", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Two", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Three", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
+ {"One", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Two", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Three", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
}},
{"/xyz/openbmc_project/ledmanager/groups/MultipleLedsBSet",
{
- {"Four", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Three", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Six", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
+ {"Four", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Three", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Six", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
}},
};
@@ -122,21 +122,21 @@
twoGroupsWithOneComonLEDOnOneLEDBlinkPriority = {
{"/xyz/openbmc_project/ledmanager/groups/MultipleLedsASet",
{
- {"One", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Two", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Three", phosphor::led::Layout::Blink, 0, 0,
- phosphor::led::Layout::Blink},
+ {"One", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Two", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Three", phosphor::led::Layout::Action::Blink, 0, 0,
+ phosphor::led::Layout::Action::Blink},
}},
{"/xyz/openbmc_project/ledmanager/groups/MultipleLedsBSet",
{
- {"Four", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Three", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::Blink},
- {"Six", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
+ {"Four", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Three", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::Blink},
+ {"Six", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
}},
};
@@ -144,21 +144,21 @@
twoGroupsWithOneComonLEDOnPriority = {
{"/xyz/openbmc_project/ledmanager/groups/MultipleLedsASet",
{
- {"One", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Two", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Three", phosphor::led::Layout::Blink, 0, 0,
- phosphor::led::Layout::On},
+ {"One", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Two", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Three", phosphor::led::Layout::Action::Blink, 0, 0,
+ phosphor::led::Layout::Action::On},
}},
{"/xyz/openbmc_project/ledmanager/groups/MultipleLedsBSet",
{
- {"Four", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Three", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Six", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
+ {"Four", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Three", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Six", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
}},
};
@@ -166,23 +166,23 @@
twoGroupsWithMultiplComonLEDOn = {
{"/xyz/openbmc_project/ledmanager/groups/MultipleLedsASet",
{
- {"One", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Two", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Three", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
+ {"One", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Two", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Three", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
}},
{"/xyz/openbmc_project/ledmanager/groups/MultipleLedsBSet",
{
- {"Two", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Six", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Three", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Seven", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
+ {"Two", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Six", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Three", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Seven", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
}},
};
@@ -190,25 +190,25 @@
twoGroupsWithMultipleComonLEDInDifferentState = {
{"/xyz/openbmc_project/ledmanager/groups/MultipleLedsASet",
{
- {"One", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Two", phosphor::led::Layout::Blink, 0, 0,
- phosphor::led::Layout::On},
- {"Three", phosphor::led::Layout::Blink, 0, 0,
- phosphor::led::Layout::On},
- {"Four", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
+ {"One", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Two", phosphor::led::Layout::Action::Blink, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Three", phosphor::led::Layout::Action::Blink, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Four", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
}},
{"/xyz/openbmc_project/ledmanager/groups/MultipleLedsBSet",
{
- {"Two", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Three", phosphor::led::Layout::Blink, 0, 0,
- phosphor::led::Layout::On},
- {"Five", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Six", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
+ {"Two", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Three", phosphor::led::Layout::Action::Blink, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Five", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Six", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
}},
};
@@ -216,28 +216,28 @@
twoGroupsWithMultipleComonLEDInDifferentStateDiffPriority = {
{"/xyz/openbmc_project/ledmanager/groups/MultipleLedsASet",
{
- {"One", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Two", phosphor::led::Layout::Blink, 0, 0,
- phosphor::led::Layout::On},
- {"Three", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::Blink},
- {"Four", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Ten", phosphor::led::Layout::Blink, 0, 0,
- phosphor::led::Layout::Blink},
+ {"One", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Two", phosphor::led::Layout::Action::Blink, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Three", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::Blink},
+ {"Four", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Ten", phosphor::led::Layout::Action::Blink, 0, 0,
+ phosphor::led::Layout::Action::Blink},
}},
{"/xyz/openbmc_project/ledmanager/groups/MultipleLedsBSet",
{
- {"Two", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Three", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::Blink},
- {"Five", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Six", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::On},
- {"Ten", phosphor::led::Layout::On, 0, 0,
- phosphor::led::Layout::Blink},
+ {"Two", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Three", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::Blink},
+ {"Five", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Six", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::On},
+ {"Ten", phosphor::led::Layout::Action::On, 0, 0,
+ phosphor::led::Layout::Action::Blink},
}},
};