diff options
| author |   Jose Lausuch <jose.lausuch@ericsson.com> | 2017-03-01 22:13:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-01 22:13:28 +0000 |
| commit | e4ae4c3f11dff35d7a7098d215bcdde745493e95 (patch) | |
| tree | 651e7502cf6325250188284ac7605eb9571e72b0 /functest/ci | |
| parent | b8935ad451dd2650b42c7976af2722da7ca720af (diff) | |
| parent | fb815013c60c89d54b79772bcb792a2cec4cb82e (diff) | |
Merge "Adopt TestcaseBase for ONOS and ONOS SFC"
Diffstat (limited to 'functest/ci')
| -rwxr-xr-x | functest/ci/config_functest.yaml | 6 | ||||
| -rwxr-xr-x | functest/ci/exec_test.sh | 6 | ||||
| -rwxr-xr-x | functest/ci/testcases.yaml | 7 |
3 files changed, 9 insertions, 10 deletions
diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index 1120e7e18..402e29999 100755 --- a/functest/ci/config_functest.yaml +++ b/functest/ci/config_functest.yaml @@ -5,8 +5,8 @@ general: dir_odl: functest/opnfv_tests/sdn/odl rally: functest/opnfv_tests/openstack/rally tempest_cases: functest/opnfv_tests/openstack/tempest/custom_tests - dir_onos: functest/opnfv_tests/sdn/onos/teston - dir_onos_sfc: functest/opnfv_tests/sdn/onos/sfc + onos: functest/opnfv_tests/sdn/onos/teston + onos_sfc: functest/opnfv_tests/sdn/onos/sfc # Absolute path home: /home/opnfv @@ -18,7 +18,7 @@ general: repo_vims_test: /home/opnfv/repos/vnfs/vims-test repo_sdnvpn: /home/opnfv/repos/sdnvpn repo_sfc: /home/opnfv/repos/sfc - dir_repo_onos: /home/opnfv/repos/onos + repo_onos: /home/opnfv/repos/onos repo_promise: /home/opnfv/repos/promise repo_netready: /home/opnfv/repos/netready repo_barometer: /home/opnfv/repos/barometer diff --git a/functest/ci/exec_test.sh b/functest/ci/exec_test.sh index aa0cfaf7e..6f776101d 100755 --- a/functest/ci/exec_test.sh +++ b/functest/ci/exec_test.sh @@ -94,12 +94,6 @@ function run_test(){ --osusername ${OS_USERNAME} \ ${args} ;; - "onos") - python ${FUNCTEST_TEST_DIR}/sdn/onos/teston/onos.py - ;; - "onos_sfc") - python ${FUNCTEST_TEST_DIR}/sdn/onos/teston/onos.py -t sfc - ;; "ovno") # suite under rewritting for colorado # no need to run anything until refactoring done diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index 598da3969..77cd1ae64 100755 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -174,7 +174,9 @@ tiers: dependencies: installer: '' scenario: 'onos' - + run: + module: 'functest.opnfv_tests.sdn.onos.onos' + class: 'Onos' - name: snaps_smoke @@ -300,6 +302,9 @@ tiers: dependencies: installer: '' scenario: 'onos-sfc' + run: + module: 'functest.opnfv_tests.sdn.onos.onos' + class: 'OnosSfc' - name: parser criteria: 'ret == 0' |