From 165ff17205d99b18df36e5ac6f34ede858e3da17 Mon Sep 17 00:00:00 2001 From: Morgan Richomme Date: Thu, 24 Nov 2016 18:25:52 +0100 Subject: file/dir renaming for consistency JIRA: FUNCTEST-579 Change-Id: Iaa545db70bfb76770df0a3d17871e29ce518ff2d Signed-off-by: Morgan Richomme --- functest/ci/config_functest.yaml | 14 +++++++------- functest/ci/exec_test.sh | 22 +++++++++++----------- functest/ci/testcases.yaml | 14 +++++++------- 3 files changed, 25 insertions(+), 25 deletions(-) (limited to 'functest/ci') 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 57678429..16c2ed3e 100644 --- a/functest/ci/exec_test.sh +++ b/functest/ci/exec_test.sh @@ -87,35 +87,35 @@ function run_test(){ "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 diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index e5424a63..ae6e16d6 100755 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -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' - @@ -99,8 +99,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 @@ -153,7 +153,7 @@ tiers: scenario: 'bgpvpn' run: module: 'functest.opnfv_tests.features.sdnvpn' - class: 'SDNVPN' + class: 'SdnVpnTests' - name: security_scan @@ -203,7 +203,7 @@ tiers: scenario: '' run: module: 'functest.opnfv_tests.features.domino' - class: 'DominoCases' + class: 'DominoTests' - name: odl-sfc criteria: 'status == "PASS"' @@ -232,7 +232,7 @@ tiers: installer: 'fuel' scenario: '^((?!bgpvpn|noha).)*$' run: - module: 'functest.opnfv_tests.vnf.vRNC.parser' + module: 'functest.opnfv_tests.vnf.rnc.parser' class: 'Parser' - name: openstack -- cgit 1.2.3-korg