X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fdcemulator%2Fmonitoring.py;h=34b3bab8f0f5280379d77053e210303d5aef47d4;hb=efdda12a005a63a449ea7afb9baab1743b4d04ab;hp=6ed87cb97b00a245c7d06d2cf2b66be035d072df;hpb=72f09885db3935e77901c3dee132cb176b927c7b;p=osm%2Fvim-emu.git diff --git a/src/emuvim/dcemulator/monitoring.py b/src/emuvim/dcemulator/monitoring.py index 6ed87cb..34b3bab 100755 --- a/src/emuvim/dcemulator/monitoring.py +++ b/src/emuvim/dcemulator/monitoring.py @@ -335,10 +335,10 @@ class DCNetworkMonitor(): return 'Error stopping monitoring metric: {0} on {1}:{2}'.format( metric, vnf_name, vnf_interface) - -# get all metrics defined in the list and export it to Prometheus - def get_flow_metrics(self): + """ + Get all metrics defined in the list and export it to Prometheus. + """ while self.start_monitoring: self.monitor_flow_lock.acquire() @@ -359,7 +359,7 @@ class DCNetworkMonitor(): 'stats/flow', dpid=flow_dict['switch_dpid'], data=data) if isinstance(ret, dict): flow_stat_dict = ret - elif isinstance(ret, basestring): + elif isinstance(ret, str): flow_stat_dict = ast.literal_eval(ret.rstrip()) else: flow_stat_dict = None @@ -395,7 +395,7 @@ class DCNetworkMonitor(): ret = self.net.ryu_REST('stats/port', dpid=dpid) if isinstance(ret, dict): port_stat_dict = ret - elif isinstance(ret, basestring): + elif isinstance(ret, str): port_stat_dict = ast.literal_eval(ret.rstrip()) else: port_stat_dict = None