diff options
Diffstat (limited to 'functest/ci')
| -rwxr-xr-x | functest/ci/config_functest.yaml | 14 | ||||
| -rw-r--r-- | functest/ci/exec_test.sh | 27 | ||||
| -rwxr-xr-x | functest/ci/testcases.yaml | 32 |
3 files changed, 32 insertions, 41 deletions
diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index a19139c0..c75afdaf 100755 --- a/functest/ci/config_functest.yaml +++ b/functest/ci/config_functest.yaml @@ -1,13 +1,13 @@ general:
directories:
# Relative to the path where the repo is cloned:
- 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
+ dir_vping: functest/opnfv_tests/openstack/vping
+ dir_odl: functest/opnfv_tests/sdn/odl
+ dir_rally: functest/opnfv_tests/openstack/rally
+ dir_tempest_cases: functest/opnfv_tests/openstack/tempest/custom_tests
+ dir_vIMS: functest/opnfv_tests/vnf/ims
+ dir_onos: functest/opnfv_tests/sdn/onos/teston
+ dir_onos_sfc: functest/opnfv_tests/sdn/onos/sfc
# Absolute path
dir_home: /home/opnfv
diff --git a/functest/ci/exec_test.sh b/functest/ci/exec_test.sh index cc885c4c..913ce08e 100644 --- a/functest/ci/exec_test.sh +++ b/functest/ci/exec_test.sh @@ -82,40 +82,40 @@ function run_test(){ case $test_name in "healthcheck") - ${FUNCTEST_TEST_DIR}/OpenStack/healthcheck/healthcheck.sh + ${FUNCTEST_TEST_DIR}/openstack/healthcheck/healthcheck.sh ;; "odl") odl_tests [[ "$report" == "-r" ]] && args=-p - ${FUNCTEST_TEST_DIR}/Controllers/ODL/OpenDaylightTesting.py \ + ${FUNCTEST_TEST_DIR}/sdn/odl/odl.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_TEST_DIR}/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_TEST_DIR}/OpenStack/tempest/run_tempest.py \ + python ${FUNCTEST_TEST_DIR}/openstack/tempest/run_tempest.py \ $serial_flag $clean_flag -m full $report ;; "vims") - python ${FUNCTEST_TEST_DIR}/vnf/vIMS/vIMS.py $clean_flag $report + python ${FUNCTEST_TEST_DIR}/vnf/ims/vims.py $clean_flag $report ;; "rally_full") - python ${FUNCTEST_TEST_DIR}/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_TEST_DIR}/OpenStack/rally/run_rally-cert.py \ + python ${FUNCTEST_TEST_DIR}/openstack/rally/run_rally-cert.py \ $clean_flag --sanity all $report ;; "onos") - python ${FUNCTEST_TEST_DIR}/Controllers/ONOS/Teston/onosfunctest.py + python ${FUNCTEST_TEST_DIR}/sdn/onos/teston/onos.py ;; "onos_sfc") - python ${FUNCTEST_TEST_DIR}/Controllers/ONOS/Teston/onosfunctest.py -t sfc + python ${FUNCTEST_TEST_DIR}/sdn/onos/teston/onos.py -t sfc ;; "promise") python ${FUNCTEST_TEST_DIR}/features/promise.py $report @@ -141,10 +141,10 @@ function run_test(){ python ${REPOS_DIR}/moon/tests/run_tests.py $report ;; "multisite") - python ${FUNCTEST_TEST_DIR}/OpenStack/tempest/gen_tempest_conf.py - python ${FUNCTEST_TEST_DIR}/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_TEST_DIR}/OpenStack/tempest/tempest_multisite.conf + -c ${FUNCTEST_TEST_DIR}/openstack/tempest/tempest_multisite.conf ;; "odl-sfc") ODL_SFC_DIR=${REPOS_DIR}/sfc/tests/functest/odl-sfc @@ -153,9 +153,6 @@ function run_test(){ source ${ODL_SFC_DIR}/tackerc python ${ODL_SFC_DIR}/sfc.py $report ;; - "parser") - python ${FUNCTEST_TEST_DIR}/vnf/vRNC/parser.py $report - ;; *) echo "The test case '${test_name}' does not exist." exit 1 diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index a5ddcf23..ffdfa51e 100755 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -24,7 +24,7 @@ tiers: order: 1 ci_loop: '(daily)|(weekly)' description : >- - Set of basic Functional tests to validate the OpenStack deployment. + Set of basic Functional tests to validate the OPNFV scenarios. testcases: - name: vping_ssh @@ -38,7 +38,7 @@ tiers: installer: '' scenario: '^((?!bgpvpn|odl_l3).)*$' run: - module: 'functest.opnfv_tests.OpenStack.vPing.vping_ssh' + module: 'functest.opnfv_tests.openstack.vping.vping_ssh' class: 'VPingSSH' - @@ -52,7 +52,7 @@ tiers: installer: '' scenario: '^((?!lxd).)*$' run: - module: 'functest.opnfv_tests.OpenStack.vPing.vping_userdata' + module: 'functest.opnfv_tests.openstack.vping.vping_userdata' class: 'VPingUserdata' - @@ -79,14 +79,6 @@ tiers: installer: '' scenario: '^((?!bgpvpn).)*$' - - - name: sdn_suites - order: 2 - ci_loop: '(daily)|(weekly)' - description : >- - Test suites corresponding to the different - SDN Controllers existing in OPNFV. - testcases: - name: odl criteria: 'success_rate == 100%' @@ -99,8 +91,8 @@ tiers: installer: '' scenario: 'odl' run: - module: 'functest.opnfv_tests.Controllers.ODL.OpenDaylightTesting' - class: 'ODLTestCases' + module: 'functest.opnfv_tests.sdn.odl.odl' + class: 'ODLTests' - name: onos @@ -116,7 +108,7 @@ tiers: - name: features - order: 3 + order: 2 ci_loop: '(daily)|(weekly)' description : >- Test suites from feature projects @@ -153,7 +145,7 @@ tiers: scenario: 'bgpvpn' run: module: 'functest.opnfv_tests.features.sdnvpn' - class: 'SDNVPN' + class: 'SdnVpnTests' - name: security_scan @@ -203,7 +195,7 @@ tiers: scenario: '' run: module: 'functest.opnfv_tests.features.domino' - class: 'DominoCases' + class: 'DominoTests' - name: odl-sfc criteria: 'status == "PASS"' @@ -231,10 +223,12 @@ tiers: dependencies: installer: 'fuel' scenario: '^((?!bgpvpn|noha).)*$' - + run: + module: 'functest.opnfv_tests.vnf.rnc.parser' + class: 'Parser' - name: openstack - order: 4 + order: 3 ci_loop: 'weekly' description : >- Extensive testing of OpenStack API. @@ -264,7 +258,7 @@ tiers: - name: vnf - order: 5 + order: 4 ci_loop: 'weekly' description : >- Collection of VNF test cases. |