X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fdcemulator%2Fmonitoring.py;h=f34b37ce4676f8f26abd5e5042803a0931a399c7;hb=332940d4e4c7e6155bbc1a21d5f13cd71214b539;hp=ab77c39f702d99f84772bdeee69f2d1ef93f1754;hpb=78f01d36a61761680c74af6fb8ae91a2b4315406;p=osm%2Fvim-emu.git

diff --git a/src/emuvim/dcemulator/monitoring.py b/src/emuvim/dcemulator/monitoring.py
index ab77c39..f34b37c 100755
--- a/src/emuvim/dcemulator/monitoring.py
+++ b/src/emuvim/dcemulator/monitoring.py
@@ -23,11 +23,8 @@ class to read openflow stats from the Ryu controller of the DCNetwork
 class DCNetworkMonitor():
     def __init__(self, net):
         self.net = net
-        # link to Ryu REST_API
-        ryu_ip = '0.0.0.0'
-        ryu_port = '8080'
-        self.ryu_REST_api = 'http://{0}:{1}'.format(ryu_ip, ryu_port)
-        prometheus_ip = '0.0.0.0'
+
+        prometheus_ip = '127.0.0.1'
         prometheus_port = '9090'
         self.prometheus_REST_api = 'http://{0}:{1}'.format(prometheus_ip, prometheus_port)
 
@@ -78,8 +75,8 @@ class DCNetworkMonitor():
         self.monitor_flow_thread.start()
 
         # helper tools
-        self.pushgateway_process = self.start_PushGateway()
-        self.prometheus_process = self.start_Prometheus()
+        #self.pushgateway_process = self.start_PushGateway()
+        #self.prometheus_process = self.start_Prometheus()
         self.cadvisor_process = self.start_cadvisor()
 
     # first set some parameters, before measurement can start
@@ -142,6 +139,28 @@ class DCNetworkMonitor():
             logging.exception("setup_metric error.")
             return ex.message
 
+    def stop_flow(self, vnf_name, vnf_interface=None, metric=None, cookie=0):
+        for flow_dict in self.flow_metrics:
+            if flow_dict['vnf_name'] == vnf_name and flow_dict['vnf_interface'] == vnf_interface \
+                    and flow_dict['metric_key'] == metric and flow_dict['cookie'] == cookie:
+
+                self.monitor_flow_lock.acquire()
+
+                self.flow_metrics.remove(flow_dict)
+
+                for collector in self.registry._collectors:
+                    if (vnf_name, vnf_interface, cookie) in collector._metrics:
+                        #logging.info('2 name:{0} labels:{1} metrics:{2}'.format(collector._name, collector._labelnames,
+                        #                                                        collector._metrics))
+                        collector.remove(vnf_name, vnf_interface, cookie)
+
+                delete_from_gateway(self.pushgateway, job='sonemu-SDNcontroller')
+
+                self.monitor_flow_lock.release()
+
+                logging.info('Stopped monitoring flow {3}: {2} on {0}:{1}'.format(vnf_name, vnf_interface, metric, cookie))
+                return 'Stopped monitoring flow {3}: {2} on {0}:{1}'.format(vnf_name, vnf_interface, metric, cookie)
+
 
     # first set some parameters, before measurement can start
     def setup_metric(self, vnf_name, vnf_interface=None, metric='tx_packets'):
@@ -297,10 +316,10 @@ class DCNetworkMonitor():
 
 
                 # query Ryu
-                ret = self.REST_cmd('stats/flow', flow_dict['switch_dpid'], data=data)
+                ret = self.net.ryu_REST('stats/flow', dpid=flow_dict['switch_dpid'], data=data)
                 flow_stat_dict = ast.literal_eval(ret)
 
-                logging.info('received flow stat:{0} '.format(flow_stat_dict))
+                #logging.info('received flow stat:{0} '.format(flow_stat_dict))
                 self.set_flow_metric(flow_dict, flow_stat_dict)
 
             self.monitor_flow_lock.release()
@@ -318,7 +337,7 @@ class DCNetworkMonitor():
             for dpid in dpid_set:
 
                 # query Ryu
-                ret = self.REST_cmd('stats/port', dpid)
+                ret = self.net.ryu_REST('stats/port', dpid=dpid)
                 port_stat_dict = ast.literal_eval(ret)
 
                 metric_list = [metric_dict for metric_dict in self.network_metrics
@@ -408,17 +427,6 @@ class DCNetworkMonitor():
         #logging.exception('metric {0} not found on {1}:{2}'.format(metric_key, vnf_name, vnf_interface))
         #return 'metric {0} not found on {1}:{2}'.format(metric_key, vnf_name, vnf_interface)
 
-    def REST_cmd(self, prefix, dpid, data=None):
-        url = self.ryu_REST_api + '/' + str(prefix) + '/' + str(dpid)
-        if data:
-            logging.info('POST: {0}'.format(str(data)))
-            req = urllib2.Request(url, str(data))
-        else:
-            req = urllib2.Request(url)
-
-        ret = urllib2.urlopen(req).read()
-        return ret
-
     def query_Prometheus(self, query):
         '''
         escaped_chars='{}[]'
@@ -488,6 +496,7 @@ class DCNetworkMonitor():
         self.monitor_thread.join()
         self.monitor_flow_thread.join()
 
+        '''
         if self.prometheus_process is not None:
             logging.info('stopping prometheus container')
             self.prometheus_process.terminate()
@@ -499,6 +508,7 @@ class DCNetworkMonitor():
             self.pushgateway_process.terminate()
             self.pushgateway_process.kill()
             self._stop_container('pushgateway')
+        '''
 
         if self.cadvisor_process is not None:
             logging.info('stopping cadvisor container')