Removed FutureVersion from API
Instead of using FutureVersion API currently used version is updated.
This change needs to be bumped together with [1]. API that utilized map
of variants to be more flexible and backwards compatible was reverted.
It was decided that straight forward API that is commonly used should be
used instead.
Removed MetricId property from Metric. In telemetry it was implemented
as a name for Metric, but it was supposed to work as described in [2].
Currently MetricId is not supported by telemetry service and property
was removed.
Tested:
- After chaging bmcweb to use new API old and new features are working
as expected
[1]: https://gerrit.openbmc.org/c/openbmc/bmcweb/+/44270
[2]: https://redfish.dmtf.org/schemas/v1/MetricReportDefinition.v1_4_2.json
Signed-off-by: Krzysztof Grobelny <krzysztof.grobelny@intel.com>
Change-Id: I5930a466a370f268d68f575a4a3db5ee9655e574
diff --git a/src/types/collection_time_scope.hpp b/src/types/collection_time_scope.hpp
index 25e0744..79db567 100644
--- a/src/types/collection_time_scope.hpp
+++ b/src/types/collection_time_scope.hpp
@@ -26,11 +26,16 @@
constexpr std::array<std::pair<std::string_view, CollectionTimeScope>, 3>
convDataCollectionTimeScope = {
{std::make_pair<std::string_view, CollectionTimeScope>(
- "Point", CollectionTimeScope::point),
+ "xyz.openbmc_project.Telemetry.Report.CollectionTimescope.Point",
+ CollectionTimeScope::point),
std::make_pair<std::string_view, CollectionTimeScope>(
- "Interval", CollectionTimeScope::interval),
+ "xyz.openbmc_project.Telemetry.Report.CollectionTimescope."
+ "Interval",
+ CollectionTimeScope::interval),
std::make_pair<std::string_view, CollectionTimeScope>(
- "StartupInterval", CollectionTimeScope::startup)}};
+ "xyz.openbmc_project.Telemetry.Report.CollectionTimescope."
+ "StartupInterval",
+ CollectionTimeScope::startup)}};
inline CollectionTimeScope
toCollectionTimeScope(std::underlying_type_t<CollectionTimeScope> value)
diff --git a/src/types/operation_type.hpp b/src/types/operation_type.hpp
index cca8b23..e7f6ed2 100644
--- a/src/types/operation_type.hpp
+++ b/src/types/operation_type.hpp
@@ -24,14 +24,19 @@
};
constexpr std::array<std::pair<std::string_view, OperationType>, 4>
- convDataOperationType = {{std::make_pair<std::string_view, OperationType>(
- "Maximum", OperationType::max),
- std::make_pair<std::string_view, OperationType>(
- "Minimum", OperationType::min),
- std::make_pair<std::string_view, OperationType>(
- "Average", OperationType::avg),
- std::make_pair<std::string_view, OperationType>(
- "Summation", OperationType::sum)}};
+ convDataOperationType = {
+ {std::make_pair<std::string_view, OperationType>(
+ "xyz.openbmc_project.Telemetry.Report.OperationType.Maximum",
+ OperationType::max),
+ std::make_pair<std::string_view, OperationType>(
+ "xyz.openbmc_project.Telemetry.Report.OperationType.Minimum",
+ OperationType::min),
+ std::make_pair<std::string_view, OperationType>(
+ "xyz.openbmc_project.Telemetry.Report.OperationType.Average",
+ OperationType::avg),
+ std::make_pair<std::string_view, OperationType>(
+ "xyz.openbmc_project.Telemetry.Report.OperationType.Summation",
+ OperationType::sum)}};
inline OperationType
toOperationType(std::underlying_type_t<OperationType> value)
diff --git a/src/types/readings.hpp b/src/types/readings.hpp
index 6749bbf..d5fe359 100644
--- a/src/types/readings.hpp
+++ b/src/types/readings.hpp
@@ -3,12 +3,11 @@
#include "utils/labeled_tuple.hpp"
#include "utils/tstring.hpp"
-using ReadingData = std::tuple<std::string, std::string, double, uint64_t>;
+using ReadingData = std::tuple<std::string, double, uint64_t>;
using Readings = std::tuple<uint64_t, std::vector<ReadingData>>;
using LabeledReadingData =
- utils::LabeledTuple<ReadingData, utils::tstring::MetricId,
- utils::tstring::MetricProperty,
+ utils::LabeledTuple<ReadingData, utils::tstring::MetricProperty,
utils::tstring::MetricValue, utils::tstring::Timestamp>;
using LabeledReadings =
diff --git a/src/types/report_action.hpp b/src/types/report_action.hpp
index 3a114e3..1ec74f9 100644
--- a/src/types/report_action.hpp
+++ b/src/types/report_action.hpp
@@ -23,12 +23,14 @@
};
constexpr std::array<std::pair<std::string_view, ReportAction>, 2>
- convDataReportAction = {
- {std::make_pair<std::string_view, ReportAction>(
- "EmitsReadingsUpdate", ReportAction::emitsReadingsUpdate),
- std::make_pair<std::string_view, ReportAction>(
- "LogToMetricReportsCollection",
- ReportAction::logToMetricReportsCollection)}};
+ convDataReportAction = {{std::make_pair<std::string_view, ReportAction>(
+ "xyz.openbmc_project.Telemetry.Report."
+ "ReportActions.EmitsReadingsUpdate",
+ ReportAction::emitsReadingsUpdate),
+ std::make_pair<std::string_view, ReportAction>(
+ "xyz.openbmc_project.Telemetry.Report."
+ "ReportActions.LogToMetricReportsCollection",
+ ReportAction::logToMetricReportsCollection)}};
inline ReportAction toReportAction(std::underlying_type_t<ReportAction> value)
{
diff --git a/src/types/report_types.cpp b/src/types/report_types.cpp
index 4fb0b4e..8e31ae6 100644
--- a/src/types/report_types.cpp
+++ b/src/types/report_types.cpp
@@ -18,7 +18,6 @@
sensorParameters.at_label<ts::Metadata>());
}),
utils::enumToString(metricParams.at_label<ts::OperationType>()),
- metricParams.at_label<ts::Id>(),
utils::enumToString(
metricParams.at_label<ts::CollectionTimeScope>()),
metricParams.at_label<ts::CollectionDuration>().t.count());
diff --git a/src/types/report_types.hpp b/src/types/report_types.hpp
index 49dca73..c40c76d 100644
--- a/src/types/report_types.hpp
+++ b/src/types/report_types.hpp
@@ -16,22 +16,17 @@
#include <variant>
#include <vector>
-using ReadingParametersPastVersion =
- std::vector<std::tuple<sdbusplus::message::object_path, std::string,
- std::string, std::string>>;
-
using ReadingParameters = std::vector<std::tuple<
std::vector<std::tuple<sdbusplus::message::object_path, std::string>>,
- std::string, std::string, std::string, uint64_t>>;
+ std::string, std::string, uint64_t>>;
using LabeledMetricParameters = utils::LabeledTuple<
- std::tuple<std::vector<LabeledSensorInfo>, OperationType, std::string,
+ std::tuple<std::vector<LabeledSensorInfo>, OperationType,
CollectionTimeScope, CollectionDuration>,
utils::tstring::SensorPath, utils::tstring::OperationType,
- utils::tstring::Id, utils::tstring::CollectionTimeScope,
- utils::tstring::CollectionDuration>;
+ utils::tstring::CollectionTimeScope, utils::tstring::CollectionDuration>;
-using AddReportFutureVersionVariant =
+using AddReportVariant =
std::variant<std::monostate, bool, uint64_t, std::string,
std::vector<std::string>, ReadingParameters>;
diff --git a/src/types/report_updates.hpp b/src/types/report_updates.hpp
index a3dfe81..9286e24 100644
--- a/src/types/report_updates.hpp
+++ b/src/types/report_updates.hpp
@@ -26,12 +26,17 @@
};
constexpr auto convDataReportUpdates = std::array{
- std::make_pair<std::string_view, ReportUpdates>("Overwrite",
- ReportUpdates::overwrite),
std::make_pair<std::string_view, ReportUpdates>(
- "AppendStopsWhenFull", ReportUpdates::appendStopsWhenFull),
+ "xyz.openbmc_project.Telemetry.Report.ReportUpdates.Overwrite",
+ ReportUpdates::overwrite),
std::make_pair<std::string_view, ReportUpdates>(
- "AppendWrapsWhenFull", ReportUpdates::appendWrapsWhenFull)};
+ "xyz.openbmc_project.Telemetry.Report.ReportUpdates."
+ "AppendStopsWhenFull",
+ ReportUpdates::appendStopsWhenFull),
+ std::make_pair<std::string_view, ReportUpdates>(
+ "xyz.openbmc_project.Telemetry.Report.ReportUpdates."
+ "AppendWrapsWhenFull",
+ ReportUpdates::appendWrapsWhenFull)};
inline ReportUpdates
toReportUpdates(std::underlying_type_t<ReportUpdates> value)
diff --git a/src/types/reporting_type.hpp b/src/types/reporting_type.hpp
index 2c9f500..f179eb7 100644
--- a/src/types/reporting_type.hpp
+++ b/src/types/reporting_type.hpp
@@ -26,12 +26,16 @@
};
constexpr std::array<std::pair<std::string_view, ReportingType>, 3>
- convDataReportingType = {{std::make_pair<std::string_view, ReportingType>(
- "Periodic", ReportingType::periodic),
- std::make_pair<std::string_view, ReportingType>(
- "OnRequest", ReportingType::onRequest),
- std::make_pair<std::string_view, ReportingType>(
- "OnChange", ReportingType::onChange)}};
+ convDataReportingType = {
+ {std::make_pair<std::string_view, ReportingType>(
+ "xyz.openbmc_project.Telemetry.Report.ReportingType.OnChange",
+ ReportingType::onChange),
+ std::make_pair<std::string_view, ReportingType>(
+ "xyz.openbmc_project.Telemetry.Report.ReportingType.OnRequest",
+ ReportingType::onRequest),
+ std::make_pair<std::string_view, ReportingType>(
+ "xyz.openbmc_project.Telemetry.Report.ReportingType.Periodic",
+ ReportingType::periodic)}};
inline ReportingType
toReportingType(std::underlying_type_t<ReportingType> value)
diff --git a/src/types/trigger_types.hpp b/src/types/trigger_types.hpp
index 7ba0768..38da4f8 100644
--- a/src/types/trigger_types.hpp
+++ b/src/types/trigger_types.hpp
@@ -23,10 +23,15 @@
{
constexpr std::array<std::pair<std::string_view, TriggerAction>, 3>
convDataTriggerAction = {
- std::make_pair("LogToJournal", TriggerAction::LogToJournal),
- std::make_pair("LogToRedfishEventLog",
+ std::make_pair(
+ "xyz.openbmc_project.Telemetry.Trigger.TriggerAction.LogToJournal",
+ TriggerAction::LogToJournal),
+ std::make_pair("xyz.openbmc_project.Telemetry.Trigger.TriggerAction."
+ "LogToRedfishEventLog",
TriggerAction::LogToRedfishEventLog),
- std::make_pair("UpdateReport", TriggerAction::UpdateReport)};
+ std::make_pair(
+ "xyz.openbmc_project.Telemetry.Trigger.TriggerAction.UpdateReport",
+ TriggerAction::UpdateReport)};
}
inline TriggerAction toTriggerAction(const std::string& str)
@@ -49,25 +54,6 @@
critical
};
-namespace details
-{
-constexpr std::array<std::pair<std::string_view, Severity>, 3>
- convDataSeverity = {std::make_pair("OK", Severity::ok),
- std::make_pair("Warning", Severity::warning),
- std::make_pair("Critical", Severity::critical)};
-
-} // namespace details
-
-inline Severity toSeverity(const std::string& str)
-{
- return utils::toEnum(details::convDataSeverity, str);
-}
-
-inline std::string severityToString(Severity v)
-{
- return std::string(utils::enumToString(details::convDataSeverity, v));
-}
-
using ThresholdParam =
std::tuple<std::string, std::string, uint64_t, std::string>;
@@ -99,15 +85,25 @@
{
constexpr std::array<std::pair<std::string_view, Type>, 4> convDataType = {
- std::make_pair("LowerCritical", Type::lowerCritical),
- std::make_pair("LowerWarning", Type::lowerWarning),
- std::make_pair("UpperWarning", Type::upperWarning),
- std::make_pair("UpperCritical", Type::upperCritical)};
+ std::make_pair("xyz.openbmc_project.Telemetry.Trigger.Type.LowerCritical",
+ Type::lowerCritical),
+ std::make_pair("xyz.openbmc_project.Telemetry.Trigger.Type.LowerWarning",
+ Type::lowerWarning),
+ std::make_pair("xyz.openbmc_project.Telemetry.Trigger.Type.UpperWarning",
+ Type::upperWarning),
+ std::make_pair("xyz.openbmc_project.Telemetry.Trigger.Type.UpperCritical",
+ Type::upperCritical)};
constexpr std::array<std::pair<std::string_view, Direction>, 3>
- convDataDirection = {std::make_pair("Either", Direction::either),
- std::make_pair("Decreasing", Direction::decreasing),
- std::make_pair("Increasing", Direction::increasing)};
+ convDataDirection = {
+ std::make_pair("xyz.openbmc_project.Telemetry.Trigger.Direction.Either",
+ Direction::either),
+ std::make_pair(
+ "xyz.openbmc_project.Telemetry.Trigger.Direction.Decreasing",
+ Direction::decreasing),
+ std::make_pair(
+ "xyz.openbmc_project.Telemetry.Trigger.Direction.Increasing",
+ Direction::increasing)};
} // namespace details
@@ -181,6 +177,26 @@
namespace utils
{
+constexpr std::array<std::pair<std::string_view, discrete::Severity>, 3>
+ convDataSeverity = {
+ std::make_pair("xyz.openbmc_project.Telemetry.Trigger.Severity.OK",
+ discrete::Severity::ok),
+ std::make_pair("xyz.openbmc_project.Telemetry.Trigger.Severity.Warning",
+ discrete::Severity::warning),
+ std::make_pair(
+ "xyz.openbmc_project.Telemetry.Trigger.Severity.Critical",
+ discrete::Severity::critical)};
+
+inline discrete::Severity toSeverity(const std::string& str)
+{
+ return utils::toEnum(convDataSeverity, str);
+}
+
+inline std::string enumToString(discrete::Severity v)
+{
+ return std::string(enumToString(convDataSeverity, v));
+}
+
template <>
struct EnumTraits<TriggerAction>
{