added property SupportedOperationTypes
- removed OperationType::single
- for backward compatibility incomming OperationType::single alted to
produce same output functionality
- added property SupportedOperationTypes to ReportManager interface
Tested:
- In cases where OperationType::single is used same MetricValues are
produced
- New property is visible on dbus
Change-Id: I838581c954abc0d8401e0ed530ce7e9c8013860b
Signed-off-by: Krzysztof Grobelny <krzysztof.grobelny@intel.com>
diff --git a/tests/src/test_report_manager.cpp b/tests/src/test_report_manager.cpp
index fca6451..f4ce184 100644
--- a/tests/src/test_report_manager.cpp
+++ b/tests/src/test_report_manager.cpp
@@ -103,6 +103,13 @@
Eq(ReportManager::maxReports));
}
+TEST_F(TestReportManager, returnsPropertySupportedOperationTypes)
+{
+ EXPECT_THAT(
+ getProperty<std::vector<std::string>>("SupportedOperationTypes"),
+ UnorderedElementsAre("Maximum", "Minimum", "Average", "Summation"));
+}
+
TEST_F(TestReportManager, addReport)
{
EXPECT_CALL(reportFactoryMock, convertMetricParams(_, _));
@@ -220,7 +227,7 @@
{LabeledSensorInfo{"Service",
"/xyz/openbmc_project/sensors/power/p1",
"Metadata1"}},
- OperationType::single,
+ OperationType::avg,
"MetricId1",
CollectionTimeScope::point,
CollectionDuration(Milliseconds(0u))}}});
@@ -254,7 +261,7 @@
{
metricParams.emplace_back(
LabeledMetricParameters{{},
- OperationType::single,
+ OperationType::avg,
"MetricId1",
CollectionTimeScope::point,
CollectionDuration(Milliseconds(0u))});
@@ -369,9 +376,8 @@
};
INSTANTIATE_TEST_SUITE_P(_, TestReportManagerWithAggregationOperationType,
- Values(OperationType::single, OperationType::max,
- OperationType::min, OperationType::avg,
- OperationType::sum));
+ Values(OperationType::max, OperationType::min,
+ OperationType::avg, OperationType::sum));
TEST_P(TestReportManagerWithAggregationOperationType,
addReportWithDifferentOperationTypes)