Convert event group to a vector of tuples
In preparation for storing each event group member's property state used
within the event's actions, the group type should be converted to a
vector of tuples. This vector will allow, if user defines, easier use of
different interfaces and properties on the same path to be used within
the same event group.
Tested:
Generated code for groups reflects vector instead of map
Actions against groups remain unchanged
Change-Id: I9f4bb609de424d9004d43524fd04737a50fb2c6f
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
diff --git a/control/actions.cpp b/control/actions.cpp
index 25b6a09..3c3b194 100644
--- a/control/actions.cpp
+++ b/control/actions.cpp
@@ -107,9 +107,9 @@
try
{
auto value = zone.template getPropertyValue<int64_t>(
- entry.first,
- std::get<intfPos>(entry.second),
- std::get<propPos>(entry.second));
+ std::get<pathPos>(entry),
+ std::get<intfPos>(entry),
+ std::get<propPos>(entry));
base = std::max(base, value);
}
catch (const std::out_of_range& oore)
@@ -141,9 +141,9 @@
{
return sum +
zone.template getPropertyValue<int64_t>(
- entry.first,
- std::get<intfPos>(entry.second),
- std::get<propPos>(entry.second));
+ std::get<pathPos>(entry),
+ std::get<intfPos>(entry),
+ std::get<propPos>(entry));
}
catch (const std::out_of_range& oore)
{
@@ -193,9 +193,9 @@
{
return sum +
zone.template getPropertyValue<int64_t>(
- entry.first,
- std::get<intfPos>(entry.second),
- std::get<propPos>(entry.second));
+ std::get<pathPos>(entry),
+ std::get<intfPos>(entry),
+ std::get<propPos>(entry));
}
catch (const std::out_of_range& oore)
{