updated SDN chaining commands

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

diff --git a/src/emuvim/dcemulator/monitoring.py b/src/emuvim/dcemulator/monitoring.py
index f5da2a1..50393ea 100755 (executable)
--- a/src/emuvim/dcemulator/monitoring.py
+++ b/src/emuvim/dcemulator/monitoring.py
@@ -21,38 +21,35 @@ class DCNetworkMonitor():
 \r
         self.previous_measurement = 0\r
         self.previous_monitor_time = 0\r
+        self.switch_dpid = 0\r
+        self.metric_key = None\r
+        self.mon_port = None\r
 \r
-    def get_rate(self, vnf_name, direction='tx', metric='packets'):\r
+    # first set some parameters, before measurement can start\r
+    def setup_rate_measurement(self, vnf_name, vnf_interface=None, direction='tx', metric='packets'):\r
         # check if port is specified (vnf:port)\r
-        try:\r
-            vnf_interface = vnf_name.split(':')[1]\r
-        except:\r
+        if vnf_interface is None:\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
+                # logging.info("{0},{1}".format(link_dict[link],vnf_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
+                    self.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
+            if metric is None:\r
+                metric = 'packets'\r
 \r
             vnf_switch = self.net.DCNetwork_graph.neighbors(str(vnf_name))\r
 \r
@@ -66,21 +63,31 @@ class DCNetworkMonitor():
                 vnf_switch = vnf_switch[0]\r
             next_node = self.net.getNodeByName(vnf_switch)\r
 \r
-            if not isinstance( next_node, OVSSwitch ):\r
+            if not isinstance(next_node, OVSSwitch):\r
                 logging.info("vnf: {0} is not connected to switch".format(vnf_name))\r
                 return\r
 \r
+            self.previous_measurement = 0\r
+            self.previous_monitor_time = 0\r
+\r
+            #self.switch_dpid = x = int(str(next_node.dpid), 16)\r
+            self.switch_dpid = int(str(next_node.dpid), 16)\r
+            self.metric_key = '{0}_{1}'.format(direction, metric)\r
+\r
+        except Exception as ex:\r
+            logging.exception("get_txrate error.")\r
+            return ex.message\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
+    # call this function repeatedly for streaming measurements\r
+    def get_rate(self, vnf_name, vnf_interface=None, direction='tx', metric='packets'):\r
 \r
+            key = self.metric_key\r
 \r
-            ret = self.REST_cmd('stats/port', switch_dpid)\r
+            ret = self.REST_cmd('stats/port', self.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
+            for port_stat in port_stat_dict[str(self.switch_dpid)]:\r
+                if port_stat['port_no'] == self.mon_port:\r
                     port_uptime = port_stat['duration_sec'] + port_stat['duration_nsec'] * 10 ** (-9)\r
                     this_measurement = port_stat[key]\r
 \r
@@ -89,13 +96,12 @@ class DCNetworkMonitor():
                         self.previous_monitor_time = port_uptime\r
                         # do first measurement\r
                         time.sleep(1)\r
-                        byte_rate = self.get_rate(vnf_name,direction)\r
+                        byte_rate = self.get_rate(vnf_name, vnf_interface, direction, metric)\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
@@ -103,12 +109,6 @@ class DCNetworkMonitor():
 \r
             return ret\r
 \r
-        except Exception as ex:\r
-            logging.exception("get_txrate error.")\r
-            return ex.message\r
-\r
-\r
-\r
     def REST_cmd(self, prefix, dpid):\r
         url = self.REST_api + '/' + str(prefix) + '/' + str(dpid)\r
         req = urllib2.Request(url)\r