diff options
| author |   SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-08-31 10:22:33 +0800 |
|---|---|---|
| committer |   Jose Lausuch <jose.lausuch@ericsson.com> | 2016-09-02 07:54:09 +0000 |
| commit | 4a803db9fa32c42559306da22beaab437d664fdc (patch) | |
| tree | 0984ed984f3397f4f0a695353c069d472efbc389 /testcases/OpenStack/rally | |
| parent | cc315c6534d27c24fe543b33e2ac9f66cda83d38 (diff) | |
unify functest_yaml obtain process
functest_yaml is needed in almost all of the testcases, the obtain process is the same:
with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f:
functest_yaml = yaml.safe_load(f)
f.close()
abstract a method to unify the process, and provide the interface
JIRA: FUNCTEST-447
Change-Id: I96a9a9962d7b466f10bbd3b5ab2495957524e22a
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
(cherry picked from commit f4d0a05011e961a363c6d99522684ecdeb959716)
Diffstat (limited to 'testcases/OpenStack/rally')
| -rwxr-xr-x | testcases/OpenStack/rally/run_rally-cert.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/testcases/OpenStack/rally/run_rally-cert.py b/testcases/OpenStack/rally/run_rally-cert.py index f3eb79d26..43096c19e 100755 --- a/testcases/OpenStack/rally/run_rally-cert.py +++ b/testcases/OpenStack/rally/run_rally-cert.py @@ -15,18 +15,17 @@ # """ tests configuration """ -import argparse import json import os import re import subprocess import time + +import argparse import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as functest_utils import functest.utils.openstack_utils as os_utils import iniparse -import yaml - tests = ['authenticate', 'glance', 'cinder', 'heat', 'keystone', 'neutron', 'nova', 'quotas', 'requests', 'vm', 'all'] @@ -76,9 +75,7 @@ if not os.path.exists(REPO_PATH): exit(-1) -with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: - functest_yaml = yaml.safe_load(f) -f.close() +functest_yaml = functest_utils.get_functest_yaml() HOME = os.environ['HOME'] + "/" RALLY_DIR = REPO_PATH + functest_yaml.get("general").get( |