X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=yardstick%2Fnetwork_services%2Fvnf_generic%2Fvnf%2Ftg_rfc2544_ixia.py;h=05eaba6b48f8ab3741c084b14903a60fd1adbb95;hb=eb9e5bea682f610383cf238820c8044ae66f2a3e;hp=a1f9fbeb451a6d1946f8c944825793550173ad12;hpb=29c68ae66c99a674e83f37dfcf862d41ed800f36;p=yardstick.git

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 a1f9fbeb4..05eaba6b4 100644
--- 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, key=None):
+    def generate_samples(self, ports, duration):
         stats = self.get_stats()
 
         samples = {}
@@ -78,19 +78,16 @@ 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]),
-                    # NOTE(ralonsoh): we need to make the traffic injection
-                    # time variable.
-                    "RxThroughput": int(stats["Valid_Frames_Rx"][port_num]) / 30,
-                    "TxThroughput": int(stats["Frames_Tx"][port_num]) / 30,
+                    "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
 
@@ -102,7 +99,7 @@ class IxiaResourceHelper(ClientResourceHelper):
         self.client.assign_ports()
         self.client.create_traffic_model()
 
-    def run_traffic(self, traffic_profile):
+    def run_traffic(self, traffic_profile, *args):
         if self._terminated.value:
             return
 
@@ -129,13 +126,11 @@ class IxiaResourceHelper(ClientResourceHelper):
                     self, self.client, mac)
                 self.client_started.value = 1
                 # pylint: disable=unnecessary-lambda
-                utils.wait_until_true(lambda: self.client.is_traffic_stopped())
-                samples = self.generate_samples(traffic_profile.ports)
+                utils.wait_until_true(lambda: self.client.is_traffic_stopped(),
+                                      timeout=traffic_profile.config.duration * 2)
+                samples = self.generate_samples(traffic_profile.ports,
+                                                traffic_profile.config.duration)
 
-                # NOTE(ralonsoh): the traffic injection duration is fixed to 30
-                # seconds. This parameter is configurable and must be retrieved
-                # from the traffic_profile.full_profile information.
-                # Every flow must have the same duration.
                 completed, samples = traffic_profile.get_drop_percentage(
                     samples, min_tol, max_tol, first_run=first_run)
                 self._queue.put(samples)
@@ -157,12 +152,12 @@ class IxiaTrafficGen(SampleVNFTrafficGen):
 
     APP_NAME = 'Ixia'
 
-    def __init__(self, name, vnfd, setup_env_helper_type=None, resource_helper_type=None):
+    def __init__(self, name, vnfd, task_id, setup_env_helper_type=None,
+                 resource_helper_type=None):
         if resource_helper_type is None:
             resource_helper_type = IxiaResourceHelper
-
-        super(IxiaTrafficGen, self).__init__(name, vnfd, setup_env_helper_type,
-                                             resource_helper_type)
+        super(IxiaTrafficGen, self).__init__(
+            name, vnfd, task_id, setup_env_helper_type, resource_helper_type)
         self._ixia_traffic_gen = None
         self.ixia_file_name = ''
         self.vnf_port_pairs = []