diff options
| author |   Jose Lausuch <jose.lausuch@ericsson.com> | 2016-09-01 08:30:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-01 08:30:09 +0000 |
| commit | c94a1c01e46b21f0139a8b1419f26c8b9f867a41 (patch) | |
| tree | 0b1c11a9d286aefd1c015dac90d5acea94206678 /testcases/OpenStack/rally | |
| parent | 5fbdcb8d13e63cec2614a9703f0b3f640f05aa49 (diff) | |
| parent | f4d0a05011e961a363c6d99522684ecdeb959716 (diff) | |
Merge "unify functest_yaml obtain process"
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 f7199d301..e04ecbc52 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( |