Improve IXIA IxNetwork library and traffic profile (1)

This patch introduces a new way to configure the TCL IxNetwork server.
All the configuration is done using the TCL API, removing the need of
using the pre-saved configuration file.

"IxNextgen.assign_ports" creates and assigns the virtual ports for each
physical port defined in the test case.

"IxNextgen.create_traffic_item" creates one traffic item and two flow
groups per pair of ports, in both directions.

"IxNextgen.gt_statistics" retrieves only the required statistics to
generate the samples blob in the traffic generator.

JIRA: YARDSTICK-1116

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

1 files changed, 10 insertions, 13 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 94ab69891..f8799c88b 100644
--- a/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
+++ b/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
@@ -18,11 +18,11 @@ 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
 
+
 LOG = logging.getLogger(__name__)
 
 WAIT_AFTER_CFG_LOAD = 10
@@ -62,10 +62,10 @@ class IxiaResourceHelper(ClientResourceHelper):
         self._connect()
 
     def _connect(self, client=None):
-        self.client._connect(self.vnfd_helper)
+        self.client.connect(self.vnfd_helper)
 
     def get_stats(self, *args, **kwargs):
-        return self.client.ix_get_statistics()
+        return self.client.get_statistics()
 
     def stop_collect(self):
         self._terminated.value = 1
@@ -108,6 +108,12 @@ class IxiaResourceHelper(ClientResourceHelper):
 
         return samples
 
+    def _initialize_client(self):
+        """Initialize the IXIA IxNetwork client and configure the server"""
+        self.client.clear_config()
+        self.client.assign_ports()
+        self.client.create_traffic_model()
+
     def run_traffic(self, traffic_profile):
         if self._terminated.value:
             return
@@ -117,16 +123,7 @@ class IxiaResourceHelper(ClientResourceHelper):
         default = "00:00:00:00:00:00"
 
         self._build_ports()
-
-        # we don't know client_file_name until runtime as instantiate
-        client_file_name = \
-            utils.find_relative_file(
-                self.scenario_helper.scenario_cfg['ixia_profile'],
-                self.scenario_helper.scenario_cfg["task_path"])
-        self.client.ix_load_config(client_file_name)
-        time.sleep(WAIT_AFTER_CFG_LOAD)
-
-        self.client.ix_assign_ports()
+        self._initialize_client()
 
         mac = {}
         for port_name in self.vnfd_helper.port_pairs.all_ports: