From: Rodolfo Alonso Hernandez Date: Fri, 17 Aug 2018 08:48:22 +0000 (+0000) Subject: Merge "Improve IXIA TG Rx/TX throughput calculation" X-Git-Tag: opnfv-7.0.0~95 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=27521123b2a178ce5d9038a4901e65ced0b9e35e;p=yardstick.git Merge "Improve IXIA TG Rx/TX throughput calculation" --- 27521123b2a178ce5d9038a4901e65ced0b9e35e diff --cc yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py index 05eaba6b4,2b04c864c..8b1687450 --- a/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py +++ b/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py @@@ -78,16 -78,17 +78,16 @@@ class IxiaResourceHelper(ClientResource "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] - min_latency = stats["Store-Forward_Min_latency_ns"][port_num] - max_latency = stats["Store-Forward_Max_latency_ns"][port_num] - samples[port_name][key] = \ - {"Store-Forward_Avg_latency_ns": avg_latency, - "Store-Forward_Min_latency_ns": min_latency, - "Store-Forward_Max_latency_ns": max_latency} + avg_latency = stats["Store-Forward_Avg_latency_ns"][port_num] + min_latency = stats["Store-Forward_Min_latency_ns"][port_num] + max_latency = stats["Store-Forward_Max_latency_ns"][port_num] + samples[port_name] = { + "Store-Forward_Avg_latency_ns": avg_latency, + "Store-Forward_Min_latency_ns": min_latency, + "Store-Forward_Max_latency_ns": max_latency} except IndexError: pass