diff options
| author |   Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com> | 2018-08-17 08:48:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-08-17 08:48:22 +0000 |
| commit | 27521123b2a178ce5d9038a4901e65ced0b9e35e (patch) | |
| tree | bf2549dd79d0bb82d4b7f47777d67b4460aec01b /yardstick/network_services | |
| parent | eb9e5bea682f610383cf238820c8044ae66f2a3e (diff) | |
| parent | 30bb35b84c417fe6ef15deccea780431adb815de (diff) | |
Merge "Improve IXIA TG Rx/TX throughput calculation"
Diffstat (limited to 'yardstick/network_services')
| -rw-r--r-- | yardstick/network_services/traffic_profile/ixia_rfc2544.py | 8 | ||||
| -rw-r--r-- | yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/yardstick/network_services/traffic_profile/ixia_rfc2544.py b/yardstick/network_services/traffic_profile/ixia_rfc2544.py index 26dc1fe04..760b1e8d3 100644 --- a/yardstick/network_services/traffic_profile/ixia_rfc2544.py +++ b/yardstick/network_services/traffic_profile/ixia_rfc2544.py @@ -168,12 +168,8 @@ class IXIARFC2544Profile(trex_traffic_profile.TrexProfile): [samples[iface]['in_packets'] for iface in samples]) out_packets_sum = sum( [samples[iface]['out_packets'] for iface in samples]) - rx_throughput = sum( - [samples[iface]['RxThroughput'] for iface in samples]) - rx_throughput = round(float(rx_throughput), 2) - tx_throughput = sum( - [samples[iface]['TxThroughput'] for iface in samples]) - tx_throughput = round(float(tx_throughput), 2) + rx_throughput = round(float(in_packets_sum) / duration, 3) + tx_throughput = round(float(out_packets_sum) / duration, 3) packet_drop = abs(out_packets_sum - in_packets_sum) try: diff --git a/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py b/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py index 05eaba6b4..8b1687450 100644 --- a/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py +++ b/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py @@ -78,8 +78,8 @@ class IxiaResourceHelper(ClientResourceHelper): "tx_throughput_mbps": float(stats["Tx_Rate_Mbps"][port_num]), "in_packets": int(stats["Valid_Frames_Rx"][port_num]), "out_packets": int(stats["Frames_Tx"][port_num]), - "RxThroughput": int(stats["Valid_Frames_Rx"][port_num]) / duration, - "TxThroughput": int(stats["Frames_Tx"][port_num]) / duration, + "RxThroughput": float(stats["Valid_Frames_Rx"][port_num]) / duration, + "TxThroughput": float(stats["Frames_Tx"][port_num]) / duration, } avg_latency = stats["Store-Forward_Avg_latency_ns"][port_num] min_latency = stats["Store-Forward_Min_latency_ns"][port_num] |