diff options
| author |   Romanos Skiadas <rski@intracom-telecom.com> | 2016-09-09 14:31:47 +0300 |
|---|---|---|
| committer |   Jose Lausuch <jose.lausuch@ericsson.com> | 2016-09-09 13:35:31 +0000 |
| commit | 6cd0a90187cc8aa9ce37d802c75ebd36da3cea26 (patch) | |
| tree | e2fe9f660a3c06cb4ba7c87747e721b0bdbde6ff /test/functest/testcase_2.py | |
| parent | e0095c0f7bc359910633fda491013e9c1fae3408 (diff) | |
Use get_functest_config where appropriate
The latest functest enforces using `get_parameter_from_yaml` to only
get test specific parameters from the config file.
`get_functest_config` is given to get functest configuration parameters.
Change-Id: Icb6ec2ed4a9d6c278bf1c403d4d0c4f4b21e51b7
Signed-off-by: Romanos Skiadas <rski@intracom-telecom.com>
(cherry picked from commit cfa216a9c405c2a66f4909945ee0da1e7d91f1bb)
Diffstat (limited to 'test/functest/testcase_2.py')
| -rw-r--r-- | test/functest/testcase_2.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/functest/testcase_2.py b/test/functest/testcase_2.py index f5e5097..5f127d7 100644 --- a/test/functest/testcase_2.py +++ b/test/functest/testcase_2.py @@ -55,11 +55,11 @@ FLAVOR = ft_utils.get_parameter_from_yaml( "testcases.testcase_2.flavor", config_file) IMAGE_NAME = ft_utils.get_parameter_from_yaml( "testcases.testcase_2.image_name", config_file) -IMAGE_FILENAME = ft_utils.get_parameter_from_yaml( +IMAGE_FILENAME = ft_utils.get_functest_config( "general.openstack.image_file_name") -IMAGE_FORMAT = ft_utils.get_parameter_from_yaml( +IMAGE_FORMAT = ft_utils.get_functest_config( "general.openstack.image_disk_format") -IMAGE_PATH = ft_utils.get_parameter_from_yaml( +IMAGE_PATH = ft_utils.get_functest_config( "general.directories.dir_functest_data") + "/" + IMAGE_FILENAME KEYFILE_PATH = REPO_PATH + 'test/functest/id_rsa' @@ -102,7 +102,7 @@ TARGETS_2 = ft_utils.get_parameter_from_yaml( "testcases.testcase_2.targets2", config_file) SUCCESS_CRITERIA = ft_utils.get_parameter_from_yaml( "testcases.testcase_1.succes_criteria", config_file) -TEST_DB = ft_utils.get_parameter_from_yaml("results.test_db_url") +TEST_DB = ft_utils.get_functest_config("results.test_db_url") TEST_RESULT = "PASS" SUMMARY = "" |