fix bug in chaining 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 54e7986..6531beb 100755 (executable)
--- a/src/emuvim/dcemulator/monitoring.py
+++ b/src/emuvim/dcemulator/monitoring.py
@@ -91,7 +91,7 @@ class DCNetworkMonitor():
                 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
-                    network_metric['mon_port'] = link_dict[link]['dst_port']\r
+                    network_metric['mon_port'] = link_dict[link]['dst_port_nr']\r
                     break\r
 \r
         if 'mon_port' not in network_metric:\r
@@ -246,12 +246,14 @@ class DCNetworkMonitor():
                     #logging.info('first measurement')\r
                     time.sleep(1)\r
                     self.monitor_lock.release()\r
+\r
                     metric_rate = self.get_network_metrics()\r
                     return metric_rate\r
+\r
                 else:\r
                     time_delta = (port_uptime - metric_dict['previous_monitor_time'])\r
                     metric_rate = (this_measurement - metric_dict['previous_measurement']) / float(time_delta)\r
-                    # logging.info('uptime:{2} delta:{0} rate:{1}'.format(time_delta,byte_rate,port_uptime))\r
+                    logging.info('metric: {0} rate:{1}'.format(metric_dict['metric_key'], metric_rate))\r
 \r
                 metric_dict['previous_measurement'] = this_measurement\r
                 metric_dict['previous_monitor_time'] = port_uptime\r
@@ -274,6 +276,7 @@ class DCNetworkMonitor():
                "--rm",\r
                "-p", "{0}:9090".format(port),\r
                "-v", "{0}/prometheus.yml:/etc/prometheus/prometheus.yml".format(os.path.dirname(os.path.abspath(__file__))),\r
+               "-v", "{0}/profile.rules:/etc/prometheus/profile.rules".format(os.path.dirname(os.path.abspath(__file__))),\r
                "--name", "prometheus",\r
                "prom/prometheus"\r
                ]\r