Improve IXIA IxNetwork library and traffic profile (4)

This patch implements an active wait for the traffic injection. Once the
traffic is started, the traffic generator class will poll periodically the
IXIA traffic generator chassis to retrieve the status of the traffic
("started", "stopped").

Now the latency statistics are retrieved and reported for each injection
period.

JIRA: YARDSTICK-1116

Change-Id: I4422e2c88b4fc97b7cac3de8a82b2d75467c4117
Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
Signed-off-by: Emma Foley <emma.l.foley@intel.com>

1 files changed, 14 insertions, 29 deletions

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 deb0a8023..2010546e7 100644
--- a/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
+++ b/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
@@ -12,12 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import time
 import os
 import logging
 import sys
 
 from yardstick.common import exceptions
+from yardstick.common import utils
 from yardstick.network_services.vnf_generic.vnf.sample_vnf import SampleVNFTrafficGen
 from yardstick.network_services.vnf_generic.vnf.sample_vnf import ClientResourceHelper
 from yardstick.network_services.vnf_generic.vnf.sample_vnf import Rfc2544ResourceHelper
@@ -135,43 +135,28 @@ class IxiaResourceHelper(ClientResourceHelper):
             mac["src_mac_{}".format(port_num)] = virt_intf.get("local_mac", default)
             mac["dst_mac_{}".format(port_num)] = virt_intf.get("dst_mac", default)
 
-        samples = {}
-        # Generate ixia traffic config...
         try:
             while not self._terminated.value:
-                traffic_profile.execute_traffic(self, self.client, mac)
+                first_run = traffic_profile.execute_traffic(
+                    self, self.client, mac)
                 self.client_started.value = 1
-                time.sleep(WAIT_FOR_TRAFFIC)
-                self.client.ix_stop_traffic()
+                # pylint: disable=unnecessary-lambda
+                utils.wait_until_true(lambda: self.client.is_traffic_stopped())
                 samples = self.generate_samples(traffic_profile.ports)
+
+                # 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)
-                status, samples = traffic_profile.get_drop_percentage(samples, min_tol,
-                                                                      max_tol, self.client, mac)
 
-                current = samples['CurrentDropPercentage']
-                if min_tol <= current <= max_tol or status == 'Completed':
+                if completed:
                     self._terminated.value = 1
 
-            self.client.ix_stop_traffic()
-            self._queue.put(samples)
-
-            if not self.rfc_helper.is_done():
-                self._terminated.value = 1
-                return
-
-            traffic_profile.execute_traffic(self, self.client, mac)
-            for _ in range(5):
-                time.sleep(self.LATENCY_TIME_SLEEP)
-                self.client.ix_stop_traffic()
-                samples = self.generate_samples(traffic_profile.ports, 'latency', {})
-                self._queue.put(samples)
-                traffic_profile.start_ixia_latency(self, self.client, mac)
-                if self._terminated.value:
-                    break
-
-            self.client.ix_stop_traffic()
         except Exception:  # pylint: disable=broad-except
-            LOG.exception("Run Traffic terminated")
+            LOG.exception('Run Traffic terminated')
 
         self._terminated.value = 1