Merge pull request #97 from altor/master

fix: dont dont tag influx data with ratio

Author: altor

powerapi/__init__.py

@@ -27,4 +27,4 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-__version__ = "0.6.8"
+__version__ = "0.6.9"

powerapi/report_model/power_model.py

@@ -84,7 +84,11 @@ def to_influxdb(self, serialized_report) -> Dict:
                 'target': serialized_report['target']}
 
         for name in serialized_report['metadata'].keys():
-            tags[name] = serialized_report['metadata'][name]
+            if name == 'ratio':
+                pass
+            else:
+                tags[name] = serialized_report['metadata'][name]
+            
 
         return {
             'measurement': 'power_consumption',

tests/unit/report_model/test_power_report_model.py

@@ -0,0 +1,50 @@
+# Copyright (c) 2018, INRIA
+# Copyright (c) 2018, University of Lille
+# All rights reserved.
+
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+
+# * Neither the name of the copyright holder nor the names of its
+#   contributors may be used to endorse or promote products derived from
+#   this software without specific prior written permission.
+
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+import pytest
+import datetime
+from powerapi.report_model import PowerModel
+
+##########
+# INFLUX #
+##########
+def test_convert_to_influxDB_format_dont_keep_ratio_in_tag():
+    serialized_report = {
+        'sensor': 'sensor_name',
+        'target': 'target_name',
+        'timestamp': datetime.datetime.now().timestamp(),
+        'power': 3,
+        'metadata': {
+            'scope': 2,
+            'socket': 1,
+            'formula': 'formuna_name',
+            'ratio': 3}
+    }
+    model = PowerModel()
+    influxdb_format = model.to_influxdb(serialized_report)
+    assert 'ratio' not in influxdb_format['tags']