Review fixes for 'Created metric class'
- Changed metric to_json to dumpConfiguration returning LabeledTuple
- LabeledTuple can be created and assigned directly to json
- LabeledTuple can be readed from json using json.get<LabeledTuple>
- Added PrintTo for LabeledMetricParams, LabeledSensorParams
- Added helper method expectMake to ReportFactoryMock
- sensorPaths are serialized to tuple<service, path> instead of single
field with service and path separated via ':'
- Changed configuration version from 1 to 2
Change-Id: I7c45fb584687172f88fd549a93329264793b0b8e
Signed-off-by: Krzysztof Grobelny <krzysztof.grobelny@intel.com>
diff --git a/src/utils/tstring.hpp b/src/utils/tstring.hpp
index 7fcddb3..f0a401f 100644
--- a/src/utils/tstring.hpp
+++ b/src/utils/tstring.hpp
@@ -5,32 +5,56 @@
namespace utils
{
-namespace literals
-{
-
-constexpr char id[] = "id";
-constexpr char sensorPaths[] = "sensorPaths";
-constexpr char operationType[] = "operationType";
-constexpr char metricMetadata[] = "metricMetadata";
-
-} // namespace literals
-
-template <const char* const V>
-struct Label
-{
- static std::string str()
- {
- return V;
- }
-};
-
namespace tstring
{
-using Id = utils::Label<utils::literals::id>;
-using SensorPaths = utils::Label<utils::literals::sensorPaths>;
-using OperationType = utils::Label<utils::literals::operationType>;
-using MetricMetadata = utils::Label<utils::literals::metricMetadata>;
+struct Id
+{
+ static std::string str()
+ {
+ return "id";
+ }
+};
+
+struct SensorPaths
+{
+ static std::string str()
+ {
+ return "sensorPaths";
+ }
+};
+
+struct OperationType
+{
+ static std::string str()
+ {
+ return "operationType";
+ }
+};
+
+struct MetricMetadata
+{
+ static std::string str()
+ {
+ return "metricMetadata";
+ }
+};
+
+struct Service
+{
+ static std::string str()
+ {
+ return "service";
+ }
+};
+
+struct Path
+{
+ static std::string str()
+ {
+ return "path";
+ }
+};
} // namespace tstring
} // namespace utils