Merge "Add common openstack opertation scenarios: network"

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

diff --git a/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_trex.py b/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_trex.py
index 79e42e0..d94a9a6 100644 (file)
--- a/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_trex.py
+++ b/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_trex.py
@@ -52,11 +52,14 @@ class TrexRfcResourceHelper(TrexResourceHelper):
     def _build_ports(self):
         self.tg_port_pairs, self.networks = MultiPortConfig.get_port_pairs(
             self.vnfd_helper.interfaces)
-        self.priv_ports = [int(x[0][-1]) for x in self.tg_port_pairs]
-        self.pub_ports = [int(x[1][-1]) for x in self.tg_port_pairs]
+        self.priv_ports = [int(x[0][2:]) for x in self.tg_port_pairs]
+        self.pub_ports = [int(x[1][2:]) for x in self.tg_port_pairs]
         self.my_ports = list(set(chain(self.priv_ports, self.pub_ports)))
 
     def _run_traffic_once(self, traffic_profile):
+        if self._terminated.value:
+            return
+
         traffic_profile.execute(self)
         self.client_started.value = 1
         time.sleep(self.RUN_DURATION)