From cfa216a9c405c2a66f4909945ee0da1e7d91f1bb Mon Sep 17 00:00:00 2001 From: Romanos Skiadas Date: Fri, 9 Sep 2016 14:31:47 +0300 Subject: 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 --- test/functest/run_tests.py | 2 +- test/functest/testcase_1.py | 8 ++++---- test/functest/testcase_2.py | 8 ++++---- test/functest/testcase_4.py | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/test/functest/run_tests.py b/test/functest/run_tests.py index 6f3a969..b5eedb5 100644 --- a/test/functest/run_tests.py +++ b/test/functest/run_tests.py @@ -24,7 +24,7 @@ parser.add_argument("-r", "--report", action="store_true") args = parser.parse_args() -TEST_DB_URL = ft_utils.get_parameter_from_yaml('results.test_db_url') +TEST_DB_URL = ft_utils.get_functest_config('results.test_db_url') logger = ft_logger.Logger("sdnvpn-run-tests").getLogger() REPO_PATH = os.environ['repos_dir'] + '/sdnvpn/' diff --git a/test/functest/testcase_1.py b/test/functest/testcase_1.py index d37f196..1356518 100644 --- a/test/functest/testcase_1.py +++ b/test/functest/testcase_1.py @@ -50,11 +50,11 @@ FLAVOR = ft_utils.get_parameter_from_yaml( "testcases.testcase_1.flavor", config_file) IMAGE_NAME = ft_utils.get_parameter_from_yaml( "testcases.testcase_1.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 # NEUTRON Private Network parameters @@ -85,7 +85,7 @@ TARGETS_2 = ft_utils.get_parameter_from_yaml( "testcases.testcase_1.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 = "" 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 = "" diff --git a/test/functest/testcase_4.py b/test/functest/testcase_4.py index cc4237c..3419182 100644 --- a/test/functest/testcase_4.py +++ b/test/functest/testcase_4.py @@ -50,11 +50,11 @@ FLAVOR = ft_utils.get_parameter_from_yaml( "testcases.testcase_4.flavor", config_file) IMAGE_NAME = ft_utils.get_parameter_from_yaml( "testcases.testcase_4.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 # NEUTRON Private Network parameters @@ -85,7 +85,7 @@ TARGETS_2 = ft_utils.get_parameter_from_yaml( "testcases.testcase_4.targets2", config_file) SUCCESS_CRITERIA = ft_utils.get_parameter_from_yaml( "testcases.testcase_4.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 = "" -- cgit 1.2.3-korg