diff options
Diffstat (limited to 'testcases')
| -rw-r--r-- | testcases/Controllers/ONOS/Teston/adapters/foundation.py | 4 | ||||
| -rwxr-xr-x | testcases/Controllers/ONOS/Teston/onosfunctest.py | 9 | ||||
| -rwxr-xr-x | testcases/OpenStack/rally/run_rally-cert.py | 10 | ||||
| -rwxr-xr-x | testcases/OpenStack/tempest/run_tempest.py | 6 | ||||
| -rw-r--r-- | testcases/OpenStack/vPing/vping_util.py | 13 | ||||
| -rwxr-xr-x | testcases/features/sfc/sfc.py | 6 | ||||
| -rwxr-xr-x | testcases/security_scan/security_scan.py | 10 | ||||
| -rwxr-xr-x | testcases/vnf/vIMS/vIMS.py | 9 |
8 files changed, 35 insertions, 32 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): 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" diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py index e9397218..c426eb63 100755 --- a/testcases/OpenStack/tempest/run_tempest.py +++ b/testcases/OpenStack/tempest/run_tempest.py @@ -22,11 +22,11 @@ import sys import time import argparse +import yaml + 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', @@ -90,7 +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 + '/' +REPO_PATH = ft_utils.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 7e7173ae..e85476e6 100644 --- a/testcases/OpenStack/vPing/vping_util.py +++ b/testcases/OpenStack/vPing/vping_util.py @@ -4,12 +4,13 @@ import re import sys 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 +import functest.utils.functest_utils as ft_utils +import functest.utils.openstack_utils as os_utils + +FUNCTEST_REPO = ft_utils.FUNCTEST_REPO functest_yaml = ft_utils.get_functest_yaml() NAME_VM_1 = functest_yaml.get("vping").get("vm_name_1") @@ -57,8 +58,8 @@ def pMsg(value): def check_repo_exist(): - if not os.path.exists(REPO_PATH): - logger.error("Functest repository not found '%s'" % REPO_PATH) + if not os.path.exists(FUNCTEST_REPO): + logger.error("Functest repository not found '%s'" % FUNCTEST_REPO) exit(-1) @@ -339,7 +340,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 = FUNCTEST_REPO + "/testcases/OpenStack/vPing/ping.sh" try: scp.put(ping_script, "~/") except: diff --git a/testcases/features/sfc/sfc.py b/testcases/features/sfc/sfc.py index a228ed29..4d0e1260 100755 --- a/testcases/features/sfc/sfc.py +++ b/testcases/features/sfc/sfc.py @@ -4,11 +4,11 @@ import sys import time import argparse +import paramiko + 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 paramiko -from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO parser = argparse.ArgumentParser() @@ -21,6 +21,8 @@ args = parser.parse_args() """ logging configuration """ logger = ft_logger.Logger("ODL_SFC").getLogger() +FUNCTEST_REPO = ft_utils.FUNCTEST_REPO + HOME = os.environ['HOME'] + "/" VM_BOOT_TIMEOUT = 180 diff --git a/testcases/security_scan/security_scan.py b/testcases/security_scan/security_scan.py index ac7b78ed..98e6b7a8 100755 --- a/testcases/security_scan/security_scan.py +++ b/testcases/security_scan/security_scan.py @@ -13,18 +13,18 @@ # all trace of the scan is removed from the remote system. -import argparse -import connect import datetime import os import sys - from ConfigParser import SafeConfigParser -from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO + +import argparse from keystoneclient import session from keystoneclient.auth.identity import v2 from novaclient import client +import connect +import functest.utils.functest_utils as ft_utils __version__ = 0.1 __author__ = 'Luke Hinds (lhinds@redhat.com)' @@ -33,7 +33,7 @@ __url__ = 'https://wiki.opnfv.org/display/functest/Functest+Security' # Global vars INSTALLER_IP = os.getenv('INSTALLER_IP') oscapbin = 'sudo /bin/oscap' -functest_dir = '%s/testcases/security_scan/' % FUNCTEST_REPO +functest_dir = '%s/testcases/security_scan/' % ft_utils.FUNCTEST_REPO # Apex Spefic var needed to query Undercloud if os.getenv('OS_AUTH_URL') is None: diff --git a/testcases/vnf/vIMS/vIMS.py b/testcases/vnf/vIMS/vIMS.py index b72e4cd8..c9b1c9ce 100755 --- a/testcases/vnf/vIMS/vIMS.py +++ b/testcases/vnf/vIMS/vIMS.py @@ -19,15 +19,14 @@ 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 keystoneclient.v2_0.client as ksclient import novaclient.client as nvclient import requests -from functest.utils.functest_utils import FUNCTEST_REPO as REPO_PATH from neutronclient.v2_0 import client as ntclient +import functest.utils.functest_logger as ft_logger +import functest.utils.functest_utils as functest_utils +import functest.utils.openstack_utils as os_utils from clearwater import clearwater from orchestrator import orchestrator @@ -51,7 +50,7 @@ logger = ft_logger.Logger("vIMS").getLogger() functest_yaml = functest_utils.get_functest_yaml() # Cloudify parameters -VIMS_DIR = (REPO_PATH + '/' + +VIMS_DIR = (functest_utils.FUNCTEST_REPO + '/' + functest_yaml.get("general").get("directories").get("dir_vIMS")) VIMS_DATA_DIR = functest_yaml.get("general").get( "directories").get("dir_vIMS_data") + "/" |