port 8081 for cadvisor bcause 8080 is already taken by ryu rest api
diff --git a/src/emuvim/dcemulator/monitoring.py b/src/emuvim/dcemulator/monitoring.py
index 2e1e041..875913f 100755
--- a/src/emuvim/dcemulator/monitoring.py
+++ b/src/emuvim/dcemulator/monitoring.py
@@ -45,7 +45,8 @@
"""
PUSHGATEWAY_PORT = 9091
-CADVISOR_PORT = 8080
+# we cannot use port 8080 because ryu-ofrest api is already using that one
+CADVISOR_PORT = 8081
class DCNetworkMonitor():
def __init__(self, net):
@@ -96,8 +97,8 @@
# helper tools
# cAdvisor, Prometheus pushgateway are started as external container, to gather monitoring metric in son-emu
- self.start_PushGateway()
- self.start_cAdvisor()
+ self.pushgateway_process = self.start_PushGateway()
+ self.cadvisor_process = self.start_cAdvisor()
# first set some parameters, before measurement can start
@@ -467,7 +468,7 @@
logging.warning("Pushgateway not reachable: {0} {1}".format(Exception, e))
- def start_Prometheus(self, port=CADVISOR_PORT):
+ def start_Prometheus(self, port=9090):
# prometheus.yml configuration file is located in the same directory as this file
cmd = ["docker",
"run",
@@ -493,7 +494,7 @@
logging.info('Start Prometheus Push Gateway container {0}'.format(cmd))
return Popen(cmd)
- def start_cAdvisor(self, port=8080):
+ def start_cAdvisor(self, port=CADVISOR_PORT):
cmd = ["docker",
"run",
"--rm",
@@ -521,7 +522,7 @@
self.prometheus_process.terminate()
self.prometheus_process.kill()
self._stop_container('prometheus')
-
+ '''
if self.pushgateway_process is not None:
logging.info('stopping pushgateway container')
self.pushgateway_process.terminate()
@@ -533,7 +534,6 @@
self.cadvisor_process.terminate()
self.cadvisor_process.kill()
self._stop_container('cadvisor')
- '''
def switch_tx_rx(self,metric=''):
# when monitoring vnfs, the tx of the datacenter switch is actually the rx of the vnf