From: DanielMartinBuckley <daniel.m.buckley@intel.com>
Date: Thu, 28 Jun 2018 13:51:09 +0000 (+0100)
Subject: Decrease Sampling interval - Invalid Port results
X-Git-Tag: opnfv-7.0.0~223
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2d10b0bf7238f5417d46f89c76b856f7e345f738;p=yardstick.git

Decrease Sampling interval - Invalid Port results

JIRA: YARDSTICK-1219

The computed in/fwd throughputs displayed on the L2FWD,
L3FWD and VPE dashboards. The computed value is likely
4x the expected value.

It is required to return sampling information form Generator AND VNF at
least every  1 second.

Change-Id: I4435fd05ba3116ead836843a4c2fce133b767a28
Signed-off-by: Daniel Martin Buckley <daniel.m.buckley@intel.com>
---

diff --git a/yardstick/network_services/vnf_generic/vnf/prox_vnf.py b/yardstick/network_services/vnf_generic/vnf/prox_vnf.py
index 63295c2e6..366c5b26b 100644
--- a/yardstick/network_services/vnf_generic/vnf/prox_vnf.py
+++ b/yardstick/network_services/vnf_generic/vnf/prox_vnf.py
@@ -90,16 +90,18 @@ class ProxApproxVnf(SampleVNF):
                                "1, 2 or 4 ports only supported at this time")
 
         all_port_stats = self.vnf_execute('multi_port_stats', range(port_count))
-        rx_total = tx_total = 0
+        rx_total = tx_total = tsc = 0
         try:
             for single_port_stats in all_port_stats:
                 rx_total = rx_total + single_port_stats[1]
                 tx_total = tx_total + single_port_stats[2]
-                tsc = single_port_stats[5]
+                tsc = tsc + single_port_stats[5]
         except (TypeError, IndexError):
             LOG.error("Invalid data ...")
             return {}
 
+        tsc = tsc / port_count
+
         result = {
             "packets_in": rx_total,
             "packets_dropped": max((tx_total - rx_total), 0),
@@ -110,14 +112,14 @@ class ProxApproxVnf(SampleVNF):
         }
         try:
             curr_packets_in = int(((rx_total - self.prev_packets_in) * self.tsc_hz)
-                                / (tsc - self.prev_tsc) * port_count)
+                                / (tsc - self.prev_tsc))
         except ZeroDivisionError:
             LOG.error("Error.... Divide by Zero")
             curr_packets_in = 0
 
         try:
             curr_packets_fwd = int(((tx_total - self.prev_packets_sent) * self.tsc_hz)
-                                / (tsc - self.prev_tsc) * port_count)
+                                / (tsc - self.prev_tsc))
         except ZeroDivisionError:
             LOG.error("Error.... Divide by Zero")
             curr_packets_fwd = 0