projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finalizing Python3 migration
[osm/vim-emu.git]
/
src
/
emuvim
/
dcemulator
/
monitoring.py
diff --git
a/src/emuvim/dcemulator/monitoring.py
b/src/emuvim/dcemulator/monitoring.py
index
6ed87cb
..
34b3bab
100755
(executable)
--- 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(
\r
metric, vnf_name, vnf_interface)
\r
\r
return 'Error stopping monitoring metric: {0} on {1}:{2}'.format(
\r
metric, vnf_name, vnf_interface)
\r
\r
-
\r
-# get all metrics defined in the list and export it to Prometheus
\r
-
\r
def get_flow_metrics(self):
\r
def get_flow_metrics(self):
\r
+ """
\r
+ Get all metrics defined in the list and export it to Prometheus.
\r
+ """
\r
while self.start_monitoring:
\r
\r
self.monitor_flow_lock.acquire()
\r
while self.start_monitoring:
\r
\r
self.monitor_flow_lock.acquire()
\r
@@
-359,7
+359,7
@@
class DCNetworkMonitor():
'stats/flow', dpid=flow_dict['switch_dpid'], data=data)
\r
if isinstance(ret, dict):
\r
flow_stat_dict = ret
\r
'stats/flow', dpid=flow_dict['switch_dpid'], data=data)
\r
if isinstance(ret, dict):
\r
flow_stat_dict = ret
\r
- elif isinstance(ret,
basestring
):
\r
+ elif isinstance(ret,
str
):
\r
flow_stat_dict = ast.literal_eval(ret.rstrip())
\r
else:
\r
flow_stat_dict = None
\r
flow_stat_dict = ast.literal_eval(ret.rstrip())
\r
else:
\r
flow_stat_dict = None
\r
@@
-395,7
+395,7
@@
class DCNetworkMonitor():
ret = self.net.ryu_REST('stats/port', dpid=dpid)
\r
if isinstance(ret, dict):
\r
port_stat_dict = ret
\r
ret = self.net.ryu_REST('stats/port', dpid=dpid)
\r
if isinstance(ret, dict):
\r
port_stat_dict = ret
\r
- elif isinstance(ret,
basestring
):
\r
+ elif isinstance(ret,
str
):
\r
port_stat_dict = ast.literal_eval(ret.rstrip())
\r
else:
\r
port_stat_dict = None
\r
port_stat_dict = ast.literal_eval(ret.rstrip())
\r
else:
\r
port_stat_dict = None
\r