diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-09-07 23:15:25 +0200 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-09-08 13:53:25 +0200 |
commit | 2e7f66734394dc5e749ef9ac95e46a8ded9fb2c9 (patch) | |
tree | 45d1555c4afad366ba2354ea238207c4330ba9ab /functest/opnfv_tests/vnf/router/test_controller/function_test_exec.py | |
parent | 98f3bf16722e5e718130f960910d64bc76951e3b (diff) |
Stop cloning when running vyos_vrouter
It moves the clone operation into docker build instead.
Change-Id: I296005d8638510a999665d383a26c4fcd48897a6
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/opnfv_tests/vnf/router/test_controller/function_test_exec.py')
-rw-r--r-- | functest/opnfv_tests/vnf/router/test_controller/function_test_exec.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/functest/opnfv_tests/vnf/router/test_controller/function_test_exec.py b/functest/opnfv_tests/vnf/router/test_controller/function_test_exec.py index 9d484cb56..0b8a69b73 100644 --- a/functest/opnfv_tests/vnf/router/test_controller/function_test_exec.py +++ b/functest/opnfv_tests/vnf/router/test_controller/function_test_exec.py @@ -12,6 +12,7 @@ """vrouter function test execution module""" import logging +import os import time import yaml @@ -31,11 +32,11 @@ class FunctionTestExec(object): credentials = util_info["credentials"] self.vnf_ctrl = VnfController(util_info) - test_cmd_map_file = open(self.util.vnf_data_dir + - self.util.opnfv_vnf_data_dir + - self.util.command_template_dir + - self.util.test_cmd_map_yaml_file, - 'r') + test_cmd_map_file = open( + os.path.join( + self.util.vnf_data_dir, self.util.command_template_dir, + self.util.test_cmd_map_yaml_file), + 'r') self.test_cmd_map_yaml = yaml.safe_load(test_cmd_map_file) test_cmd_map_file.close() |