From b582e4a5be0bcc3521cc239a31f681a11f4504db Mon Sep 17 00:00:00 2001 From: SerenaFeng Date: Thu, 1 Sep 2016 10:19:58 +0800 Subject: stop hardcoded FUNCTEST_REPO path everywhere functest repo is used by almost every testcase, each place we get it like: REPOS_DIR = os.getenv('repos_dir') FUNCTEST_REPO = ("%s/functest" % REPOS_DIR) provide a common interface in functest_util.py JIRA: FUNCTEST-453 Change-Id: Ie0635dacc761ed2d05b7e606530368844f32ebaf Signed-off-by: SerenaFeng (cherry picked from commit 470f573a3ac2eb1783efec6da01a3bee33360c65) --- testcases/OpenStack/examples/create_instance_and_ip.py | 1 - testcases/OpenStack/rally/run_rally-cert.py | 8 ++------ testcases/OpenStack/tempest/run_tempest.py | 7 +++---- testcases/OpenStack/vPing/vping_util.py | 5 ++--- 4 files changed, 7 insertions(+), 14 deletions(-) (limited to 'testcases/OpenStack') diff --git a/testcases/OpenStack/examples/create_instance_and_ip.py b/testcases/OpenStack/examples/create_instance_and_ip.py index 92a3df6b5..3d41e5dde 100755 --- a/testcases/OpenStack/examples/create_instance_and_ip.py +++ b/testcases/OpenStack/examples/create_instance_and_ip.py @@ -28,7 +28,6 @@ args = parser.parse_args() """ logging configuration """ logger = ft_logger.Logger("create_instance_and_ip").getLogger() -REPO_PATH = os.environ['repos_dir'] + '/functest/' HOME = os.environ['HOME'] + "/" VM_BOOT_TIMEOUT = 180 diff --git a/testcases/OpenStack/rally/run_rally-cert.py b/testcases/OpenStack/rally/run_rally-cert.py index 43096c19e..b77cbdf54 100755 --- a/testcases/OpenStack/rally/run_rally-cert.py +++ b/testcases/OpenStack/rally/run_rally-cert.py @@ -26,6 +26,7 @@ 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'] @@ -69,16 +70,11 @@ else: """ logging configuration """ logger = ft_logger.Logger("run_rally").getLogger() -REPO_PATH = os.environ['repos_dir'] + '/functest/' -if not os.path.exists(REPO_PATH): - logger.error("Functest repository directory not found '%s'" % REPO_PATH) - exit(-1) - functest_yaml = functest_utils.get_functest_yaml() HOME = os.environ['HOME'] + "/" -RALLY_DIR = REPO_PATH + functest_yaml.get("general").get( +RALLY_DIR = REPO_PATH + '/' + functest_yaml.get("general").get( "directories").get("dir_rally") TEMPLATE_DIR = RALLY_DIR + "scenario/templates" SUPPORT_DIR = RALLY_DIR + "scenario/support" diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py index fbb65dbb7..390c8a65f 100755 --- a/testcases/OpenStack/tempest/run_tempest.py +++ b/testcases/OpenStack/tempest/run_tempest.py @@ -14,7 +14,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 # import ConfigParser -import argparse import os import re import shutil @@ -22,11 +21,12 @@ import subprocess import sys import time +import argparse import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as ft_utils import functest.utils.openstack_utils as os_utils import yaml - +from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO modes = ['full', 'smoke', 'baremetal', 'compute', 'data_processing', 'identity', 'image', 'network', 'object_storage', 'orchestration', @@ -58,8 +58,6 @@ args = parser.parse_args() """ logging configuration """ logger = ft_logger.Logger("run_tempest").getLogger() -REPO_PATH = os.environ['repos_dir'] + '/functest/' - functest_yaml = ft_utils.get_functest_yaml() TEST_DB = functest_yaml.get("results").get("test_db_url") @@ -92,6 +90,7 @@ RESULTS_DIR = functest_yaml.get("general").get("directories").get( TEMPEST_RESULTS_DIR = RESULTS_DIR + '/tempest' TEST_LIST_DIR = functest_yaml.get("general").get("directories").get( "dir_tempest_cases") +REPO_PATH = FUNCTEST_REPO + '/' TEMPEST_CUSTOM = REPO_PATH + TEST_LIST_DIR + 'test_list.txt' TEMPEST_BLACKLIST = REPO_PATH + TEST_LIST_DIR + 'blacklist.txt' TEMPEST_DEFCORE = REPO_PATH + TEST_LIST_DIR + 'defcore_req.txt' diff --git a/testcases/OpenStack/vPing/vping_util.py b/testcases/OpenStack/vPing/vping_util.py index 8e9ce23ec..d3ca44139 100644 --- a/testcases/OpenStack/vPing/vping_util.py +++ b/testcases/OpenStack/vPing/vping_util.py @@ -7,10 +7,9 @@ import time import functest.utils.functest_utils as ft_utils import functest.utils.openstack_utils as os_utils import paramiko +from functest.utils.functest_utils import FUNCTEST_REPO as REPO_PATH from scp import SCPClient -REPO_PATH = os.environ['repos_dir'] + '/functest/' - functest_yaml = ft_utils.get_functest_yaml() NAME_VM_1 = functest_yaml.get("vping").get("vm_name_1") @@ -340,7 +339,7 @@ def transfer_ping_script(ssh, floatip): logger.info("Trying to transfer ping.sh to %s..." % floatip) scp = SCPClient(ssh.get_transport()) - ping_script = REPO_PATH + "testcases/OpenStack/vPing/ping.sh" + ping_script = REPO_PATH + '/' + "testcases/OpenStack/vPing/ping.sh" try: scp.put(ping_script, "~/") except: -- cgit 1.2.3-korg