diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-12-14 10:30:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-12-14 10:30:56 +0000 |
| commit | c212550a99c91ccef138f70db7c94c24cab75313 (patch) | |
| tree | 677ef316e0ebdada27d6d37841b2c04fa2400ae1 | |
| parent | 4296815a17310b6613259c3164acedfc53d58737 (diff) | |
| parent | 557a11b3c6d5be0cf9bec464f56cd4a55d809bdf (diff) | |
Merge "Conform SFC test case to FeatureBase"
| -rwxr-xr-x | functest/ci/exec_test.sh | 23 | ||||
| -rwxr-xr-x | functest/ci/testcases.yaml | 4 | ||||
| -rw-r--r-- | functest/opnfv_tests/features/odl_sfc.py | 20 |
3 files changed, 24 insertions, 23 deletions
diff --git a/functest/ci/exec_test.sh b/functest/ci/exec_test.sh index 913ce08ec..3a7d8b08a 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 @@ -146,13 +136,6 @@ function run_test(){ $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 +180,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 diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index 29bc25afe..ba264956e 100755 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -67,7 +67,6 @@ tiers: dependencies: installer: '' scenario: '' - - name: rally_sanity criteria: 'success_rate == 100%' @@ -253,6 +252,9 @@ tiers: dependencies: installer: '(apex)|(fuel)' scenario: 'odl_l2-sfc' + run: + module: 'functest.opnfv_tests.features.odl_sfc' + class: 'OpenDaylightSFC' - name: onos_sfc criteria: 'status == "PASS"' diff --git a/functest/opnfv_tests/features/odl_sfc.py b/functest/opnfv_tests/features/odl_sfc.py new file mode 100644 index 000000000..b194b2840 --- /dev/null +++ b/functest/opnfv_tests/features/odl_sfc.py @@ -0,0 +1,20 @@ +#!/usr/bin/python +# +# Copyright (c) 2016 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 functest.core.feature_base as base + + +class OpenDaylightSFC(base.FeatureBase): + + def __init__(self): + super(OpenDaylightSFC, self).__init__(project='sfc', + case='functest-odl-sfc"', + repo='dir_repo_sfc') + self.cmd = 'cd %s/tests/functest && python ./run_tests.py' % self.repo |