metric type

Signed-off-by: hwassman <[email protected]>

Author: Helene

source/queryHandler/Topo.py

@@ -36,6 +36,7 @@ class Topo(object):
     def __init__(self, jsonStr=None):
         self.topo = jsonStr
         self.__metricsDef = defaultdict(dict)   # metrics dictionary, per sensor for all elements in the metadata
+        self.__metricsType = defaultdict(dict)   # metrics types dictionary
         self.__levels = defaultdict(dict)       # component level priority dictionary, per sensor
         self.__ids = {}                                # fieldIds dictionary
         self.__groupKeys = {}
@@ -62,15 +63,15 @@ def _processMetadata(self, metadata):
                 _components = self.__compTree[label]['componentsMap']
                 _filters = self.__compTree[label]['filtersMap']
 
-            self._parse_topoJSONStr(self.__metricsDef, self.__levels, self.__ids, self.__groupKeys, _components, _filters, metaStr)
+            self._parse_topoJSONStr(self.__metricsDef, self.__metricsType, self.__levels, self.__ids, self.__groupKeys, _components, _filters, metaStr)
             tree_entry = {}
             tree_entry['componentsMap'] = _components
             tree_entry['filtersMap'] = _filters
 
             # comp_tree[label] = tree_entry
             self.__compTree[label] = tree_entry
 
-    def _parse_topoJSONStr(self, metrics, levels, ids, groupKeys, components, filters, metaStr):
+    def _parse_topoJSONStr(self, metrics, metricsType, levels, ids, groupKeys, components, filters, metaStr):
         '''
         This function parses the 'node' or 'attribute' object found in the given JSON string (metaStr) in
         the componets or metrics dictionary. Also the used metric filters (per sensor) will be stored
@@ -80,6 +81,7 @@ def _parse_topoJSONStr(self, metrics, levels, ids, groupKeys, components, filter
 
         field_value = metaStr['fieldLabel']
         field_name = metaStr['fieldName']
+        field_type = metaStr['fieldSemantics']
 
         # check if entity is a component
         if metaStr['type'] == 'node':
@@ -88,7 +90,7 @@ def _parse_topoJSONStr(self, metrics, levels, ids, groupKeys, components, filter
             # check if metaStr includes next level metaStr
             if 'keys' in metaStr and len(metaStr['keys']) > 0:
                 for metaKey in metaStr['keys']:
-                    self._parse_topoJSONStr(metrics, levels, ids, groupKeys, components, filters, metaKey)
+                    self._parse_topoJSONStr(metrics, metricsType, levels, ids, groupKeys, components, filters, metaKey)
 
         # check if entity is a metric
         elif metaStr['type'] == 'attribute':
@@ -100,6 +102,7 @@ def _parse_topoJSONStr(self, metrics, levels, ids, groupKeys, components, filter
 
             if field_name not in iterval(metrics[sensor]):
                 metrics[sensor][field_id] = field_name
+                metricsType[field_name] = field_type
 
             if groupKey not in groupKeys:
                 # parse sensor relevant data f.e. groupKey, filters, levels
@@ -177,6 +180,11 @@ def metricsSpec(self):
         ''' Returns all defined metrics as dictionary of (metric_name : metric_id) items '''
         return self.__metricsDef
 
+    @property
+    def metricsType(self):
+        ''' Returns a dictionary of (metric_name : metric_type) items '''
+        return self.__metricsType
+
     @property
     def getAllEnabledMetricsNames(self):
         ''' Returns list of all found metrics names'''