projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix this later
[osm/vim-emu.git]
/
src
/
emuvim
/
dcemulator
/
monitoring.py
diff --git
a/src/emuvim/dcemulator/monitoring.py
b/src/emuvim/dcemulator/monitoring.py
index
ce24a40
..
78b8007
100755
(executable)
--- a/
src/emuvim/dcemulator/monitoring.py
+++ b/
src/emuvim/dcemulator/monitoring.py
@@
-202,7
+202,7
@@
class DCNetworkMonitor():
network_metric = {}
\r
\r
# check if port is specified (vnf:port)
\r
network_metric = {}
\r
\r
# check if port is specified (vnf:port)
\r
- if vnf_interface is None:
\r
+ if vnf_interface is None
or vnf_interface == ''
:
\r
# take first interface by default
\r
connected_sw = self.net.DCNetwork_graph.neighbors(vnf_name)[0]
\r
link_dict = self.net.DCNetwork_graph[vnf_name][connected_sw]
\r
# take first interface by default
\r
connected_sw = self.net.DCNetwork_graph.neighbors(vnf_name)[0]
\r
link_dict = self.net.DCNetwork_graph[vnf_name][connected_sw]
\r
@@
-404,8
+404,10
@@
class DCNetworkMonitor():
previous_measurement = metric_dict['previous_measurement']
\r
previous_monitor_time = metric_dict['previous_monitor_time']
\r
mon_port = metric_dict['mon_port']
\r
previous_measurement = metric_dict['previous_measurement']
\r
previous_monitor_time = metric_dict['previous_monitor_time']
\r
mon_port = metric_dict['mon_port']
\r
-
\r
for port_stat in port_stat_dict[str(switch_dpid)]:
\r
for port_stat in port_stat_dict[str(switch_dpid)]:
\r
+ # ovs output also gives back 'LOCAL' port
\r
+ if port_stat['port_no'] == 'LOCAL':
\r
+ continue
\r
if int(port_stat['port_no']) == int(mon_port):
\r
port_uptime = port_stat['duration_sec'] + port_stat['duration_nsec'] * 10 ** (-9)
\r
this_measurement = int(port_stat[metric_key])
\r
if int(port_stat['port_no']) == int(mon_port):
\r
port_uptime = port_stat['duration_sec'] + port_stat['duration_nsec'] * 10 ** (-9)
\r
this_measurement = int(port_stat[metric_key])
\r
@@
-502,7
+504,11
@@
class DCNetworkMonitor():
"--publish={0}:8080".format(port),
\r
"--name=cadvisor",
\r
"--label",'com.containernet=""',
\r
"--publish={0}:8080".format(port),
\r
"--name=cadvisor",
\r
"--label",'com.containernet=""',
\r
- "google/cadvisor:latest"
\r
+ "--detach=true",
\r
+ "google/cadvisor:latest",
\r
+ #"--storage_duration=1m0s",
\r
+ #"--allow_dynamic_housekeeping=true",
\r
+ #"--housekeeping_interval=1s",
\r
]
\r
logging.info('Start cAdvisor container {0}'.format(cmd))
\r
return Popen(cmd)
\r
]
\r
logging.info('Start cAdvisor container {0}'.format(cmd))
\r
return Popen(cmd)
\r