Merge "Fix setting `flow` configuration in TC yaml"

[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 2010546..94ab069 100644 (file)
--- 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,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
 import logging
-import sys
 
-from yardstick.common import exceptions
 from yardstick.common import utils
+from yardstick.network_services.libs.ixia_libs.ixnet import ixnet_api
 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
@@ -27,14 +25,6 @@ LOG = logging.getLogger(__name__)
 
 WAIT_AFTER_CFG_LOAD = 10
 WAIT_FOR_TRAFFIC = 30
-IXIA_LIB = os.path.dirname(os.path.realpath(__file__))
-IXNET_LIB = os.path.join(IXIA_LIB, "../../libs/ixia_libs/IxNet")
-sys.path.append(IXNET_LIB)
-
-try:
-    from IxNet import IxNextgen
-except ImportError:
-    IxNextgen = exceptions.ErrorClass
 
 
 class IxiaRfc2544Helper(Rfc2544ResourceHelper):
@@ -51,7 +41,7 @@ class IxiaResourceHelper(ClientResourceHelper):
         super(IxiaResourceHelper, self).__init__(setup_helper)
         self.scenario_helper = setup_helper.scenario_helper
 
-        self.client = IxNextgen()
+        self.client = ixnet_api.IxNextgen()
 
         if rfc_helper_type is None:
             rfc_helper_type = IxiaRfc2544Helper
@@ -69,10 +59,8 @@ class IxiaResourceHelper(ClientResourceHelper):
 
     def stop_collect(self):
         self._terminated.value = 1
-        if self.client:
-            self.client.ix_stop_traffic()
 
-    def generate_samples(self, ports, key=None, default=None):
+    def generate_samples(self, ports, duration):
         stats = self.get_stats()
 
         samples = {}
@@ -82,27 +70,23 @@ class IxiaResourceHelper(ClientResourceHelper):
             try:
                 # reverse lookup port name from port_num so the stats dict is descriptive
                 intf = self.vnfd_helper.find_interface_by_port(port_num)
-                port_name = intf["name"]
+                port_name = intf['name']
+                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] = {
-                    "rx_throughput_kps": float(stats["Rx_Rate_Kbps"][port_num]),
-                    "tx_throughput_kps": float(stats["Tx_Rate_Kbps"][port_num]),
-                    "rx_throughput_mbps": float(stats["Rx_Rate_Mbps"][port_num]),
-                    "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,
+                    'rx_throughput_kps': float(stats['Rx_Rate_Kbps'][port_num]),
+                    'tx_throughput_kps': float(stats['Tx_Rate_Kbps'][port_num]),
+                    'rx_throughput_mbps': float(stats['Rx_Rate_Mbps'][port_num]),
+                    '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]),
+                    'RxThroughput': float(stats['Valid_Frames_Rx'][port_num]) / duration,
+                    'TxThroughput': float(stats['Frames_Tx'][port_num]) / duration,
+                    'Store-Forward_Avg_latency_ns': utils.safe_cast(avg_latency, int, 0),
+                    'Store-Forward_Min_latency_ns': utils.safe_cast(min_latency, int, 0),
+                    'Store-Forward_Max_latency_ns': utils.safe_cast(max_latency, int, 0)
                 }
-                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}
             except IndexError:
                 pass
 
@@ -114,7 +98,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
 
@@ -141,13 +125,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)
@@ -169,12 +151,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 = []