Use proper dbus path when possible.
Following methods and properties were updated to use full dbus path,
instead of internal telemetry id:
- TriggerManager.AddTrigger() - 'reportIds' arg
- Trigger.ReportIds - renamed to 'Reports'
- Report.TriggerIds - renamed to 'Triggers'
Testing done:
- UTs were updated and are passing.
Signed-off-by: Szymon Dompke <szymon.dompke@intel.com>
Change-Id: I78d812d38289fac575d25b48503cc8b9c6f736fe
diff --git a/src/trigger.hpp b/src/trigger.hpp
index 832a277..e636334 100644
--- a/src/trigger.hpp
+++ b/src/trigger.hpp
@@ -10,6 +10,7 @@
#include <boost/asio/io_context.hpp>
#include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/message.hpp>
#include <memory>
@@ -39,7 +40,7 @@
std::string getPath() const override
{
- return path;
+ return path.str;
}
bool storeConfiguration() const;
@@ -50,9 +51,9 @@
bool isDiscreate() const;
const TriggerId id;
+ const sdbusplus::message::object_path path;
std::string name;
std::vector<TriggerAction> triggerActions;
- std::string path;
bool persistent = false;
std::shared_ptr<std::vector<std::string>> reportIds;
std::unique_ptr<sdbusplus::asio::dbus_interface> deleteIface;
@@ -67,8 +68,6 @@
public:
static constexpr const char* triggerIfaceName =
"xyz.openbmc_project.Telemetry.Trigger";
- static constexpr const char* triggerDir =
- "/xyz/openbmc_project/Telemetry/Triggers/";
static constexpr const char* deleteIfaceName =
"xyz.openbmc_project.Object.Delete";
static constexpr size_t triggerVersion = 2;