created AddReportFutureVersion dbus method
New method will support CollectionTimeScope, CollectionDuration
In order to make not breaking interface changes bmcweb will switch to
AddReportFutureVersion, then AddReport will be changed to match
AddReportFutureVersion, then redfish will switch back to use AddReport,
then AddReportFutureVersion will be removed.
Tested:
- Verified that current version of bmcweb works fine with old API
Signed-off-by: Krzysztof Grobelny <krzysztof.grobelny@intel.com>
Change-Id: I51a9b7fb2f4da5b8d2f688ccd5e93710352b1ac7
diff --git a/src/report_manager.cpp b/src/report_manager.cpp
index 24087c3..e40d9a4 100644
--- a/src/report_manager.cpp
+++ b/src/report_manager.cpp
@@ -1,7 +1,7 @@
#include "report_manager.hpp"
-#include "interfaces/types.hpp"
#include "report.hpp"
+#include "types/report_types.hpp"
#include "utils/conversion.hpp"
#include "utils/transform.hpp"
@@ -11,6 +11,19 @@
#include <stdexcept>
#include <system_error>
+ReadingParameters
+ convertToReadingParameters(ReadingParametersPastVersion params)
+{
+ return utils::transform(params, [](const auto& param) {
+ using namespace std::chrono_literals;
+
+ return ReadingParameters::value_type(
+ std::vector{{std::get<0>(param)}}, std::get<1>(param),
+ std::get<2>(param), std::get<3>(param),
+ utils::enumToString(CollectionTimeScope::point), 0u);
+ });
+}
+
ReportManager::ReportManager(
std::unique_ptr<interfaces::ReportFactory> reportFactoryIn,
std::unique_ptr<interfaces::JsonStorage> reportStorageIn,
@@ -42,11 +55,29 @@
const bool emitsReadingsUpdate,
const bool logToMetricReportsCollection,
const uint64_t interval,
- ReadingParameters metricParams) {
+ ReadingParametersPastVersion metricParams) {
return addReport(yield, reportName, reportingType,
emitsReadingsUpdate,
logToMetricReportsCollection,
- std::chrono::milliseconds(interval),
+ Milliseconds(interval),
+ convertToReadingParameters(
+ std::move(metricParams)))
+ .getPath();
+ });
+
+ dbusIface.register_method(
+ "AddReportFutureVersion",
+ [this](boost::asio::yield_context& yield,
+ const std::string& reportName,
+ const std::string& reportingType,
+ const bool emitsReadingsUpdate,
+ const bool logToMetricReportsCollection,
+ const uint64_t interval,
+ ReadingParameters metricParams) {
+ return addReport(yield, reportName, reportingType,
+ emitsReadingsUpdate,
+ logToMetricReportsCollection,
+ Milliseconds(interval),
std::move(metricParams))
.getPath();
});
@@ -71,10 +102,10 @@
}
}
-void ReportManager::verifyAddReport(const std::string& reportName,
- const std::string& reportingType,
- std::chrono::milliseconds interval,
- const ReadingParameters& readingParams)
+void ReportManager::verifyAddReport(
+ const std::string& reportName, const std::string& reportingType,
+ Milliseconds interval,
+ const std::vector<LabeledMetricParameters>& readingParams)
{
if (reports.size() >= maxReports)
{
@@ -119,9 +150,12 @@
try
{
- for (const auto& item : readingParams)
+ namespace ts = utils::tstring;
+
+ for (const LabeledMetricParameters& item : readingParams)
{
- utils::stringToOperationType(std::get<1>(item));
+ utils::toOperationType(
+ utils::toUnderlying(item.at_label<ts::OperationType>()));
}
}
catch (const std::exception& e)
@@ -134,41 +168,29 @@
interfaces::Report& ReportManager::addReport(
boost::asio::yield_context& yield, const std::string& reportName,
const std::string& reportingType, const bool emitsReadingsUpdate,
- const bool logToMetricReportsCollection, std::chrono::milliseconds interval,
+ const bool logToMetricReportsCollection, Milliseconds interval,
ReadingParameters metricParams)
{
- verifyAddReport(reportName, reportingType, interval, metricParams);
+ auto labeledMetricParams =
+ reportFactory->convertMetricParams(yield, metricParams);
- reports.emplace_back(reportFactory->make(
- yield, reportName, reportingType, emitsReadingsUpdate,
- logToMetricReportsCollection, interval, std::move(metricParams), *this,
- *reportStorage));
- return *reports.back();
+ return addReport(reportName, reportingType, emitsReadingsUpdate,
+ logToMetricReportsCollection, interval,
+ std::move(labeledMetricParams));
}
interfaces::Report& ReportManager::addReport(
const std::string& reportName, const std::string& reportingType,
const bool emitsReadingsUpdate, const bool logToMetricReportsCollection,
- std::chrono::milliseconds interval,
+ Milliseconds interval,
std::vector<LabeledMetricParameters> labeledMetricParams)
{
- auto metricParams = utils::transform(
- labeledMetricParams, [](const LabeledMetricParameters& param) {
- using namespace utils::tstring;
+ verifyAddReport(reportName, reportingType, interval, labeledMetricParams);
- return ReadingParameters::value_type(
- sdbusplus::message::object_path(
- param.at_index<0>().at_label<Path>()),
- utils::enumToString(param.at_index<1>()), param.at_index<2>(),
- param.at_index<3>());
- });
-
- verifyAddReport(reportName, reportingType, interval, metricParams);
-
- reports.emplace_back(reportFactory->make(
- reportName, reportingType, emitsReadingsUpdate,
- logToMetricReportsCollection, interval, std::move(metricParams), *this,
- *reportStorage, labeledMetricParams));
+ reports.emplace_back(
+ reportFactory->make(reportName, reportingType, emitsReadingsUpdate,
+ logToMetricReportsCollection, interval, *this,
+ *reportStorage, labeledMetricParams));
return *reports.back();
}
@@ -200,8 +222,7 @@
.get<std::vector<LabeledMetricParameters>>();
addReport(name, reportingType, emitsReadingsSignal,
- logToMetricReportsCollection,
- std::chrono::milliseconds(interval),
+ logToMetricReportsCollection, Milliseconds(interval),
std::move(readingParameters));
}
catch (const std::exception& e)