diff options
| author |   SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-09-07 22:13:42 +0800 |
|---|---|---|
| committer |   Morgan Richomme <morgan.richomme@orange.com> | 2016-09-08 16:40:45 +0000 |
| commit | 5d716dab95938923defdcd992dacaf024de49421 (patch) | |
| tree | fb6c55fc2a92a8a6837042a1af7fd490fb9a4c62 /testcases/features/promise.py | |
| parent | 4a4bfda9d9032aa9ae18ce91f9c62b7ac091851d (diff) | |
make use of functest_utils.get_parameter_from_yaml
JIRA: FUNCTEST-463
Change-Id: I1d54a65c5bfa2542f2fd3a2e408967641e6e4ac9
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
(cherry picked from commit 55d301a2622ff5b63d431b9272caa68224d53843)
Diffstat (limited to 'testcases/features/promise.py')
| -rwxr-xr-x | testcases/features/promise.py | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/testcases/features/promise.py b/testcases/features/promise.py index 5b23614d6..cce0f5dc1 100755 --- a/testcases/features/promise.py +++ b/testcases/features/promise.py @@ -32,34 +32,34 @@ parser.add_argument("-r", "--report", args = parser.parse_args() -dirs = ft_utils.get_parameter_from_yaml('general.directories') +dirs = ft_utils.get_functest_config('general.directories') PROMISE_REPO = dirs.get('dir_repo_promise') -RESULTS_DIR = ft_utils.get_parameter_from_yaml( - 'general.directories.dir_results') - -TENANT_NAME = ft_utils.get_parameter_from_yaml('promise.tenant_name') -TENANT_DESCRIPTION = ft_utils.get_parameter_from_yaml( - 'promise.tenant_description') -USER_NAME = ft_utils.get_parameter_from_yaml('promise.user_name') -USER_PWD = ft_utils.get_parameter_from_yaml('promise.user_pwd') -IMAGE_NAME = ft_utils.get_parameter_from_yaml('promise.image_name') -FLAVOR_NAME = ft_utils.get_parameter_from_yaml('promise.flavor_name') -FLAVOR_VCPUS = ft_utils.get_parameter_from_yaml('promise.flavor_vcpus') -FLAVOR_RAM = ft_utils.get_parameter_from_yaml('promise.flavor_ram') -FLAVOR_DISK = ft_utils.get_parameter_from_yaml('promise.flavor_disk') - - -GLANCE_IMAGE_FILENAME = ft_utils.get_parameter_from_yaml( - 'general.openstack.image_file_name') -GLANCE_IMAGE_FORMAT = ft_utils.get_parameter_from_yaml( - 'general.openstack.image_disk_format') -GLANCE_IMAGE_PATH = ft_utils.get_parameter_from_yaml( - 'general.directories.dir_functest_data') + "/" + GLANCE_IMAGE_FILENAME - -NET_NAME = ft_utils.get_parameter_from_yaml('promise.network_name') -SUBNET_NAME = ft_utils.get_parameter_from_yaml('promise.subnet_name') -SUBNET_CIDR = ft_utils.get_parameter_from_yaml('promise.subnet_cidr') -ROUTER_NAME = ft_utils.get_parameter_from_yaml('promise.router_name') +RESULTS_DIR = ft_utils.get_functest_config('general.directories.dir_results') + +TENANT_NAME = ft_utils.get_functest_config('promise.tenant_name') +TENANT_DESCRIPTION = \ + ft_utils.get_functest_config('promise.tenant_description') +USER_NAME = ft_utils.get_functest_config('promise.user_name') +USER_PWD = ft_utils.get_functest_config('promise.user_pwd') +IMAGE_NAME = ft_utils.get_functest_config('promise.image_name') +FLAVOR_NAME = ft_utils.get_functest_config('promise.flavor_name') +FLAVOR_VCPUS = ft_utils.get_functest_config('promise.flavor_vcpus') +FLAVOR_RAM = ft_utils.get_functest_config('promise.flavor_ram') +FLAVOR_DISK = ft_utils.get_functest_config('promise.flavor_disk') + + +GLANCE_IMAGE_FILENAME = \ + ft_utils.get_functest_config('general.openstack.image_file_name') +GLANCE_IMAGE_FORMAT = \ + ft_utils.get_functest_config('general.openstack.image_disk_format') +GLANCE_IMAGE_PATH = \ + ft_utils.get_functest_config('general.directories.dir_functest_data') + \ + "/" + GLANCE_IMAGE_FILENAME + +NET_NAME = ft_utils.get_functest_config('promise.network_name') +SUBNET_NAME = ft_utils.get_functest_config('promise.subnet_name') +SUBNET_CIDR = ft_utils.get_functest_config('promise.subnet_cidr') +ROUTER_NAME = ft_utils.get_functest_config('promise.router_name') """ logging configuration """ |