diff options
Diffstat (limited to 'functest/ci/exec_test.sh')
| -rwxr-xr-x | functest/ci/exec_test.sh | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/functest/ci/exec_test.sh b/functest/ci/exec_test.sh index 913ce08e..2b4cd8b4 100755 --- a/functest/ci/exec_test.sh +++ b/functest/ci/exec_test.sh @@ -61,17 +61,7 @@ function odl_tests(){ fi } -function sfc_prepare(){ - ids=($(neutron security-group-list|grep default|awk '{print $2}')) - for id in ${ids[@]}; do - if ! neutron security-group-show $id|grep "22/tcp" &>/dev/null; then - neutron security-group-rule-create --protocol tcp \ - --port-range-min 22 --port-range-max 22 --direction ingress $id - neutron security-group-rule-create --protocol tcp \ - --port-range-min 22 --port-range-max 22 --direction egress $id - fi - done -} + function run_test(){ test_name=$1 @@ -93,14 +83,6 @@ function run_test(){ --ospassword ${OS_PASSWORD} \ --odlip $odl_ip --odlwebport $odl_port ${args} ;; - "tempest_smoke_serial") - 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 \ - $serial_flag $clean_flag -m full $report - ;; "vims") python ${FUNCTEST_TEST_DIR}/vnf/ims/vims.py $clean_flag $report ;; @@ -140,19 +122,6 @@ function run_test(){ "moon") 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 \ - $clean_flag -s -m feature_multisite $report \ - -c ${FUNCTEST_TEST_DIR}/openstack/tempest/tempest_multisite.conf - ;; - "odl-sfc") - ODL_SFC_DIR=${REPOS_DIR}/sfc/tests/functest/odl-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.py $report - ;; *) echo "The test case '${test_name}' does not exist." exit 1 @@ -197,10 +166,6 @@ done echo "Sourcing Credentials ${creds} to run the test.." source ${creds} -# ODL Boron workaround to create additional flow rules to allow port 22 TCP -if [[ $DEPLOY_SCENARIO == *"odl_l2-sfc"* ]]; then - sfc_prepare -fi # Run test run_test $TEST |