aboutsummaryrefslogtreecommitdiffstats
path: root/testcases/OpenStack/rally
diff options
context:
space:
mode:
authorSerenaFeng <feng.xiaowei@zte.com.cn>2016-09-07 09:14:27 +0800
committerSerenaFeng <feng.xiaowei@zte.com.cn>2016-09-07 20:47:51 +0800
commitf3381f49cc72fded67c1febe78b27e18ec396878 (patch)
treee6c7558efe3b08575c4589b2a46ef62e5d22d63f /testcases/OpenStack/rally
parent44364e6db1941410632e6ab732e72bcc718a86da (diff)
remove imported FUNCTEST_REPO object
According to openstack style guidelines in http://docs.openstack.org/developer/hacking/ **** Do not import objects, only modules (*) **** so direct FUNCTEST_REPO import should be avoided from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO JIRA: FUNCTEST-459 Change-Id: Iac0d07a54957cd7419391de183660ac1ce0efd49 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'testcases/OpenStack/rally')
-rwxr-xr-xtestcases/OpenStack/rally/run_rally-cert.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/testcases/OpenStack/rally/run_rally-cert.py b/testcases/OpenStack/rally/run_rally-cert.py
index f1218545..ebea59e8 100755
--- a/testcases/OpenStack/rally/run_rally-cert.py
+++ b/testcases/OpenStack/rally/run_rally-cert.py
@@ -20,14 +20,14 @@ import os
import re
import subprocess
import time
-import yaml
import argparse
+import iniparse
+import yaml
+
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
-from functest.utils.functest_utils import FUNCTEST_REPO as REPO_PATH
tests = ['authenticate', 'glance', 'cinder', 'heat', 'keystone',
'neutron', 'nova', 'quotas', 'requests', 'vm', 'all']
@@ -75,8 +75,8 @@ logger = ft_logger.Logger("run_rally").getLogger()
functest_yaml = functest_utils.get_functest_yaml()
HOME = os.environ['HOME'] + "/"
-RALLY_DIR = REPO_PATH + '/' + functest_yaml.get("general").get(
- "directories").get("dir_rally")
+RALLY_DIR = functest_utils.FUNCTEST_REPO + '/' + \
+ functest_yaml.get("general").get("directories").get("dir_rally")
TEMPLATE_DIR = RALLY_DIR + "scenario/templates"
SUPPORT_DIR = RALLY_DIR + "scenario/support"
TEMP_DIR = RALLY_DIR + "var"