diff options
| author |   SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-09-01 10:19:58 +0800 |
|---|---|---|
| committer |   Morgan Richomme <morgan.richomme@orange.com> | 2016-09-02 08:10:45 +0000 |
| commit | b582e4a5be0bcc3521cc239a31f681a11f4504db (patch) | |
| tree | b36928805f35e2d2d55c3e3057db6ebf10a89001 /testcases/Controllers/ONOS/Teston | |
| parent | f62e61cb31e3a39026c4f0bbdb6d6b4a1aebc2f3 (diff) | |
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 <feng.xiaowei@zte.com.cn>
(cherry picked from commit 470f573a3ac2eb1783efec6da01a3bee33360c65)
Diffstat (limited to 'testcases/Controllers/ONOS/Teston')
| -rw-r--r-- | testcases/Controllers/ONOS/Teston/adapters/foundation.py | 8 | ||||
| -rwxr-xr-x | testcases/Controllers/ONOS/Teston/onosfunctest.py | 12 |
2 files changed, 9 insertions, 11 deletions
diff --git a/testcases/Controllers/ONOS/Teston/adapters/foundation.py b/testcases/Controllers/ONOS/Teston/adapters/foundation.py index 47605eb74..70c84ac02 100644 --- a/testcases/Controllers/ONOS/Teston/adapters/foundation.py +++ b/testcases/Controllers/ONOS/Teston/adapters/foundation.py @@ -11,12 +11,14 @@ Description: # """ +import datetime import logging import os +import re import time + import yaml -import re -import datetime +from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO class foundation: @@ -24,7 +26,7 @@ class foundation: def __init__(self): # currentpath = os.getcwd() - REPO_PATH = os.environ['repos_dir'] + '/functest/' + REPO_PATH = FUNCTEST_REPO + '/' currentpath = REPO_PATH + 'testcases/Controllers/ONOS/Teston/CI' self.cipath = currentpath self.logdir = os.path.join(currentpath, 'log') diff --git a/testcases/Controllers/ONOS/Teston/onosfunctest.py b/testcases/Controllers/ONOS/Teston/onosfunctest.py index 2790e6941..6b922fba9 100755 --- a/testcases/Controllers/ONOS/Teston/onosfunctest.py +++ b/testcases/Controllers/ONOS/Teston/onosfunctest.py @@ -18,13 +18,13 @@ import datetime import os import re import time -import argparse - -from neutronclient.v2_0 import client as neutronclient +import argparse import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as functest_utils import functest.utils.openstack_utils as openstack_utils +from functest.utils.functest_utils import FUNCTEST_REPO as REPO_PATH +from neutronclient.v2_0 import client as neutronclient parser = argparse.ArgumentParser() parser.add_argument("-t", "--testcase", help="Testcase name") @@ -41,10 +41,6 @@ ONOS_REPO_PATH = functest_utils.get_parameter_from_yaml( "general.directories.dir_repos") ONOS_CONF_DIR = functest_utils.get_parameter_from_yaml( "general.directories.dir_functest_conf") -REPO_PATH = ONOS_REPO_PATH + '/functest/' -if not os.path.exists(REPO_PATH): - logger.error("Functest repository directory not found '%s'" % REPO_PATH) - exit(-1) ONOSCI_PATH = ONOS_REPO_PATH + "/" starttime = datetime.datetime.now() @@ -59,7 +55,7 @@ GLANCE_IMAGE_FILENAME = functest_utils.get_parameter_from_yaml( "onos_sfc.image_file_name") GLANCE_IMAGE_PATH = functest_utils.get_parameter_from_yaml( "general.directories.dir_functest_data") + "/" + GLANCE_IMAGE_FILENAME -SFC_PATH = REPO_PATH + functest_utils.get_parameter_from_yaml( +SFC_PATH = REPO_PATH + "/" + functest_utils.get_parameter_from_yaml( "general.directories.dir_onos_sfc") |