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 353d31f..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__)
 
@@ -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)