X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=src%2Femuvim%2Fdcemulator%2Fmonitoring.py;h=f8280c354b48c079406354c933518dc1fe7363b8;hp=6531bebf919142796f1ea87edb808336d6e952c1;hb=refs%2Fchanges%2F21%2F6821%2F3;hpb=1603244abb424f6a2779ced2328231bca0cfab62

diff --git a/src/emuvim/dcemulator/monitoring.py b/src/emuvim/dcemulator/monitoring.py
index 6531beb..f8280c3 100755
--- a/src/emuvim/dcemulator/monitoring.py
+++ b/src/emuvim/dcemulator/monitoring.py
@@ -1,47 +1,75 @@
-__author__ = 'Administrator'
-
-import urllib2
+# Copyright (c) 2015 SONATA-NFV and Paderborn University
+# ALL RIGHTS RESERVED.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Neither the name of the SONATA-NFV, Paderborn University
+# nor the names of its contributors may be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+#
+# This work has been performed in the framework of the SONATA project,
+# funded by the European Commission under Grant number 671517 through
+# the Horizon 2020 and 5G-PPP programmes. The authors would like to
+# acknowledge the contributions of their colleagues of the SONATA
+# partner consortium (www.sonata-nfv.eu).
 import logging
-from mininet.node import  OVSSwitch
+from mininet.node import OVSSwitch
 import ast
 import time
-from prometheus_client import start_http_server, Summary, Histogram, Gauge, Counter, REGISTRY, CollectorRegistry, \
-    pushadd_to_gateway, push_to_gateway, delete_from_gateway
+from prometheus_client import Gauge, CollectorRegistry, \
+    pushadd_to_gateway, delete_from_gateway
 import threading
-from subprocess import Popen, PIPE
+from subprocess import Popen
 import os
+import docker
+import json
+from copy import deepcopy
 
-logging.basicConfig(level=logging.INFO)
+logging.basicConfig()
 
 """
 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
+
+COOKIE_MASK = 0xffffffff
+
+
 class DCNetworkMonitor():
     def __init__(self, net):
         self.net = net
-        # link to Ryu REST_API
-        self.ip = '0.0.0.0'
-        self.port = '8080'
-        self.REST_api = 'http://{0}:{1}'.format(self.ip,self.port)
-
-        # helper variables to calculate the metrics
-        self.pushgateway = 'localhost:9091'
-        # Start up the server to expose the metrics to Prometheus.
-        #start_http_server(8000)
+        self.dockercli = docker.from_env()
+
+        # pushgateway address
+        self.pushgateway = 'localhost:{0}'.format(PUSHGATEWAY_PORT)
+
         # supported Prometheus metrics
         self.registry = CollectorRegistry()
         self.prom_tx_packet_count = Gauge('sonemu_tx_count_packets', 'Total number of packets sent',
-                                          ['vnf_name', 'vnf_interface'], registry=self.registry)
+                                          ['vnf_name', 'vnf_interface', 'flow_id'], registry=self.registry)
         self.prom_rx_packet_count = Gauge('sonemu_rx_count_packets', 'Total number of packets received',
-                                          ['vnf_name', 'vnf_interface'], registry=self.registry)
+                                          ['vnf_name', 'vnf_interface', 'flow_id'], registry=self.registry)
         self.prom_tx_byte_count = Gauge('sonemu_tx_count_bytes', 'Total number of bytes sent',
-                                        ['vnf_name', 'vnf_interface'], registry=self.registry)
+                                        ['vnf_name', 'vnf_interface', 'flow_id'], registry=self.registry)
         self.prom_rx_byte_count = Gauge('sonemu_rx_count_bytes', 'Total number of bytes received',
-                                        ['vnf_name', 'vnf_interface'], registry=self.registry)
+                                        ['vnf_name', 'vnf_interface', 'flow_id'], registry=self.registry)
 
-        self.prom_metrics={'tx_packets':self.prom_tx_packet_count, 'rx_packets':self.prom_rx_packet_count,
-                           'tx_bytes':self.prom_tx_byte_count,'rx_bytes':self.prom_rx_byte_count}
+        self.prom_metrics = {'tx_packets': self.prom_tx_packet_count, 'rx_packets': self.prom_rx_packet_count,
+                             'tx_bytes': self.prom_tx_byte_count, 'rx_bytes': self.prom_rx_byte_count}
 
         # list of installed metrics to monitor
         # each entry can contain this data
@@ -57,25 +85,134 @@ class DCNetworkMonitor():
         }
         '''
         self.monitor_lock = threading.Lock()
+        self.monitor_flow_lock = threading.Lock()
         self.network_metrics = []
+        self.flow_metrics = []
+        self.skewmon_metrics = {}
 
         # start monitoring thread
         self.start_monitoring = True
         self.monitor_thread = threading.Thread(target=self.get_network_metrics)
         self.monitor_thread.start()
 
+        self.monitor_flow_thread = threading.Thread(
+            target=self.get_flow_metrics)
+        self.monitor_flow_thread.start()
+
         # helper tools
+        # cAdvisor, Prometheus pushgateway are started as external container,
+        # to gather monitoring metric in son-emu
         self.pushgateway_process = self.start_PushGateway()
-        self.prometheus_process = self.start_Prometheus()
-        self.cadvisor_process = self.start_cadvisor()
+        self.cadvisor_process = self.start_cAdvisor()
+
+    # first set some parameters, before measurement can start
+
+    def setup_flow(self, vnf_name, vnf_interface=None,
+                   metric='tx_packets', cookie=0):
+
+        flow_metric = {}
+
+        # check if port is specified (vnf:port)
+        if vnf_interface is None:
+            # take first interface by default
+            connected_sw = self.net.DCNetwork_graph.neighbors(vnf_name)[0]
+            link_dict = self.net.DCNetwork_graph[vnf_name][connected_sw]
+            vnf_interface = link_dict[0]['src_port_id']
+
+        flow_metric['vnf_name'] = vnf_name
+        flow_metric['vnf_interface'] = vnf_interface
+
+        vnf_switch = None
+        for connected_sw in self.net.DCNetwork_graph.neighbors(vnf_name):
+            link_dict = self.net.DCNetwork_graph[vnf_name][connected_sw]
+            for link in link_dict:
+                if link_dict[link]['src_port_id'] == vnf_interface:
+                    # found the right link and connected switch
+                    vnf_switch = connected_sw
+                    flow_metric['mon_port'] = link_dict[link]['dst_port_nr']
+                    break
+
+        if not vnf_switch:
+            logging.exception("vnf switch of {0}:{1} not found!".format(
+                vnf_name, vnf_interface))
+            return "vnf switch of {0}:{1} not found!".format(
+                vnf_name, vnf_interface)
+
+        try:
+            # default port direction to monitor
+            if metric is None:
+                metric = 'tx_packets'
+
+            next_node = self.net.getNodeByName(vnf_switch)
+
+            if not isinstance(next_node, OVSSwitch):
+                logging.info(
+                    "vnf: {0} is not connected to switch".format(vnf_name))
+                return
+
+            flow_metric['previous_measurement'] = 0
+            flow_metric['previous_monitor_time'] = 0
+
+            flow_metric['switch_dpid'] = int(str(next_node.dpid), 16)
+            flow_metric['metric_key'] = metric
+            flow_metric['cookie'] = cookie
+
+            self.monitor_flow_lock.acquire()
+            self.flow_metrics.append(flow_metric)
+            self.monitor_flow_lock.release()
+
+            logging.info('Started monitoring flow:{3} {2} on {0}:{1}'.format(
+                vnf_name, vnf_interface, metric, cookie))
+            return 'Started monitoring flow:{3} {2} on {0}:{1}'.format(
+                vnf_name, vnf_interface, metric, cookie)
+
+        except Exception as ex:
+            logging.exception("setup_metric error.")
+            return ex.message
+
+    def stop_flow(self, vnf_name, vnf_interface=None, metric=None, cookie=0,):
+
+        # check if port is specified (vnf:port)
+        if vnf_interface is None and metric is not None:
+            # take first interface by default
+            connected_sw = self.net.DCNetwork_graph.neighbors(vnf_name)[0]
+            link_dict = self.net.DCNetwork_graph[vnf_name][connected_sw]
+            vnf_interface = link_dict[0]['src_port_id']
+
+        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)
+
+                # set metric to NaN
+                self.prom_metrics[flow_dict['metric_key']]. \
+                    labels(vnf_name=vnf_name, vnf_interface=vnf_interface, flow_id=cookie). \
+                    set(float('nan'))
+
+                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)
+
+        return 'Error stopping monitoring flow: {0} on {1}:{2}'.format(
+            metric, vnf_name, vnf_interface)
 
     # first set some parameters, before measurement can start
+
     def setup_metric(self, vnf_name, vnf_interface=None, metric='tx_packets'):
 
         network_metric = {}
 
         # check if port is specified (vnf:port)
-        if vnf_interface is None:
+        if vnf_interface is None or vnf_interface == '':
             # take first interface by default
             connected_sw = self.net.DCNetwork_graph.neighbors(vnf_name)[0]
             link_dict = self.net.DCNetwork_graph[vnf_name][connected_sw]
@@ -87,16 +224,16 @@ class DCNetworkMonitor():
         for connected_sw in self.net.DCNetwork_graph.neighbors(vnf_name):
             link_dict = self.net.DCNetwork_graph[vnf_name][connected_sw]
             for link in link_dict:
-                # logging.info("{0},{1}".format(link_dict[link],vnf_interface))
                 if link_dict[link]['src_port_id'] == vnf_interface:
                     # found the right link and connected switch
-                    # logging.info("{0},{1}".format(link_dict[link]['src_port_id'], vnf_source_interface))
                     network_metric['mon_port'] = link_dict[link]['dst_port_nr']
                     break
 
         if 'mon_port' not in network_metric:
-            logging.exception("vnf interface {0}:{1} not found!".format(vnf_name,vnf_interface))
-            return "vnf interface {0}:{1} not found!".format(vnf_name,vnf_interface)
+            logging.exception("vnf interface {0}:{1} not found!".format(
+                vnf_name, vnf_interface))
+            return "vnf interface {0}:{1} not found!".format(
+                vnf_name, vnf_interface)
 
         try:
             # default port direction to monitor
@@ -116,32 +253,39 @@ class DCNetworkMonitor():
             next_node = self.net.getNodeByName(vnf_switch)
 
             if not isinstance(next_node, OVSSwitch):
-                logging.info("vnf: {0} is not connected to switch".format(vnf_name))
+                logging.info(
+                    "vnf: {0} is not connected to switch".format(vnf_name))
                 return
 
             network_metric['previous_measurement'] = 0
             network_metric['previous_monitor_time'] = 0
 
-
             network_metric['switch_dpid'] = int(str(next_node.dpid), 16)
             network_metric['metric_key'] = metric
 
             self.monitor_lock.acquire()
-
             self.network_metrics.append(network_metric)
             self.monitor_lock.release()
 
-
-            logging.info('Started monitoring: {2} on {0}:{1}'.format(vnf_name, vnf_interface, metric))
-            return 'Started monitoring: {2} on {0}:{1}'.format(vnf_name, vnf_interface, metric)
+            logging.info('Started monitoring: {2} on {0}:{1}'.format(
+                vnf_name, vnf_interface, metric))
+            return 'Started monitoring: {2} on {0}:{1}'.format(
+                vnf_name, vnf_interface, metric)
 
         except Exception as ex:
             logging.exception("setup_metric error.")
             return ex.message
 
-    def stop_metric(self, vnf_name, vnf_interface, metric):
+    def stop_metric(self, vnf_name, vnf_interface=None, metric=None):
 
-        for metric_dict in self.network_metrics:
+        # check if port is specified (vnf:port)
+        if vnf_interface is None and metric is not None:
+            # take first interface by default
+            connected_sw = self.net.DCNetwork_graph.neighbors(vnf_name)[0]
+            link_dict = self.net.DCNetwork_graph[vnf_name][connected_sw]
+            vnf_interface = link_dict[0]['src_port_id']
+
+        for metric_dict in deepcopy(self.network_metrics):
             if metric_dict['vnf_name'] == vnf_name and metric_dict['vnf_interface'] == vnf_interface \
                     and metric_dict['metric_key'] == metric:
 
@@ -149,153 +293,232 @@ class DCNetworkMonitor():
 
                 self.network_metrics.remove(metric_dict)
 
-                #this removes the complete metric, all labels...
-                #REGISTRY.unregister(self.prom_metrics[metric_dict['metric_key']])
-                #self.registry.unregister(self.prom_metrics[metric_dict['metric_key']])
-
-                for collector in self.registry._collectors :
-                    logging.info('name:{0} labels:{1} metrics:{2}'.format(collector._name, collector._labelnames, collector._metrics))
-                    """
-                    INFO:root:name:sonemu_rx_count_packets
-                    labels:('vnf_name', 'vnf_interface')
-                    metrics:{(u'tsrc', u'output'): < prometheus_client.core.Gauge
-                    object
-                    at
-                    0x7f353447fd10 >}
-                    """
-                    logging.info('{0}'.format(collector._metrics.values()))
-                    #if self.prom_metrics[metric_dict['metric_key']]
-                    if (vnf_name, vnf_interface) in collector._metrics:
-                        logging.info('2 name:{0} labels:{1} metrics:{2}'.format(collector._name, collector._labelnames,
-                                                                              collector._metrics))
-                        #collector._metrics = {}
-                        collector.remove(vnf_name, vnf_interface)
-
                 # set values to NaN, prometheus api currently does not support removal of metrics
-                #self.prom_metrics[metric_dict['metric_key']].labels(vnf_name, vnf_interface).set(float('nan'))
+                # self.prom_metrics[metric_dict['metric_key']].labels(vnf_name, vnf_interface).set(float('nan'))
+                self.prom_metrics[metric_dict['metric_key']]. \
+                    labels(vnf_name=vnf_name, vnf_interface=vnf_interface, flow_id=None). \
+                    set(float('nan'))
 
                 # this removes the complete metric, all labels...
                 # 1 single monitor job for all metrics of the SDN controller
                 # we can only  remove from the pushgateway grouping keys(labels) which we have defined for the add_to_pushgateway
                 # we can not specify labels from the metrics to be removed
-                # if we need to remove the metrics seperatelty, we need to give them a separate grouping key, and probably a diffferent registry also
-                delete_from_gateway(self.pushgateway, job='sonemu-SDNcontroller')
+                # if we need to remove the metrics seperatelty, we need to give
+                # them a separate grouping key, and probably a diffferent
+                # registry also
+                delete_from_gateway(
+                    self.pushgateway, job='sonemu-SDNcontroller')
+
+                self.monitor_lock.release()
 
+                logging.info('Stopped monitoring: {2} on {0}:{1}'.format(
+                    vnf_name, vnf_interface, metric))
+                return 'Stopped monitoring: {2} on {0}:{1}'.format(
+                    vnf_name, vnf_interface, metric)
+
+            # delete everything from this vnf
+            elif metric_dict['vnf_name'] == vnf_name and vnf_interface is None and metric is None:
+                self.monitor_lock.acquire()
+                self.network_metrics.remove(metric_dict)
+                logging.info('remove metric from monitor: vnf_name:{0} vnf_interface:{1} mon_port:{2}'.format(
+                    metric_dict['vnf_name'], metric_dict['vnf_interface'], metric_dict['mon_port']))
+
+                delete_from_gateway(
+                    self.pushgateway, job='sonemu-SDNcontroller')
                 self.monitor_lock.release()
+                continue
+
+        if vnf_interface is None and metric is None:
+            logging.info('Stopped monitoring vnf: {0}'.format(vnf_name))
+            return 'Stopped monitoring: {0}'.format(vnf_name)
+        else:
+            return 'Error stopping monitoring metric: {0} on {1}:{2}'.format(
+                metric, vnf_name, vnf_interface)
+
+    def get_flow_metrics(self):
+        """
+        Get all metrics defined in the list and export it to Prometheus.
+        """
+        while self.start_monitoring:
+
+            self.monitor_flow_lock.acquire()
+
+            for flow_dict in self.flow_metrics:
+                data = {}
+
+                data['cookie'] = flow_dict['cookie']
+                data['cookie_mask'] = COOKIE_MASK
 
-                logging.info('Stopped monitoring: {2} on {0}:{1}'.format(vnf_name, vnf_interface, metric))
-                return 'Stopped monitoring: {2} on {0}:{1}'.format(vnf_name, vnf_interface, metric)
+                if 'tx' in flow_dict['metric_key']:
+                    data['match'] = {'in_port': flow_dict['mon_port']}
+                elif 'rx' in flow_dict['metric_key']:
+                    data['out_port'] = flow_dict['mon_port']
 
+                # query Ryu
+                ret = self.net.ryu_REST(
+                    'stats/flow', dpid=flow_dict['switch_dpid'], data=data)
+                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)
+
+            try:
+                if len(self.flow_metrics) > 0:
+                    pushadd_to_gateway(
+                        self.pushgateway, job='sonemu-SDNcontroller', registry=self.registry)
+            except Exception as e:
+                logging.warning(
+                    "Pushgateway not reachable: {0} {1}".format(Exception, e))
+
+            self.monitor_flow_lock.release()
+            time.sleep(1)
 
-    # get all metrics defined in the list and export it to Prometheus
     def get_network_metrics(self):
         while self.start_monitoring:
 
             self.monitor_lock.acquire()
 
             # group metrics by dpid to optimize the rest api calls
-            dpid_list = [metric_dict['switch_dpid'] for metric_dict in self.network_metrics]
+            dpid_list = [metric_dict['switch_dpid']
+                         for metric_dict in self.network_metrics]
             dpid_set = set(dpid_list)
 
             for dpid in dpid_set:
 
                 # query Ryu
-                ret = self.REST_cmd('stats/port', dpid)
-                port_stat_dict = ast.literal_eval(ret)
+                ret = self.net.ryu_REST('stats/port', dpid=dpid)
+                if isinstance(ret, dict):
+                    port_stat_dict = ret
+                elif isinstance(ret, basestring):
+                    port_stat_dict = ast.literal_eval(ret.rstrip())
+                else:
+                    port_stat_dict = None
 
                 metric_list = [metric_dict for metric_dict in self.network_metrics
-                               if int(metric_dict['switch_dpid'])==int(dpid)]
-                #logging.info('1set prom packets:{0} '.format(self.network_metrics))
+                               if int(metric_dict['switch_dpid']) == int(dpid)]
+
                 for metric_dict in metric_list:
                     self.set_network_metric(metric_dict, port_stat_dict)
 
+            try:
+                if len(self.network_metrics) > 0:
+                    pushadd_to_gateway(
+                        self.pushgateway, job='sonemu-SDNcontroller', registry=self.registry)
+            except Exception as e:
+                logging.warning(
+                    "Pushgateway not reachable: {0} {1}".format(Exception, e))
+
             self.monitor_lock.release()
             time.sleep(1)
 
-    # add metric to the list to export to Prometheus, parse the Ryu port-stats reply
+    # add metric to the list to export to Prometheus, parse the Ryu port-stats
+    # reply
     def set_network_metric(self, metric_dict, port_stat_dict):
         # vnf tx is the datacenter switch rx and vice-versa
         metric_key = self.switch_tx_rx(metric_dict['metric_key'])
         switch_dpid = metric_dict['switch_dpid']
         vnf_name = metric_dict['vnf_name']
         vnf_interface = metric_dict['vnf_interface']
-        previous_measurement = metric_dict['previous_measurement']
         previous_monitor_time = metric_dict['previous_monitor_time']
         mon_port = metric_dict['mon_port']
-
         for port_stat in port_stat_dict[str(switch_dpid)]:
+            # ovs output also gives back 'LOCAL' port
+            if port_stat['port_no'] == 'LOCAL':
+                continue
             if int(port_stat['port_no']) == int(mon_port):
-                port_uptime = port_stat['duration_sec'] + port_stat['duration_nsec'] * 10 ** (-9)
+                port_uptime = port_stat['duration_sec'] + \
+                    port_stat['duration_nsec'] * 10 ** (-9)
                 this_measurement = int(port_stat[metric_key])
-                #logging.info('set prom packets:{0} {1}:{2}'.format(this_measurement, vnf_name, vnf_interface))
 
                 # set prometheus metric
                 self.prom_metrics[metric_dict['metric_key']].\
-                    labels({'vnf_name':vnf_name, 'vnf_interface':vnf_interface}).\
+                    labels(vnf_name=vnf_name, vnf_interface=vnf_interface, flow_id=None).\
                     set(this_measurement)
-                #push_to_gateway(self.pushgateway, job='SDNcontroller',
-                #                grouping_key={'metric':metric_dict['metric_key']}, registry=self.registry)
-
-                # 1 single monitor job for all metrics of the SDN controller
-                pushadd_to_gateway(self.pushgateway, job='sonemu-SDNcontroller', registry=self.registry)
 
+                # also the rate is calculated here, but not used for now
+                # (rate can be easily queried from prometheus also)
                 if previous_monitor_time <= 0 or previous_monitor_time >= port_uptime:
-                    metric_dict['previous_measurement'] = int(port_stat[metric_key])
+                    metric_dict['previous_measurement'] = int(
+                        port_stat[metric_key])
                     metric_dict['previous_monitor_time'] = port_uptime
                     # do first measurement
-                    #logging.info('first measurement')
-                    time.sleep(1)
-                    self.monitor_lock.release()
-
-                    metric_rate = self.get_network_metrics()
-                    return metric_rate
-
-                else:
-                    time_delta = (port_uptime - metric_dict['previous_monitor_time'])
-                    metric_rate = (this_measurement - metric_dict['previous_measurement']) / float(time_delta)
-                    logging.info('metric: {0} rate:{1}'.format(metric_dict['metric_key'], metric_rate))
-
+                    # time.sleep(1)
+                    # self.monitor_lock.release()
+                    # rate cannot be calculated yet (need a first measurement)
                 metric_dict['previous_measurement'] = this_measurement
                 metric_dict['previous_monitor_time'] = port_uptime
-                return metric_rate
+                return
 
-        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)
+        logging.exception('metric {0} not found on {1}:{2}'.format(
+            metric_key, vnf_name, vnf_interface))
+        logging.exception(
+            'monport:{0}, dpid:{1}'.format(mon_port, switch_dpid))
+        logging.exception(
+            'monitored network_metrics:{0}'.format(self.network_metrics))
+        logging.exception('port dict:{0}'.format(port_stat_dict))
+        return 'metric {0} not found on {1}:{2}'.format(
+            metric_key, vnf_name, vnf_interface)
+
+    def set_flow_metric(self, metric_dict, flow_stat_dict):
+        # vnf tx is the datacenter switch rx and vice-versa
+        metric_key = metric_dict['metric_key']
+        switch_dpid = metric_dict['switch_dpid']
+        vnf_name = metric_dict['vnf_name']
+        vnf_interface = metric_dict['vnf_interface']
+        cookie = metric_dict['cookie']
 
+        counter = 0
+        for flow_stat in flow_stat_dict[str(switch_dpid)]:
+            if 'bytes' in metric_key:
+                counter += flow_stat['byte_count']
+            elif 'packet' in metric_key:
+                counter += flow_stat['packet_count']
 
-    def REST_cmd(self, prefix, dpid):
-        url = self.REST_api + '/' + str(prefix) + '/' + str(dpid)
-        req = urllib2.Request(url)
-        ret = urllib2.urlopen(req).read()
-        return ret
+        # flow_uptime disabled for now (can give error)
+        # flow_stat = flow_stat_dict[str(switch_dpid)][0]
+        # flow_uptime = flow_stat['duration_sec'] + flow_stat['duration_nsec'] * 10 ** (-9)
+
+        self.prom_metrics[metric_dict['metric_key']]. \
+            labels(vnf_name=vnf_name, vnf_interface=vnf_interface, flow_id=cookie). \
+            set(counter)
 
     def start_Prometheus(self, port=9090):
-        # prometheus.yml configuration file is located in the same directory as this file
+        # prometheus.yml configuration file is located in the same directory as
+        # this file
         cmd = ["docker",
                "run",
                "--rm",
                "-p", "{0}:9090".format(port),
-               "-v", "{0}/prometheus.yml:/etc/prometheus/prometheus.yml".format(os.path.dirname(os.path.abspath(__file__))),
-               "-v", "{0}/profile.rules:/etc/prometheus/profile.rules".format(os.path.dirname(os.path.abspath(__file__))),
+               "-v", "{0}/prometheus.yml:/etc/prometheus/prometheus.yml".format(
+                   os.path.dirname(os.path.abspath(__file__))),
+               "-v", "{0}/profile.rules:/etc/prometheus/profile.rules".format(
+                   os.path.dirname(os.path.abspath(__file__))),
                "--name", "prometheus",
                "prom/prometheus"
                ]
         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",
                "-p", "{0}:9091".format(port),
                "--name", "pushgateway",
+               "--label", 'com.containernet=""',
                "prom/pushgateway"
                ]
 
         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",
@@ -305,7 +528,12 @@ class DCNetworkMonitor():
                "--volume=/var/lib/docker/:/var/lib/docker:ro",
                "--publish={0}:8080".format(port),
                "--name=cadvisor",
-               "google/cadvisor:latest"
+               "--label", 'com.containernet=""',
+               "--detach=true",
+               "google/cadvisor:latest",
+               # "--storage_duration=1m0s",
+               # "--allow_dynamic_housekeeping=true",
+               # "--housekeeping_interval=1s",
                ]
         logging.info('Start cAdvisor container {0}'.format(cmd))
         return Popen(cmd)
@@ -314,44 +542,150 @@ class DCNetworkMonitor():
         # stop the monitoring thread
         self.start_monitoring = False
         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()
-            self.prometheus_process.kill()
-            self._stop_container('prometheus')
+        # these containers are used for monitoring but are started now outside
+        # of son-emu
 
         if self.pushgateway_process is not None:
             logging.info('stopping pushgateway container')
-            self.pushgateway_process.terminate()
-            self.pushgateway_process.kill()
             self._stop_container('pushgateway')
 
         if self.cadvisor_process is not None:
             logging.info('stopping cadvisor container')
-            self.cadvisor_process.terminate()
-            self.cadvisor_process.kill()
             self._stop_container('cadvisor')
 
-    def switch_tx_rx(self,metric=''):
+    def switch_tx_rx(self, metric=''):
         # when monitoring vnfs, the tx of the datacenter switch is actually the rx of the vnf
-        # so we need to change the metric name to be consistent with the vnf rx or tx
+        # so we need to change the metric name to be consistent with the vnf rx
+        # or tx
         if 'tx' in metric:
-            metric = metric.replace('tx','rx')
+            metric = metric.replace('tx', 'rx')
         elif 'rx' in metric:
-            metric = metric.replace('rx','tx')
+            metric = metric.replace('rx', 'tx')
 
         return metric
 
     def _stop_container(self, name):
-        cmd = ["docker",
-               "stop",
-               name]
-        Popen(cmd).wait()
 
-        cmd = ["docker",
-               "rm",
-               name]
-        Popen(cmd).wait()
+        # container = self.dockercli.containers.get(name)
+        # container.stop()
+        # container.remove(force=True)
+
+        # the only robust way to stop these containers is via Popen, it seems
+        time.sleep(1)
+        cmd = ['docker', 'rm', '-f', name]
+        Popen(cmd)
+
+    def update_skewmon(self, vnf_name, resource_name, action):
 
+        ret = ''
 
+        config_file_path = '/tmp/skewmon.cfg'
+        configfile = open(config_file_path, 'a+')
+        try:
+            config = json.load(configfile)
+        except BaseException:
+            # not a valid json file or empty
+            config = {}
+
+        # initialize config file
+        if len(self.skewmon_metrics) == 0:
+            config = {}
+        json.dump(config, configfile)
+        configfile.close()
+
+        docker_name = 'mn.' + vnf_name
+        vnf_container = self.dockercli.containers.get(docker_name)
+        key = resource_name + '_' + vnf_container.short_id
+        vnf_id = vnf_container.id
+
+        if action == 'start':
+            # add a new vnf to monitor
+            config[key] = dict(VNF_NAME=vnf_name,
+                               VNF_ID=vnf_id,
+                               VNF_METRIC=resource_name)
+            ret = 'adding to skewness monitor: {0} {1} '.format(
+                vnf_name, resource_name)
+            logging.info(ret)
+        elif action == 'stop':
+            # remove vnf to monitor
+            config.pop(key)
+            ret = 'removing from skewness monitor: {0} {1} '.format(
+                vnf_name, resource_name)
+            logging.info(ret)
+
+        self.skewmon_metrics = config
+        configfile = open(config_file_path, 'w')
+        json.dump(config, configfile)
+        configfile.close()
+
+        try:
+            skewmon_container = self.dockercli.containers.get('skewmon')
+
+            # remove container if config is empty
+            if len(config) == 0:
+                ret += 'stopping skewness monitor'
+                logging.info('stopping skewness monitor')
+                skewmon_container.remove(force=True)
+
+        except docker.errors.NotFound:
+            # start container if not running
+            ret += 'starting skewness monitor'
+            logging.info('starting skewness monitor')
+            volumes = {'/sys/fs/cgroup': {'bind': '/sys/fs/cgroup', 'mode': 'ro'},
+                       '/tmp/skewmon.cfg': {'bind': '/config.txt', 'mode': 'ro'}}
+            self.dockercli.containers.run('skewmon',
+                                          detach=True,
+                                          volumes=volumes,
+                                          labels=['com.containernet'],
+                                          name='skewmon'
+                                          )
+            # Wait a while for containers to be completely started
+            started = False
+            wait_time = 0
+            while not started:
+                list1 = self.dockercli.containers.list(
+                    filters={'status': 'running', 'name': 'prometheus'})
+                if len(list1) >= 1:
+                    time.sleep(1)
+                    started = True
+                if wait_time > 5:
+                    return 'skewmon not started'
+                time.sleep(1)
+                wait_time += 1
+        return ret
+
+    def term(self, vnf_list=[]):
+        """
+        Start a terminal window for the specified VNFs
+        (start a terminal for all VNFs if vnf_list is empty)
+        :param vnf_list:
+        :return:
+        """
+
+        if vnf_list is None:
+            vnf_list = []
+        if not isinstance(vnf_list, list):
+            vnf_list = str(vnf_list).split(',')
+            vnf_list = map(str.strip, vnf_list)
+        logging.info('vnf_list: {}'.format(vnf_list))
+
+        return self.start_xterm(vnf_list)
+
+    # start an xterm for the specfified vnfs
+
+    def start_xterm(self, vnf_names):
+        # start xterm for all vnfs
+        for vnf_name in vnf_names:
+            terminal_cmd = "docker exec -it mn.{0} /bin/bash".format(vnf_name)
+
+            cmd = ['xterm', '-xrm', 'XTerm*selectToClipboard: true', '-xrm', 'XTerm.vt100.allowTitleOps: false',
+                   '-T', vnf_name,
+                   '-e', terminal_cmd]
+            Popen(cmd)
+
+        ret = 'xterms started for {0}'.format(vnf_names)
+        if len(vnf_names) == 0:
+            ret = 'vnf list is empty, no xterms started'
+        return ret