Merge pull request #247 from Helene/remove_topostr

Remove (topo) jsonstr from Topo

Author: Helene

source/metadata.py

@@ -130,14 +130,15 @@ def __initializeTables(self):
             raise ValueError(MSG['NoSensorConfigData'])
         MAX_ATTEMPTS_COUNT = 3
         for attempt in range(1, MAX_ATTEMPTS_COUNT + 1):
-            self.__metaData = Topo(self.qh.getTopology())
-            if not (self.metaData and self.metaData.topo):
+            topoStr = self.qh.getTopology()
+            if not topoStr:
                 if attempt > MAX_ATTEMPTS_COUNT:
                     break
                 # if no data returned because of the REST HTTP server is still starting, sleep and retry (max 3 times)
                 self.logger.warning(MSG['NoDataStartNextAttempt'].format(attempt, MAX_ATTEMPTS_COUNT))
                 sleep(self.sleepTime)
             else:
+                self.__metaData = Topo(topoStr)
                 foundItems = len(self.metaData.allParents) - 1
                 sensors = self.metaData.sensorsSpec.keys()
                 self.logger.info(MSG['MetaSuccess'])
@@ -183,10 +184,11 @@ def update(self, refresh_all=False):
         if refresh_all:
             self.__sensorsConf = SensorConfig.readSensorsConfigFromMMSDRFS(self.logger)
 
-        self.__metaData = Topo(self.qh.getTopology())
-        if not (self.metaData and self.metaData.topo):
+        topoStr = self.qh.getTopology()
+        if not topoStr:
             self.logger.error(MSG['NoData'])  # Please check the pmcollector is properly configured and running.
             raise cherrypy.HTTPError(404, ERR[404])
+        self.__metaData = Topo(topoStr)
         self.logger.details(MSG['MetaSuccess'])
         self.logger.debug(MSG['ReceivAttrValues'].format('parents', ", ".join(self.metaData.allParents)))
         return ({'msg': MSG['MetaSuccess']})

source/queryHandler/Topo.py

@@ -37,15 +37,14 @@ 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 = {}
         self.__compTree = {}
-        if self.topo:
-            self._processMetadata(self.topo)
+        if jsonStr:
+            self._processMetadata(jsonStr)
 
     @get_runtime_statistics(enabled=analytics.runtime_profiling)
     def _processMetadata(self, metadata):