Add RFC2544 IXIA latency information

[yardstick.git] / yardstick / network_services / vnf_generic / vnf / tg_rfc2544_ixia.py

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 5203ffd..05eaba6 100644 (file)
--- a/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
+++ b/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
@@ -60,7 +60,7 @@ class IxiaResourceHelper(ClientResourceHelper):
     def stop_collect(self):
         self._terminated.value = 1
 
-    def generate_samples(self, ports, duration, key=None):
+    def generate_samples(self, ports, duration):
         stats = self.get_stats()
 
         samples = {}
@@ -81,14 +81,13 @@ class IxiaResourceHelper(ClientResourceHelper):
                     "RxThroughput": int(stats["Valid_Frames_Rx"][port_num]) / duration,
                     "TxThroughput": int(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