"""\r
\r
import logging\r
+import sys\r
from mininet.node import OVSSwitch\r
import ast\r
import time\r
self.pushgateway = 'localhost:9091'\r
# when sdk is started with docker-compose, we could use\r
# self.pushgateway = 'pushgateway:9091'\r
- # Start up the server to expose the metrics to Prometheus\r
- #start_http_server(8000)\r
\r
# supported Prometheus metrics\r
self.registry = CollectorRegistry()\r
self.monitor_flow_thread.start()\r
\r
# helper tools\r
- # Prometheus pushgateway and DB are started as external contianer, outside of son-emu\r
- #self.pushgateway_process = self.start_PushGateway()\r
- #self.prometheus_process = self.start_Prometheus()\r
- #self.cadvisor_process = self.start_cadvisor()\r
+ # cAdvisor, Prometheus pushgateway and DB are started as external container, outside of son-emu\r
+\r
\r
# first set some parameters, before measurement can start\r
def setup_flow(self, vnf_name, vnf_interface=None, metric='tx_packets', cookie=0):\r
data = {}\r
\r
data['cookie'] = flow_dict['cookie']\r
+ data['cookie_mask'] = flow_dict['cookie']\r
\r
if 'tx' in flow_dict['metric_key']:\r
data['match'] = {'in_port':flow_dict['mon_port']}\r
\r
# query Ryu\r
ret = self.net.ryu_REST('stats/flow', dpid=flow_dict['switch_dpid'], data=data)\r
- flow_stat_dict = ast.literal_eval(ret)\r
+ if isinstance(ret, dict):\r
+ flow_stat_dict = ret\r
+ elif isinstance(ret, basestring):\r
+ flow_stat_dict = ast.literal_eval(ret.rstrip())\r
+ else:\r
+ flow_stat_dict = None\r
\r
logging.debug('received flow stat:{0} '.format(flow_stat_dict))\r
+\r
self.set_flow_metric(flow_dict, flow_stat_dict)\r
\r
self.monitor_flow_lock.release()\r
previous_monitor_time = metric_dict['previous_monitor_time']\r
cookie = metric_dict['cookie']\r
\r
- # TODO aggregate all found flow stats\r
- #flow_stat = flow_stat_dict[str(switch_dpid)][0]\r
- #if 'bytes' in metric_key:\r
- # counter = flow_stat['byte_count']\r
- #elif 'packet' in metric_key:\r
- # counter = flow_stat['packet_count']\r
-\r
counter = 0\r
for flow_stat in flow_stat_dict[str(switch_dpid)]:\r
if 'bytes' in metric_key:\r
self.prom_metrics[metric_dict['metric_key']]. \\r
labels({'vnf_name': vnf_name, 'vnf_interface': vnf_interface, 'flow_id': cookie}). \\r
set(counter)\r
- pushadd_to_gateway(self.pushgateway, job='sonemu-SDNcontroller', registry=self.registry)\r
+ try:\r
+ pushadd_to_gateway(self.pushgateway, job='sonemu-SDNcontroller', registry=self.registry)\r
+ except Exception, e:\r
+ logging.warning("Pushgateway not reachable: {0} {1}".format(Exception, e))\r
\r
\r
def start_Prometheus(self, port=9090):\r