diff options
| author |   Abhijit Sinha <abhijit.sinha@intel.com> | 2017-10-18 16:44:45 +0100 |
|---|---|---|
| committer |   Ross Brattain <ross.b.brattain@intel.com> | 2017-10-19 16:01:56 +0000 |
| commit | c0b3d5a7abc6acd0282c063844471ed6aa02d36b (patch) | |
| tree | a985b4d0e96d62d16652eee44cc8f219c8068862 | |
| parent | b3ebb0526501cba14055e00ee16606f85f6212eb (diff) | |
BugFix: Negative dropped packets in Prox tests
Removed the abs function which can potentially mask
negative dropped packets.
Dropped packets in Prox workload VNF = max((tx_packets - rx_packets), 0)
Change-Id: I510a351e899cdf9a1f366d632b9f0528b1d9dcce
Signed-off-by: Abhijit Sinha <abhijit.sinha@intel.com>
(cherry picked from commit a27278dacaa54ae60cd3bdfa6e6145643f76fa02)
| -rw-r--r-- | tests/unit/network_services/vnf_generic/vnf/test_prox_vnf.py | 4 | ||||
| -rw-r--r-- | yardstick/network_services/vnf_generic/vnf/prox_vnf.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/unit/network_services/vnf_generic/vnf/test_prox_vnf.py b/tests/unit/network_services/vnf_generic/vnf/test_prox_vnf.py index a6d40877d..e29e8ddcd 100644 --- a/tests/unit/network_services/vnf_generic/vnf/test_prox_vnf.py +++ b/tests/unit/network_services/vnf_generic/vnf/test_prox_vnf.py @@ -348,9 +348,9 @@ class TestProxApproxVnf(unittest.TestCase): prox_approx_vnf.resource_helper = resource_helper expected = { - 'packets_in': 7, + 'packets_in': 6, 'packets_dropped': 1, - 'packets_fwd': 6, + 'packets_fwd': 7, 'collect_stats': {'core': {'result': 234}}, } result = prox_approx_vnf.collect_kpi() diff --git a/yardstick/network_services/vnf_generic/vnf/prox_vnf.py b/yardstick/network_services/vnf_generic/vnf/prox_vnf.py index 24712dd27..b7d295eee 100644 --- a/yardstick/network_services/vnf_generic/vnf/prox_vnf.py +++ b/yardstick/network_services/vnf_generic/vnf/prox_vnf.py @@ -89,9 +89,9 @@ class ProxApproxVnf(SampleVNF): return {} result = { - "packets_in": tx_total, - "packets_dropped": abs(rx_total - tx_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(), |