commit 55d4eb58e7091a13d590c75e8ed3687793eeafbb
author James Feist <james.feist@linux.intel.com> Mon Sep 30 15:00:40 2019 -0700
committer James Feist <james.feist@linux.intel.com> Mon Feb 10 21:22:08 2020 +0000
tree aab4e31b9306b69318ebe13eddaddec3d1172798
parent 7b2384019786b7e12979d0a51e243876ba4028bf

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>

callback-manager/include/callback_manager.hpp

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* 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 @@
         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 @@
         {
             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 @@
             }
             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
+};