Use updated match methods for signal callbacks
Attach the event handler callback function to the match along with
generating the match string using the new match methods
Change-Id: I7595d65cbc615f29db60e2a65534ee5b635d6f96
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
diff --git a/control/gen-fan-zone-defs.py b/control/gen-fan-zone-defs.py
index f537716..76f4c6c 100755
--- a/control/gen-fan-zone-defs.py
+++ b/control/gen-fan-zone-defs.py
@@ -13,12 +13,14 @@
#Note: Condition is a TODO (openbmc/openbmc#1500)
tmpl = '''/* This is a generated file. */
+#include <sdbusplus/bus.hpp>
#include "manager.hpp"
#include "functor.hpp"
#include "actions.hpp"
#include "handlers.hpp"
using namespace phosphor::fan::control;
+using namespace sdbusplus::bus::match::rules;
const unsigned int Manager::_powerOnDelay{${mgr_data['power_on_delay']}};
@@ -68,10 +70,11 @@
std::vector<PropertyChange>{
%for s in event['signal']:
PropertyChange{
- "interface='org.freedesktop.DBus.Properties',"
- "member='PropertiesChanged',"
- "type='signal',"
- "path='${s['path']}'",
+ interface("org.freedesktop.DBus.Properties") +
+ member("PropertiesChanged") +
+ type::signal() +
+ path("${s['path']}") +
+ arg0namespace("${s['interface']}"),
make_handler(propertySignal<${s['type']}>(
"${s['interface']}",
"${s['property']}",