From 30bb35b84c417fe6ef15deccea780431adb815de Mon Sep 17 00:00:00 2001 From: "Mytnyk, Volodymyr" Date: Mon, 13 Aug 2018 11:00:00 +0100 Subject: Improve IXIA TG Rx/TX throughput calculation Use float instead of integer to convert TG throughtput IXIA statistic. JIRA: YARDSTICK-1378 Change-Id: I39bd143adc4b10035c6f0986a06d407a18aa0887 Signed-off-by: Mytnyk, Volodymyr --- yardstick/network_services/traffic_profile/ixia_rfc2544.py | 8 ++------ yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'yardstick/network_services') diff --git a/yardstick/network_services/traffic_profile/ixia_rfc2544.py b/yardstick/network_services/traffic_profile/ixia_rfc2544.py index 2086273e6..241fd7598 100644 --- a/yardstick/network_services/traffic_profile/ixia_rfc2544.py +++ b/yardstick/network_services/traffic_profile/ixia_rfc2544.py @@ -167,12 +167,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 5203ffd9c..2b04c864c 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, } if key: avg_latency = stats["Store-Forward_Avg_latency_ns"][port_num] -- cgit 1.2.3-korg