diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-09-07 14:49:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-07 14:49:50 +0000 |
| commit | 227afb8285b8f178987a7d6eb1d28a74201a5d1b (patch) | |
| tree | 2501ab95b10e2958f93f6db7eba5fba66c136dd2 /testcases/Controllers | |
| parent | 800d0ed2c883a51122b7fa1aa4d9d86405ae5416 (diff) | |
| parent | f3381f49cc72fded67c1febe78b27e18ec396878 (diff) | |
Merge "remove imported FUNCTEST_REPO object"
Diffstat (limited to 'testcases/Controllers')
| -rw-r--r-- | testcases/Controllers/ONOS/Teston/adapters/foundation.py | 4 | ||||
| -rwxr-xr-x | testcases/Controllers/ONOS/Teston/onosfunctest.py | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/testcases/Controllers/ONOS/Teston/adapters/foundation.py b/testcases/Controllers/ONOS/Teston/adapters/foundation.py index 3fae2a5d..90eb1449 100644 --- a/testcases/Controllers/ONOS/Teston/adapters/foundation.py +++ b/testcases/Controllers/ONOS/Teston/adapters/foundation.py @@ -18,7 +18,7 @@ import re import time import yaml -from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO +import functest.utils.functest_utils as ft_utils class foundation: @@ -26,7 +26,7 @@ class foundation: def __init__(self): # currentpath = os.getcwd() - REPO_PATH = FUNCTEST_REPO + '/' + REPO_PATH = ft_utils.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 01537b99..a5c225ed 100755 --- a/testcases/Controllers/ONOS/Teston/onosfunctest.py +++ b/testcases/Controllers/ONOS/Teston/onosfunctest.py @@ -20,11 +20,11 @@ import re import time import argparse +from neutronclient.v2_0 import client as neutronclient + 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") @@ -55,8 +55,9 @@ 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( - "general.directories.dir_onos_sfc") +SFC_PATH = functest_utils.FUNCTEST_REPO + "/" + \ + functest_utils.get_parameter_from_yaml( + "general.directories.dir_onos_sfc") def RunScript(testname): |