diff options
Diffstat (limited to 'testcases')
| -rw-r--r-- | testcases/Controllers/ONOS/Teston/adapters/foundation.py | 8 | ||||
| -rwxr-xr-x | testcases/Controllers/ONOS/Teston/onosfunctest.py | 12 | ||||
| -rwxr-xr-x | testcases/OpenStack/examples/create_instance_and_ip.py | 1 | ||||
| -rwxr-xr-x | testcases/OpenStack/rally/run_rally-cert.py | 8 | ||||
| -rwxr-xr-x | testcases/OpenStack/tempest/run_tempest.py | 7 | ||||
| -rw-r--r-- | testcases/OpenStack/vPing/vping_util.py | 5 | ||||
| -rwxr-xr-x | testcases/features/sfc/sfc.py | 13 | ||||
| -rwxr-xr-x | testcases/security_scan/security_scan.py | 12 | ||||
| -rwxr-xr-x | testcases/vnf/vIMS/vIMS.py | 7 |
9 files changed, 32 insertions, 41 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 717df82aa..01537b990 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") 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 e04ecbc52..85d21d9bd 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 3fa9b368e..e93972182 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 bdd118118..7e7173aee 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: diff --git a/testcases/features/sfc/sfc.py b/testcases/features/sfc/sfc.py index 4f08d23da..a228ed298 100755 --- a/testcases/features/sfc/sfc.py +++ b/testcases/features/sfc/sfc.py @@ -1,12 +1,14 @@ -import argparse import os 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 paramiko +from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO parser = argparse.ArgumentParser() @@ -19,7 +21,6 @@ args = parser.parse_args() """ logging configuration """ logger = ft_logger.Logger("ODL_SFC").getLogger() -REPO_PATH = os.environ['repos_dir'] + '/functest/' HOME = os.environ['HOME'] + "/" VM_BOOT_TIMEOUT = 180 @@ -203,8 +204,8 @@ def main(): # CREATION OF THE 2 SF #### - tacker_script = "/home/opnfv/repos/functest/testcases/features/sfc/" + \ - TACKER_SCRIPT + tacker_script = "%s/testcases/features/sfc/%s" % \ + (FUNCTEST_REPO, TACKER_SCRIPT) logger.info("Executing tacker script: '%s'" % tacker_script) subprocess.call(tacker_script, shell=True) @@ -356,8 +357,8 @@ def main(): # CHANGE OF CLASSIFICATION # logger.info("Changing the classification") - tacker_classi = "/home/opnfv/repos/functest/testcases/features/sfc/" + \ - TACKER_CHANGECLASSI + tacker_classi = "%s/testcases/features/sfc/%s" % \ + (FUNCTEST_REPO, TACKER_CHANGECLASSI) subprocess.call(tacker_classi, shell=True) logger.info("Wait for ODL to update the classification rules in OVS") diff --git a/testcases/security_scan/security_scan.py b/testcases/security_scan/security_scan.py index 36b795431..7b9250215 100755 --- a/testcases/security_scan/security_scan.py +++ b/testcases/security_scan/security_scan.py @@ -12,17 +12,19 @@ # nominated node. Post scan a report is downloaded and if '--clean' is passed # 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 keystoneclient.auth.identity import v2 + +import argparse +from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO from keystoneclient import session +from keystoneclient.auth.identity import v2 from novaclient import client +import connect + __version__ = 0.1 __author__ = 'Luke Hinds (lhinds@redhat.com)' __url__ = 'https://wiki.opnfv.org/display/functest/Functest+Security' @@ -30,7 +32,7 @@ __url__ = 'https://wiki.opnfv.org/display/functest/Functest+Security' # Global vars INSTALLER_IP = os.getenv('INSTALLER_IP') oscapbin = 'sudo /bin/oscap' -functest_dir = '/home/opnfv/repos/functest/testcases/security_scan/' +functest_dir = '%s/testcases/security_scan/' % 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 634a17952..b72e4cd81 100755 --- a/testcases/vnf/vIMS/vIMS.py +++ b/testcases/vnf/vIMS/vIMS.py @@ -25,6 +25,7 @@ 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 from clearwater import clearwater @@ -46,15 +47,11 @@ args = parser.parse_args() """ logging configuration """ logger = ft_logger.Logger("vIMS").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() # Cloudify parameters -VIMS_DIR = (REPO_PATH + +VIMS_DIR = (REPO_PATH + '/' + functest_yaml.get("general").get("directories").get("dir_vIMS")) VIMS_DATA_DIR = functest_yaml.get("general").get( "directories").get("dir_vIMS_data") + "/" |