X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fdcemulator%2Fmonitoring.py;h=875913f90fe5e63535dab7b575a09eb8bef51fe8;hb=6efa9137f3fb89ac42351b0fd3cc76042b4059b0;hp=2c07ab5ef4a7a9693f31205e8fb32cad764533b4;hpb=3fc139384794a089e702ecdab035390b9f63a455;p=osm%2Fvim-emu.git

diff --git a/src/emuvim/dcemulator/monitoring.py b/src/emuvim/dcemulator/monitoring.py
index 2c07ab5..875913f 100755
--- a/src/emuvim/dcemulator/monitoring.py
+++ b/src/emuvim/dcemulator/monitoring.py
@@ -27,6 +27,7 @@ partner consortium (www.sonata-nfv.eu).
 """
 
 import logging
+import sys
 from mininet.node import  OVSSwitch
 import ast
 import time
@@ -43,23 +44,16 @@ logging.basicConfig(level=logging.INFO)
 class to read openflow stats from the Ryu controller of the DCNetwork
 """
 
+PUSHGATEWAY_PORT = 9091
+# we cannot use port 8080 because ryu-ofrest api  is already using that one
+CADVISOR_PORT = 8081
+
 class DCNetworkMonitor():
     def __init__(self, net):
         self.net = net
 
-        # TODO: these global variables should be part of a config file?
-        '''
-        # prometheus is started outside of son-emu
-        prometheus_ip = '127.0.0.1'
-        prometheus_port = '9090'
-        self.prometheus_REST_api = 'http://{0}:{1}'.format(prometheus_ip, prometheus_port)
-        '''
-        # helper variables to calculate the metrics
-        # pushgateway is started outside of son-emu and son-emu is started with net=host
-        # so localhost:9091 works
-        self.pushgateway = 'localhost:9091'
-        # when sdk is started with docker-compose, we could use
-        # self.pushgateway = 'pushgateway:9091'
+        # pushgateway address
+        self.pushgateway = 'localhost:{0}'.format(PUSHGATEWAY_PORT)
 
         # supported Prometheus metrics
         self.registry = CollectorRegistry()
@@ -102,7 +96,9 @@ class DCNetworkMonitor():
         self.monitor_flow_thread.start()
 
         # helper tools
-        # cAdvisor, Prometheus pushgateway and DB are started as external container, outside of son-emu
+        # cAdvisor, Prometheus pushgateway are started as external container, to gather monitoring metric in son-emu
+        self.pushgateway_process = self.start_PushGateway()
+        self.cadvisor_process = self.start_cAdvisor()
 
 
     # first set some parameters, before measurement can start
@@ -358,7 +354,13 @@ class DCNetworkMonitor():
 
                 # query Ryu
                 ret = self.net.ryu_REST('stats/flow', dpid=flow_dict['switch_dpid'], data=data)
-                flow_stat_dict = ast.literal_eval(ret)
+                if isinstance(ret, dict):
+                    flow_stat_dict = ret
+                elif isinstance(ret, basestring):
+                    flow_stat_dict = ast.literal_eval(ret.rstrip())
+                else:
+                    flow_stat_dict = None
+
                 logging.debug('received flow stat:{0} '.format(flow_stat_dict))
 
                 self.set_flow_metric(flow_dict, flow_stat_dict)
@@ -447,13 +449,6 @@ class DCNetworkMonitor():
         previous_monitor_time = metric_dict['previous_monitor_time']
         cookie = metric_dict['cookie']
 
-        # TODO aggregate all found flow stats
-        #flow_stat = flow_stat_dict[str(switch_dpid)][0]
-        #if 'bytes' in metric_key:
-        #    counter = flow_stat['byte_count']
-        #elif 'packet' in metric_key:
-        #    counter = flow_stat['packet_count']
-
         counter = 0
         for flow_stat in flow_stat_dict[str(switch_dpid)]:
             if 'bytes' in metric_key:
@@ -467,7 +462,10 @@ class DCNetworkMonitor():
         self.prom_metrics[metric_dict['metric_key']]. \
             labels({'vnf_name': vnf_name, 'vnf_interface': vnf_interface, 'flow_id': cookie}). \
             set(counter)
-        pushadd_to_gateway(self.pushgateway, job='sonemu-SDNcontroller', registry=self.registry)
+        try:
+            pushadd_to_gateway(self.pushgateway, job='sonemu-SDNcontroller', registry=self.registry)
+        except Exception, e:
+            logging.warning("Pushgateway not reachable: {0} {1}".format(Exception, e))
 
 
     def start_Prometheus(self, port=9090):
@@ -484,7 +482,7 @@ class DCNetworkMonitor():
         logging.info('Start Prometheus container {0}'.format(cmd))
         return Popen(cmd)
 
-    def start_PushGateway(self, port=9091):
+    def start_PushGateway(self, port=PUSHGATEWAY_PORT):
         cmd = ["docker",
                "run",
                "-d",
@@ -496,7 +494,7 @@ class DCNetworkMonitor():
         logging.info('Start Prometheus Push Gateway container {0}'.format(cmd))
         return Popen(cmd)
 
-    def start_cadvisor(self, port=8090):
+    def start_cAdvisor(self, port=CADVISOR_PORT):
         cmd = ["docker",
                "run",
                "--rm",
@@ -524,7 +522,7 @@ class DCNetworkMonitor():
             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()
@@ -536,7 +534,6 @@ class DCNetworkMonitor():
             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