summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2017-09-20 15:17:09 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-20 15:17:09 +0000
commit05f2d66b34290fd2538f5c50e841db0b86616e77 (patch)
tree3d9810118250e2d09cead44d411e819f287e18a3
parent2e2e99676b9abef1e6d936e37055be9f4b2855d9 (diff)
parent54745148cc04ade4c0e5aacbeb9dc32d4b8e85ab (diff)
Merge "prox: use find_relative_file when uploading"
-rw-r--r--tests/unit/network_services/vnf_generic/vnf/test_prox_helpers.py2
-rw-r--r--yardstick/network_services/vnf_generic/vnf/prox_helpers.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/unit/network_services/vnf_generic/vnf/test_prox_helpers.py b/tests/unit/network_services/vnf_generic/vnf/test_prox_helpers.py
index 2202c11a5..995b4a2cc 100644
--- a/tests/unit/network_services/vnf_generic/vnf/test_prox_helpers.py
+++ b/tests/unit/network_services/vnf_generic/vnf/test_prox_helpers.py
@@ -934,7 +934,7 @@ class TestProxDpdkVnfSetupEnvHelper(unittest.TestCase):
],
}
- mock_find_path.side_effect = ['1', '2']
+ mock_find_path.side_effect = ['1', '2'] + [str(i) for i in range(len(vnf1['prox_files']))]
vnfd_helper = mock.MagicMock()
ssh_helper = mock.MagicMock()
scenario_helper = ScenarioHelper('vnf1')
diff --git a/yardstick/network_services/vnf_generic/vnf/prox_helpers.py b/yardstick/network_services/vnf_generic/vnf/prox_helpers.py
index 30524a192..6b581b6b3 100644
--- a/yardstick/network_services/vnf_generic/vnf/prox_helpers.py
+++ b/yardstick/network_services/vnf_generic/vnf/prox_helpers.py
@@ -782,7 +782,8 @@ class ProxDpdkVnfSetupEnvHelper(DpdkVnfSetupEnvHelper):
prox_files = [prox_files]
for key_prox_file in prox_files:
base_prox_file = os.path.basename(key_prox_file)
- remote_prox_file = self.copy_to_target(key_prox_file, base_prox_file)
+ key_prox_path = find_relative_file(key_prox_file, task_path)
+ remote_prox_file = self.copy_to_target(key_prox_path, base_prox_file)
self.additional_files[base_prox_file] = remote_prox_file
self._prox_config_data = self.generate_prox_config_file(config_path)