From: Deepak S <deepak.s@linux.intel.com>
Date: Wed, 27 Sep 2017 06:02:15 +0000 (-0700)
Subject: Terminate the run traffic if initiated after traffic is closed
X-Git-Tag: opnfv-6.0.0~421
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F05%2F43305%2F1;p=yardstick.git

Terminate the run traffic if initiated after traffic is closed

Change-Id: I89fc4bccb5b5a0d49d804fca72b59e53ff77a805
Signed-off-by: Deepak S <deepak.s@linux.intel.com>
---

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 12266d6ad..22aaf6dfb 100644
--- a/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
+++ b/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
@@ -170,24 +170,25 @@ class IxiaResourceHelper(ClientResourceHelper):
 
             self.client.ix_stop_traffic()
             self._queue.put(samples)
-        except Exception:
-            LOG.exception("Run Traffic terminated")
 
-        if not self.rfc_helper.is_done():
-            self._terminated.value = 1
-            return
+            if not self.rfc_helper.is_done():
+                self._terminated.value = 1
+                return
+
+            traffic_profile.execute_traffic(self, self.client, mac, ixia_file)
+            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, ixia_file)
+                if self._terminated.value:
+                    break
 
-        traffic_profile.execute_traffic(self, self.client, mac, ixia_file)
-        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, ixia_file)
-            if self._terminated.value:
-                break
+        except Exception:
+            LOG.exception("Run Traffic terminated")
 
-        self.client.ix_stop_traffic()
         self._terminated.value = 1
 
     def collect_kpi(self):