diff options
| -rw-r--r-- | callback-manager/include/callback_manager.hpp | 13 | ||||
| -rw-r--r-- | settings/include/defaults.hpp | 7 |
2 files changed, 7 insertions, 13 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 +}; diff --git a/settings/include/defaults.hpp b/settings/include/defaults.hpp index d71ea42..387993f 100644 --- a/settings/include/defaults.hpp +++ b/settings/include/defaults.hpp @@ -287,13 +287,6 @@ inline void loadSettings(sdbusplus::asio::object_server &objectServer, setting->addProperty("RetryIntervalMS", static_cast<uint8_t>(20)); setting = &settings.emplace_back( - objectServer, "/xyz/openbmc_project/control/host0/restart_cause", - "xyz.openbmc_project.Common.RestartCause"); - - setting->addProperty("RestartCause", - "xyz.openbmc_project.State.Host.RestartCause.Unknown"); - - setting = &settings.emplace_back( objectServer, "/xyz/openbmc_project/control/host0/ac_boot", "xyz.openbmc_project.Common.ACBoot"); |