specify interface option for monitoring command

[osm/vim-emu.git] / src / emuvim / dcemulator / monitoring.py

diff --git a/src/emuvim/dcemulator/monitoring.py b/src/emuvim/dcemulator/monitoring.py
index 094c09b..f5da2a1 100755 (executable)
--- a/src/emuvim/dcemulator/monitoring.py
+++ b/src/emuvim/dcemulator/monitoring.py
@@ -4,6 +4,7 @@ import urllib2
 import logging\r
 from mininet.node import  OVSSwitch\r
 import ast\r
+import time\r
 logging.basicConfig(level=logging.INFO)\r
 \r
 """\r
@@ -18,9 +19,41 @@ class DCNetworkMonitor():
         self.port = '8080'\r
         self.REST_api = 'http://{0}:{1}'.format(self.ip,self.port)\r
 \r
+        self.previous_measurement = 0\r
+        self.previous_monitor_time = 0\r
 \r
-    def get_rate(self, vnf_name, direction='tx'):\r
+    def get_rate(self, vnf_name, direction='tx', metric='packets'):\r
+        # check if port is specified (vnf:port)\r
         try:\r
+            vnf_interface = vnf_name.split(':')[1]\r
+        except:\r
+            # take first interface by default\r
+            connected_sw = self.net.DCNetwork_graph.neighbors(vnf_name)[0]\r
+            link_dict = self.net.DCNetwork_graph[vnf_name][connected_sw]\r
+            vnf_interface = link_dict[0]['src_port_id']\r
+            # vnf_source_interface = 0\r
+\r
+        vnf_name = vnf_name.split(':')[0]\r
+        # take into account that this is a MultiGraph\r
+        #mon_port = self.net.DCNetwork_graph[vnf_name][connected_sw][0]['dst_port']\r
+\r
+        for connected_sw in self.net.DCNetwork_graph.neighbors(vnf_name):\r
+            link_dict = self.net.DCNetwork_graph[vnf_name][connected_sw]\r
+            for link in link_dict:\r
+                # logging.info("{0},{1}".format(link_dict[link],vnf_source_interface))\r
+                if link_dict[link]['src_port_id'] == vnf_interface:\r
+                    # found the right link and connected switch\r
+                    # logging.info("{0},{1}".format(link_dict[link]['src_port_id'], vnf_source_interface))\r
+                    #src_sw = connected_sw\r
+\r
+                    mon_port = link_dict[link]['dst_port']\r
+                    break\r
+\r
+        try:\r
+            # default port direction to monitor\r
+            if direction is None:\r
+                direction = 'tx'\r
+\r
             vnf_switch = self.net.DCNetwork_graph.neighbors(str(vnf_name))\r
 \r
             if len(vnf_switch) > 1:\r
@@ -37,15 +70,36 @@ class DCNetworkMonitor():
                 logging.info("vnf: {0} is not connected to switch".format(vnf_name))\r
                 return\r
 \r
-            mon_port = self.net.DCNetwork_graph[vnf_name][vnf_switch]['dst_port']\r
+\r
             switch_dpid = x = int(str(next_node.dpid),16)\r
 \r
+            # TODO get metric name from arg\r
+            key = '{0}_{1}'.format(direction, metric)\r
+\r
+\r
             ret = self.REST_cmd('stats/port', switch_dpid)\r
             port_stat_dict = ast.literal_eval(ret)\r
             for port_stat in port_stat_dict[str(switch_dpid)]:\r
                 if port_stat['port_no'] == mon_port:\r
-                    return port_stat\r
-                    break\r
+                    port_uptime = port_stat['duration_sec'] + port_stat['duration_nsec'] * 10 ** (-9)\r
+                    this_measurement = port_stat[key]\r
+\r
+                    if self.previous_monitor_time <= 0 or self.previous_monitor_time >= port_uptime:\r
+                        self.previous_measurement = port_stat[key]\r
+                        self.previous_monitor_time = port_uptime\r
+                        # do first measurement\r
+                        time.sleep(1)\r
+                        byte_rate = self.get_rate(vnf_name,direction)\r
+                        return byte_rate\r
+                    else:\r
+                        time_delta = (port_uptime - self.previous_monitor_time)\r
+                        byte_rate = (this_measurement - self.previous_measurement) / float(time_delta)\r
+                        #logging.info('uptime:{2} delta:{0} rate:{1}'.format(time_delta,byte_rate,port_uptime))\r
+                        #return byte_rate\r
+\r
+                    self.previous_measurement = this_measurement\r
+                    self.previous_monitor_time = port_uptime\r
+                    return byte_rate\r
 \r
             return ret\r
 \r