Merge "Improve IXIA TG Rx/TX throughput calculation"

diff --cc yardstick/network_services/traffic_profile/ixia_rfc2544.py
Simple merge

diff --cc yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
index 05eaba6,2b04c86..8b16874
--- 1/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
--- 2/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