aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdocker/run_tests.sh77
-rw-r--r--testcases/config_functest.yaml14
-rw-r--r--testcases/tests/TestFunctestUtils.py16
3 files changed, 56 insertions, 51 deletions
diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index 48e3741f..0a09160c 100755
--- a/docker/run_tests.sh
+++ b/docker/run_tests.sh
@@ -50,6 +50,25 @@ function clean_openstack(){
fi
}
+function odl_tests(){
+ neutron_ip=$(keystone catalog --service identity | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
+ odl_ip=$(keystone catalog --service network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
+ usr_name=$(env | grep OS | grep OS_USERNAME | cut -f2 -d'=')
+ password=$(env | grep OS | grep OS_PASSWORD | cut -f2 -d'=')
+ odl_port=8181
+ if [ $INSTALLER_TYPE == "fuel" ]; then
+ odl_port=8282
+ elif [ $INSTALLER_TYPE == "apex" ]; then
+ :
+ elif [ $INSTALLER_TYPE == "joid" ]; then
+ :
+ elif [ $INSTALLER_TYPE == "compass" ]; then
+ :
+ else
+ error "INSTALLER_TYPE not valid."
+ exit 1
+ fi
+}
function run_test(){
test_name=$1
echo ""
@@ -70,23 +89,7 @@ function run_test(){
;;
"odl")
info "Running ODL test..."
- neutron_ip=$(keystone catalog --service identity | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
- odl_ip=$(keystone catalog --service network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
- usr_name=$(env | grep OS | grep OS_USERNAME | cut -f2 -d'=')
- password=$(env | grep OS | grep OS_PASSWORD | cut -f2 -d'=')
- odl_port=8181
- if [ $INSTALLER_TYPE == "fuel" ]; then
- odl_port=8282
- elif [ $INSTALLER_TYPE == "apex" ]; then
- :
- elif [ $INSTALLER_TYPE == "joid" ]; then
- :
- elif [ $INSTALLER_TYPE == "compass" ]; then
- :
- else
- error "INSTALLER_TYPE not valid."
- exit 1
- fi
+ odl_tests
ODL_PORT=$odl_port ODL_IP=$odl_ip NEUTRON_IP=$neutron_ip USR_NAME=$usr_name PASS=$password \
${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI/start_tests.sh
@@ -124,18 +127,36 @@ function run_test(){
clean_openstack
;;
- "bgpvpn_template")
+ "bgpvpn")
info "Running BGPVPN Tempest test case..."
- tempest_dir=$(find /root/.rally -type d -name for-deploy*)
- # TODO:
- # do the call of your test case here.
- # the bgpvpn repo is cloned in $BGPVPN_REPO_DIR
- # tempest is installed in $tempest_dir
- # Suggestion:
- # mkdir ${tempest_dir}/tempest/api/bgpvpn/
- # cp ${BGPVPN_REPO_DIR}/networking_bgpvpn_tempest/<whatever you need> \
- # ${tempest_dir}/tempest/api/bgpvpn/
- # ${tempest_dir}/run_tempest.sh tempest.api.bgpvpn.<test_case_name>
+ tempest_dir=$(ls -t /home/opnfv/.rally/tempest/ |grep for-deploy |tail -1)
+ if [[ $tempest_dir == "" ]];
+ echo "Make sure tempest was running before"
+ exit 1
+ fi
+ tempest_dir=/home/opnfv/.rally/tempest/$tempest_dir
+ pushd $tempest_dir
+ . .venv/bin/activate
+ pip install --no-deps -e ~/repos/bgpvpn/.
+ cp tempest.conf /etc/tempest/
+ echo "[service_available]
+bgpvpn = True" >> /etc/tempest/tempest.conf
+ ./run_tempest.sh -- networking_bgpvpn_tempest
+ rm -rf /etc/tempest/tempest.conf
+ popd
+ "odl-vpnservice")
+ info "Running VPNSERVICE Robot test case..."
+ odl_tests
+ cp ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI/test_list.txt \
+ ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI/test_list.txt.bak
+ echo "
+test/csit/suites/vpnservice
+" > ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI/test_list.txt
+ ODL_PORT=$odl_port ODL_IP=$odl_ip NEUTRON_IP=$neutron_ip USR_NAME=$usr_name PASS=$password \
+ ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI/start_tests.sh
+ cp ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI/test_list.txt.bak \
+ ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI/test_list.txt
+ # TODO: copy logs
;;
"onos")
info "Running ONOS test case..."
diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml
index 6f257d29..729d972f 100644
--- a/testcases/config_functest.yaml
+++ b/testcases/config_functest.yaml
@@ -249,12 +249,12 @@ test-dependencies:
policy-test:
scenario: 'odl'
sdnvpn:
- opnfv-yardstick-tc026-sdnvpn:
+ odl-vpnservice:
installer: 'fuel'
- scenario: '(ovs)*(nosdn)'
- odl-vpn_service-tests:
+ scenario: 'bgpvpn'
+ # this execute the tests:
+ # /home/opnfv/repos/odl_integration/test/csit/suites/vpnservice
+ bgpvpn:
installer: 'fuel'
- scenario: '(ovs)*(odl)'
- openstack-neutron-bgpvpn-api-extension-tests:
- installer: 'fuel'
- scenario: '(ovs)*(nosdn)'
+ scenario: 'bgpvpn'
+ # this execute the tempest tests of networking-bgpvpn
diff --git a/testcases/tests/TestFunctestUtils.py b/testcases/tests/TestFunctestUtils.py
index 6f12e603..17bc958e 100644
--- a/testcases/tests/TestFunctestUtils.py
+++ b/testcases/tests/TestFunctestUtils.py
@@ -45,15 +45,6 @@ class TestFunctestUtils(unittest.TestCase):
env_test = getTestEnv('policy-test', functest_yaml)
self.assertEqual(env_test, {'scenario': 'odl'})
- env_test = getTestEnv('sdnvpn/odl-vpn_service-tests', functest_yaml)
- self.assertEqual(env_test,
- {'installer': 'fuel', 'scenario': '(ovs)*(odl)'})
-
- env_test = getTestEnv('sdnvpn/opnfv-yardstick-tc026-sdnvpn',
- functest_yaml)
- self.assertEqual(env_test,
- {'installer': 'fuel', 'scenario': '(ovs)*(nosdn)'})
-
env_test = getTestEnv('foo', functest_yaml)
self.assertEqual(env_test, '')
@@ -86,13 +77,6 @@ class TestFunctestUtils(unittest.TestCase):
test = isTestRunnable('functest/vims', functest_yaml)
self.assertTrue(test)
- test = isTestRunnable('sdnvpn/odl-vpn_service-tests',
- functest_yaml)
- self.assertTrue(test)
-
- test = isTestRunnable('sdnvpn/opnfv-yardstick-tc026-sdnvpn',
- functest_yaml)
- self.assertFalse(test)
def test_generateTestcaseList(self):