Match DBus Trigger with phosphor-dbus-interfaces
Matched Trigger DBus interface to the one defined in
phosphor-dbus-interfaces repository. Changed enum (int) type to
string to reflect enum type defined in Trigger.yaml.
Fixed style in boost_build_1.74.0.sh script.
Tested:
- Passed unit tests
- Verified manually Trigger DBus object in witherspoon image
on QEMU
Change-Id: I87175fc285afd182d1383da5879f89233b9de6a0
Signed-off-by: Wludzik, Jozef <jozef.wludzik@intel.com>
diff --git a/src/trigger_factory.cpp b/src/trigger_factory.cpp
index d8484c2..7953cd9 100644
--- a/src/trigger_factory.cpp
+++ b/src/trigger_factory.cpp
@@ -34,18 +34,19 @@
const auto& params =
std::get<std::vector<numeric::ThresholdParam>>(thresholdParams);
- for (const auto& [type, dwellTime, direction, value] : params)
+ for (const auto& [typeStr, dwellTime, directionStr, value] : params)
{
+ numeric::Type type = numeric::stringToType(typeStr);
std::vector<std::unique_ptr<interfaces::TriggerAction>> actions;
if (logToJournal)
{
- actions.emplace_back(std::make_unique<action::LogToJournal>(
- numeric::toType(type), value));
+ actions.emplace_back(
+ std::make_unique<action::LogToJournal>(type, value));
}
if (logToRedfish)
{
- actions.emplace_back(std::make_unique<action::LogToRedfish>(
- numeric::toType(type), value));
+ actions.emplace_back(
+ std::make_unique<action::LogToRedfish>(type, value));
}
if (updateReport)
{
@@ -56,7 +57,7 @@
thresholds.emplace_back(std::make_shared<NumericThreshold>(
bus->get_io_context(), sensors, sensorNames, std::move(actions),
std::chrono::milliseconds(dwellTime),
- numeric::toDirection(direction), value));
+ numeric::stringToDirection(directionStr), value));
}
return std::make_unique<Trigger>(