diff options
| author | James Feist <james.feist@linux.intel.com> | 2019-10-01 01:00:40 +0300 |
|---|---|---|
| committer | James Feist <james.feist@linux.intel.com> | 2019-10-01 01:10:32 +0300 |
| commit | fc9f24da98d171b5ee1544efcf72ecdea65effe9 (patch) | |
| tree | c558e0380208ad326f25912949de271dc902740a | |
| parent | f78b98bb6c13f10992d4a21104c9e3f30b466290 (diff) | |
| download | provingground-fc9f24da98d171b5ee1544efcf72ecdea65effe9.tar.xz | |
Update callback manager to new association
Mapper no longer supports the old one.
Tested: Mapper shows associations again, available in
redfish
Change-Id: I876c7b9be4d24e3bc73e4b5ff0e9290e422baaa9
Signed-off-by: James Feist <james.feist@linux.intel.com>
| -rw-r--r-- | callback-manager/include/callback_manager.hpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/callback-manager/include/callback_manager.hpp b/callback-manager/include/callback_manager.hpp index 4ecdd60..490e596 100644 --- a/callback-manager/include/callback_manager.hpp +++ b/callback-manager/include/callback_manager.hpp @@ -12,7 +12,8 @@ constexpr const char* sensorPath = "/xyz/openbmc_project/sensors"; constexpr const char* globalInventoryIface = "xyz.openbmc_project.Inventory.Item.Global"; -constexpr const char* associationIface = "org.openbmc.Associations"; +constexpr const char* associationIface = + "xyz.openbmc_project.Association.Definitions"; namespace threshold { @@ -29,8 +30,8 @@ struct AssociationManager sensorAssociation( objectServer.add_interface(sensorPath, associationIface)) { - association->register_property("associations", std::set<Association>()); - sensorAssociation->register_property("associations", + association->register_property("Associations", std::set<Association>()); + sensorAssociation->register_property("Associations", std::set<Association>()); association->initialize(); sensorAssociation->initialize(); @@ -61,7 +62,7 @@ struct AssociationManager { result.emplace(threshold::warning, "", path); } - association->set_property("associations", result); + association->set_property("Associations", result); } void setSensorAssociations(const std::vector<std::string>& critical, @@ -84,10 +85,10 @@ struct AssociationManager } result.emplace(threshold::warning, "", path); } - sensorAssociation->set_property("associations", result); + sensorAssociation->set_property("Associations", result); } sdbusplus::asio::object_server& objectServer; std::shared_ptr<sdbusplus::asio::dbus_interface> association; std::shared_ptr<sdbusplus::asio::dbus_interface> sensorAssociation; -};
\ No newline at end of file +}; |