X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=yardstick%2Fnetwork_services%2Fvnf_generic%2Fvnf%2Ftg_rfc2544_ixia.py;h=a8b19cfbad52f961ac6cba35f545d9b62cbf3095;hb=7085a190cefad8c72774925dab690683d76695da;hp=cd9553d12b57c4e154d4a87f436cfb231cb5d347;hpb=4529399c79b1e61ea37cb79e790adc130c98cf45;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 cd9553d12..a8b19cfba 100644
--- a/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
+++ b/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
@@ -14,7 +14,6 @@
 
 from __future__ import absolute_import
 
-import json
 import time
 import os
 import logging
@@ -81,11 +80,13 @@ class IxiaResourceHelper(ClientResourceHelper):
         latency = stats[0]
 
         samples = {}
-        for port_name in ports:
+        # this is not DPDK port num, but this is whatever number we gave
+        # when we selected ports and programmed the profile
+        for port_num in ports:
             try:
-                # this is not DPDK port num, but this is whatever number we gave
-                # when we selected ports and programmed the profile
-                port_num = self.vnfd_helper.port_num(port_name)
+                # 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"]
                 samples[port_name] = {
                     "rx_throughput_kps": float(last_result["Rx_Rate_Kbps"][port_num]),
                     "tx_throughput_kps": float(last_result["Tx_Rate_Kbps"][port_num]),
@@ -128,39 +129,28 @@ class IxiaResourceHelper(ClientResourceHelper):
 
         self.client.ix_assign_ports()
 
-        ixia_file = find_relative_file("ixia_traffic.cfg",
-                                       self.scenario_helper.scenario_cfg["task_path"])
-
-        static_traffic = {}
-        with open(ixia_file) as stream:
-            try:
-                static_traffic = json.load(stream)
-            except Exception:
-                LOG.exception("")
         mac = {}
-        for vld_id, traffic in static_traffic.items():
-            intfs = self.vnfd_helper.port_pairs.networks.get(vld_id, [])
-            interface = next(intfs, None)
-            if interface:
-                virt_intf = interface["virtual-interface"]
-                # we only know static traffic id by reading the json
-                # this is used by _get_ixia_traffic_profile
-                mac["src_mac_{}".format(traffic["id"])] = virt_intf.get("local_mac", default)
-                mac["dst_mac_{}".format(traffic["id"])] = virt_intf.get("dst_mac", default)
+        for port_name in self.vnfd_helper.port_pairs.all_ports:
+            intf = self.vnfd_helper.find_interface(name=port_name)
+            virt_intf = intf["virtual-interface"]
+            # we only know static traffic id by reading the json
+            # this is used by _get_ixia_trafficrofile
+            port_num = self.vnfd_helper.port_num(intf)
+            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, ixia_file)
+                traffic_profile.execute_traffic(self, self.client, mac)
                 self.client_started.value = 1
                 time.sleep(WAIT_FOR_TRAFFIC)
                 self.client.ix_stop_traffic()
                 samples = self.generate_samples(traffic_profile.ports)
                 self._queue.put(samples)
                 status, samples = traffic_profile.get_drop_percentage(self, samples, min_tol,
-                                                                      max_tol, self.client, mac,
-                                                                      ixia_file)
+                                                                      max_tol, self.client, mac)
 
                 current = samples['CurrentDropPercentage']
                 if min_tol <= current <= max_tol or status == 'Completed':
@@ -168,24 +158,25 @@ class IxiaResourceHelper(ClientResourceHelper):
 
             self.client.ix_stop_traffic()
             self._queue.put(samples)
-        except Exception:
-            LOG.info("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)
+            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
 
-        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):
@@ -213,13 +204,6 @@ class IxiaTrafficGen(SampleVNFTrafficGen):
     def scale(self, flavor=""):
         pass
 
-    def listen_traffic(self, traffic_profile):
-        pass
-
     def terminate(self):
         self.resource_helper.stop_collect()
         super(IxiaTrafficGen, self).terminate()
-
-    def wait_for_instantiate(self):
-        # not needed for IxNet
-        pass