X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=yardstick%2Fnetwork_services%2Fvnf_generic%2Fvnf%2Fprox_vnf.py;h=ee773597275ce302016e2d035369cb60e9733327;hb=e670c9c6e165ee508bd509a3cd71f80c45d6d919;hp=3bfca19aa8e48d4ab8c302559a7d43c73c30167a;hpb=59fb6a08eceac07004f3e0c4ef7e4aad6595054e;p=yardstick.git

diff --git a/yardstick/network_services/vnf_generic/vnf/prox_vnf.py b/yardstick/network_services/vnf_generic/vnf/prox_vnf.py
index 3bfca19aa..ee7735972 100644
--- a/yardstick/network_services/vnf_generic/vnf/prox_vnf.py
+++ b/yardstick/network_services/vnf_generic/vnf/prox_vnf.py
@@ -14,6 +14,8 @@
 
 import errno
 import logging
+import datetime
+import time
 
 
 from yardstick.common.process import check_if_process_failed
@@ -39,6 +41,9 @@ class ProxApproxVnf(SampleVNF):
         if resource_helper_type is None:
             resource_helper_type = ProxResourceHelper
 
+        self.prev_packets_in = 0
+        self.prev_packets_sent = 0
+        self.prev_time = time.time()
         super(ProxApproxVnf, self).__init__(name, vnfd, setup_env_helper_type,
                                             resource_helper_type)
 
@@ -79,24 +84,35 @@ class ProxApproxVnf(SampleVNF):
             raise RuntimeError("Failed ..Invalid no of ports .. "
                                "1, 2 or 4 ports only supported at this time")
 
-        port_stats = self.vnf_execute('port_stats', range(port_count))
+        self.port_stats = self.vnf_execute('port_stats', range(port_count))
+        curr_time = time.time()
         try:
-            rx_total = port_stats[6]
-            tx_total = port_stats[7]
+            rx_total = self.port_stats[6]
+            tx_total = self.port_stats[7]
         except IndexError:
-            LOG.error("port_stats parse fail %s", port_stats)
+            LOG.debug("port_stats parse fail ")
             # return empty dict so we don't mess up existing KPIs
             return {}
 
         result = {
-            "packets_in": tx_total,
-            "packets_dropped": (tx_total - rx_total),
-            "packets_fwd": rx_total,
+            "packets_in": rx_total,
+            "packets_dropped": max((tx_total - rx_total), 0),
+            "packets_fwd": tx_total,
             # we share ProxResourceHelper with TG, but we want to collect
             # collectd KPIs here and not TG KPIs, so use a different method name
             "collect_stats": self.resource_helper.collect_collectd_kpi(),
         }
-        LOG.debug("%s collect KPIs %s", self.APP_NAME, result)
+        curr_packets_in = int((rx_total - self.prev_packets_in) / (curr_time - self.prev_time))
+        curr_packets_fwd = int((tx_total - self.prev_packets_sent) / (curr_time - self.prev_time))
+
+        result["curr_packets_in"] = curr_packets_in
+        result["curr_packets_fwd"] = curr_packets_fwd
+
+        self.prev_packets_in = rx_total
+        self.prev_packets_sent = tx_total
+        self.prev_time = curr_time
+
+        LOG.debug("%s collect KPIs %s %s", self.APP_NAME, datetime.datetime.now(), result)
         return result
 
     def _tear_down(self):