general:
directories:
# Relative to the path where the repo is cloned:
- dir_vping: testcases/OpenStack/vPing/
- dir_odl: testcases/Controllers/ODL/
- dir_rally: testcases/OpenStack/rally/
- dir_tempest_cases: testcases/OpenStack/tempest/custom_tests/
- dir_vIMS: testcases/vnf/vIMS/
- dir_onos: testcases/Controllers/ONOS/Teston/
- dir_onos_sfc: testcases/Controllers/ONOS/Sfc/
+ dir_vping: functest/opnfv_tests/OpenStack/vPing/
+ dir_odl: functest/opnfv_tests/Controllers/ODL/
+ dir_rally: functest/opnfv_tests/OpenStack/rally/
+ dir_tempest_cases: functest/opnfv_tests/OpenStack/tempest/custom_tests/
+ dir_vIMS: functest/opnfv_tests/vnf/vIMS/
+ dir_onos: functest/opnfv_tests/Controllers/ONOS/Teston/
+ dir_onos_sfc: functest/opnfv_tests/Controllers/ONOS/Sfc/
# Absolute path
dir_repos: /home/opnfv/repos
fi
FUNCTEST_REPO_DIR=${repos_dir}/functest
+FUNCTEST_TEST_DIR=${repos_dir}/functest/functest/opnfv_tests
FUNCTEST_CONF_DIR=/home/opnfv/functest/conf
export PYTHONUNBUFFERED=1
case $test_name in
"healthcheck")
- ${FUNCTEST_REPO_DIR}/testcases/OpenStack/healthcheck/healthcheck.sh
+ ${FUNCTEST_TEST_DIR}/OpenStack/healthcheck/healthcheck.sh
;;
"vping_ssh")
- python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/vPing/vping.py -m ssh $report
+ python ${FUNCTEST_TEST_DIR}/OpenStack/vPing/vping.py -m ssh $report
;;
"vping_userdata")
- python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/vPing/vping.py -m userdata $report
+ python ${FUNCTEST_TEST_DIR}/OpenStack/vPing/vping.py -m userdata $report
;;
"odl")
odl_tests
[[ "$report" == "-r" ]] && args=-p
- ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/OpenDaylightTesting.py \
+ ${FUNCTEST_TEST_DIR}/Controllers/ODL/OpenDaylightTesting.py \
--keystoneip $keystone_ip --neutronip $neutron_ip \
--osusername ${OS_USERNAME} --ostenantname ${OS_TENANT_NAME} \
--ospassword ${OS_PASSWORD} \
--odlip $odl_ip --odlwebport $odl_port ${args}
;;
"tempest_smoke_serial")
- python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \
+ python ${FUNCTEST_TEST_DIR}/OpenStack/tempest/run_tempest.py \
$clean_flag -s -m smoke $report
;;
"tempest_full_parallel")
- python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \
+ python ${FUNCTEST_TEST_DIR}/OpenStack/tempest/run_tempest.py \
$serial_flag $clean_flag -m full $report
;;
"vims")
- python ${FUNCTEST_REPO_DIR}/testcases/vnf/vIMS/vIMS.py $clean_flag $report
+ python ${FUNCTEST_TEST_DIR}/vnf/vIMS/vIMS.py $clean_flag $report
;;
"rally_full")
- python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/rally/run_rally-cert.py $clean_flag all $report
+ python ${FUNCTEST_TEST_DIR}/OpenStack/rally/run_rally-cert.py $clean_flag all $report
;;
"rally_sanity")
- python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/rally/run_rally-cert.py \
+ python ${FUNCTEST_TEST_DIR}/OpenStack/rally/run_rally-cert.py \
$clean_flag --sanity all $report
;;
"bgpvpn")
python ${sdnvpn_repo_dir}/run_tests.py $report
;;
"onos")
- python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/onosfunctest.py
+ python ${FUNCTEST_TEST_DIR}/Controllers/ONOS/Teston/onosfunctest.py
;;
"onos_sfc")
- python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/onosfunctest.py -t sfc
+ python ${FUNCTEST_TEST_DIR}/Controllers/ONOS/Teston/onosfunctest.py -t sfc
;;
"promise")
- python ${FUNCTEST_REPO_DIR}/testcases/features/promise.py $report
+ python ${FUNCTEST_TEST_DIR}/features/promise.py $report
sleep 10 # to let the instances terminate
;;
"doctor")
- python ${FUNCTEST_REPO_DIR}/testcases/features/doctor.py $report
+ python ${FUNCTEST_TEST_DIR}/features/doctor.py $report
;;
"ovno")
# suite under rewritting for colorado
python ${repos_dir}/securityscanning/security_scan.py --config ${repos_dir}/securityscanning/config.ini
;;
"copper")
- python ${FUNCTEST_REPO_DIR}/testcases/features/copper.py $report
+ python ${FUNCTEST_TEST_DIR}/features/copper.py $report
;;
"moon")
python ${repos_dir}/moon/tests/run_tests.py $report
;;
"multisite")
- python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/gen_tempest_conf.py
- python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \
+ python ${FUNCTEST_TEST_DIR}/OpenStack/tempest/gen_tempest_conf.py
+ python ${FUNCTEST_TEST_DIR}/OpenStack/tempest/run_tempest.py \
$clean_flag -s -m feature_multisite $report \
- -c ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/tempest_multisite.conf
+ -c ${FUNCTEST_TEST_DIR}/OpenStack/tempest/tempest_multisite.conf
;;
"domino")
- python ${FUNCTEST_REPO_DIR}/testcases/features/domino.py $report
+ python ${FUNCTEST_TEST_DIR}/features/domino.py $report
;;
"odl-sfc")
- ODL_SFC_DIR=${FUNCTEST_REPO_DIR}/testcases/features/sfc
+ ODL_SFC_DIR=${FUNCTEST_TEST_DIR}/features/sfc
# pass FUNCTEST_REPO_DIR inside prepare_odl_sfc.bash
FUNCTEST_REPO_DIR=${FUNCTEST_REPO_DIR} python ${ODL_SFC_DIR}/prepare_odl_sfc.py || exit $?
source ${ODL_SFC_DIR}/tackerc
python ${ODL_SFC_DIR}/sfc_colorado1.py $report
;;
"parser")
- python ${FUNCTEST_REPO_DIR}/testcases/vnf/vRNC/parser.py $report
+ python ${FUNCTEST_TEST_DIR}/vnf/vRNC/parser.py $report
;;
*)
echo "The test case '${test_name}' does not exist."
installer: ''
scenario: 'odl'
run:
- module: 'functest.testcases.Controllers.ODL.OpenDaylightTesting'
+ module: 'functest.opnfv_tests.Controllers.ODL.OpenDaylightTesting'
class: 'ODLTestCases'
-
RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
RUN curl -L https://get.rvm.io | bash -s stable
-RUN /bin/bash -c ". /home/opnfv/repos/functest/testcases/features/sfc/tacker_client_install.sh"
+RUN /bin/bash -c ". /home/opnfv/repos/functest/functest/opnfv_tests/features/sfc/tacker_client_install.sh"
RUN cd ${repos_dir}/bgpvpn && pip install .
RUN cd ${repos_dir}/kingbird && pip install -e .
RUN cd ${repos_dir}/moon/moonclient/ && python setup.py install
# currentpath = os.getcwd()
REPO_PATH = ft_utils.FUNCTEST_REPO + '/'
- currentpath = REPO_PATH + 'testcases/Controllers/ONOS/Teston/CI'
+ currentpath = REPO_PATH + 'opnfv_tests/Controllers/ONOS/Teston/CI'
self.cipath = currentpath
self.logdir = os.path.join(currentpath, 'log')
- self.workhome = currentpath[0: currentpath.rfind('testcases') - 1]
+ self.workhome = currentpath[0: currentpath.rfind('opnfv_tests') - 1]
self.Result_DB = ''
filename = time.strftime('%Y-%m-%d-%H-%M-%S') + '.log'
self.logfilepath = os.path.join(self.logdir, filename)
logger.info("Trying to transfer ping.sh to %s..." % floatip)
scp = SCPClient(ssh.get_transport())
- ping_script = FUNCTEST_REPO + "/testcases/OpenStack/vPing/ping.sh"
+ ping_script = FUNCTEST_REPO + "/opnfv_tests/OpenStack/vPing/ping.sh"
try:
scp.put(ping_script, "~/")
except:
#
ODL_SFC_LOG=/home/opnfv/functest/results/odl-sfc.log
-ODL_SFC_DIR=${FUNCTEST_REPO_DIR}/testcases/features/sfc
+ODL_SFC_DIR=${FUNCTEST_REPO_DIR}/opnfv_tests/features/sfc
# Split the output to the log file and redirect STDOUT and STDERR to /dev/null
bash ${ODL_SFC_DIR}/server_presetup_CI.bash |& \
INSTALLER_IP = "10.20.0.2"
os.environ['ODL_SFC_LOG'] = "/home/opnfv/functest/results/odl-sfc.log"
-os.environ['ODL_SFC_DIR'] = FUNCTEST_REPO_DIR + "/testcases/features/sfc"
+os.environ['ODL_SFC_DIR'] = FUNCTEST_REPO_DIR + "/opnfv_tests/features/sfc"
command = os.environ['ODL_SFC_DIR'] + ("/server_presetup_CI.bash | "
"tee -a ${ODL_SFC_LOG} "
ROUTER_NAME = "example-router"
SECGROUP_NAME = "example-sg"
SECGROUP_DESCR = "Example Security group"
-SFC_TEST_DIR = REPO_PATH + "/testcases/features/sfc/"
+SFC_TEST_DIR = REPO_PATH + "/opnfv_tests/features/sfc/"
TACKER_SCRIPT = SFC_TEST_DIR + "sfc_tacker.bash"
TACKER_CHANGECLASSI = SFC_TEST_DIR + "sfc_change_classi.bash"
ssh_options = '-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'
# CREATION OF THE 2 SF ####
- tacker_script = "%s/testcases/features/sfc/%s" % \
+ tacker_script = "%s/opnfv_tests/features/sfc/%s" % \
(FUNCTEST_REPO, TACKER_SCRIPT)
logger.info("Executing tacker script: '%s'" % tacker_script)
subprocess.call(tacker_script, shell=True)
# CHANGE OF CLASSIFICATION #
logger.info("Changing the classification")
- tacker_classi = "%s/testcases/features/sfc/%s" % \
+ tacker_classi = "%s/opnfv_tests/features/sfc/%s" % \
(FUNCTEST_REPO, TACKER_CHANGECLASSI)
subprocess.call(tacker_classi, shell=True)
break
else:
logger.info("Iterating again!")
- delete = "bash %s/testcases/features/sfc/delete.sh" % \
+ delete = "bash %s/opnfv_tests/features/sfc/delete.sh" % \
(FUNCTEST_REPO)
try:
subprocess.call(delete, shell=True, stderr=subprocess.PIPE)
# Global vars
INSTALLER_IP = os.getenv('INSTALLER_IP')
oscapbin = 'sudo /bin/oscap'
-functest_dir = '%s/testcases/security_scan/' % ft_utils.FUNCTEST_REPO
+functest_dir = '%s/opnfv_tests/security_scan/' % ft_utils.FUNCTEST_REPO
# Apex Spefic var needed to query Undercloud
if os.getenv('OS_AUTH_URL') is None:
from robot.errors import RobotError
from functest.core import TestCasesBase
-from functest.testcases.Controllers.ODL import OpenDaylightTesting
+from functest.opnfv_tests.Controllers.ODL import OpenDaylightTesting
class ODLTestCasesTesting(unittest.TestCase):
--- /dev/null
+#!/usr/bin/env python
+
+# Copyright (c) 2016 Orange and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+
+import logging
+import unittest
+
+from functest.utils import functest_utils
+
+
+class FunctestUtilsTesting(unittest.TestCase):
+
+ logging.disable(logging.CRITICAL)
+
+ def setUp(self):
+ self.test = functest_utils
+
+ def test_check_internet_connectivity(self):
+ self.assertTrue(self.test.check_internet_connectivity())
+# TODO
+# ...
+
+if __name__ == "__main__":
+ unittest.main(verbosity=2)
sudo chmod -Rf a+rw /home/opnfv
# Either Workspace is set (CI)
-# then useless log files must belong to jenkins:jenkins
-# or it is local tests and we do not care
if [ -z $WORKSPACE ]
then
WORKSPACE="."
-else
- sudo chown -Rf jenkins:jenkins /home/opnfv
- # as we import the module from the home repo
- # and in jenkins the name is different
- # functest-verify-master != functest
- # make some ugly adjustments...
- cd $WORKSPACE
- export PYTHONPATH="${PYTHONPATH}:$WORKSPACE"
- cd ..
-
- if [ ! -d "./functest" ]
- then
- ln -s functest-verify-master functest
- fi
fi
--cover-package=functest.testcases.Controllers.ODL.OpenDaylightTesting \
--cover-xml \
--cover-html \
- unit_tests
+ functest/tests/unit
rc=$?
deactivate
# *******
# clean
# *******
-# First as we had to start the test from ..
-# Push the results upstream for jenkins
-if [ $WORKSPACE != "." ]
-then
- mv coverage.xml nosetests.xml $WORKSPACE
-fi
-
# Clean useless logs
if [ -d "/home/opnfv/functest/results" ]
then
Code Review / functest.git / commitdiff