Merge "Added TC for vFW in heat context with ixia TG"

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

diff --git a/yardstick/network_services/vnf_generic/vnf/tg_ixload.py b/yardstick/network_services/vnf_generic/vnf/tg_ixload.py
index c504900..6be2b58 100644 (file)
--- a/yardstick/network_services/vnf_generic/vnf/tg_ixload.py
+++ b/yardstick/network_services/vnf_generic/vnf/tg_ixload.py
@@ -27,6 +27,7 @@ import six
 from yardstick.common.utils import makedirs
 from yardstick.network_services.vnf_generic.vnf.sample_vnf import SampleVNFTrafficGen
 from yardstick.network_services.vnf_generic.vnf.sample_vnf import ClientResourceHelper
+from yardstick.benchmark.scenarios.networking.vnf_generic import find_relative_file
 
 LOG = logging.getLogger(__name__)
 
@@ -46,7 +47,7 @@ IXLOAD_CONFIG_TEMPLATE = '''\
     },
     "remote_server": "%s",
     "result_dir": "%s",
-    "ixload_cfg": '"C:/Results/%s"
+    "ixload_cfg": "C:/Results/%s"
 }'''
 
 IXLOAD_CMD = "{ixloadpy} {http_ixload} {args}"
@@ -92,7 +93,9 @@ class IxLoadResourceHelper(ClientResourceHelper):
 
     def setup(self):
         # TODO: fixupt scenario_helper to hanlde ixia
-        self.resource_file_name = str(self.scenario_helper.scenario_cfg['ixia_profile'])
+        self.resource_file_name = \
+            find_relative_file(self.scenario_helper.scenario_cfg['ixia_profile'],
+                               self.scenario_helper.scenario_cfg["task_path"])
         makedirs(self.RESULTS_MOUNT)
         cmd = MOUNT_CMD.format(self.vnfd_helper.mgmt_interface, self)
         LOG.debug(cmd)
@@ -130,7 +133,7 @@ class IxLoadTrafficGen(SampleVNFTrafficGen):
         for interface in self.vnfd_helper.interfaces:
             vpci_list = interface['virtual-interface']["vpci"].split(":")
             card = vpci_list[0]
-            ports.append(vpci_list[1])
+            ports.append(str(vpci_list[1]))
 
         for csv_file in glob.iglob(self.ssh_helper.join_bin_path('*.csv')):
             os.unlink(csv_file)
@@ -142,6 +145,7 @@ class IxLoadTrafficGen(SampleVNFTrafficGen):
             os.path.basename(self.resource_helper.resource_file_name))
 
         http_ixload_path = os.path.join(VNF_PATH, "../../traffic_profile")
+
         cmd = IXLOAD_CMD.format(
             ixloadpy=os.path.join(ixia_config["py_bin_path"], "ixloadpython"),
             http_ixload=os.path.join(http_ixload_path, "http_ixload.py"),
@@ -168,7 +172,10 @@ class IxLoadTrafficGen(SampleVNFTrafficGen):
 
     def instantiate(self, scenario_cfg, context_cfg):
         super(IxLoadTrafficGen, self).instantiate(scenario_cfg, context_cfg)
-        self.done = False
+
+    def wait_for_instantiate(self):
+        # not needed for Ixload
+        pass
 
     def terminate(self):
         call(["pkill", "-9", "http_ixload.py"])