aboutsummaryrefslogtreecommitdiffstats
path: root/functest/ci
diff options
context:
space:
mode:
authorSerenaFeng <feng.xiaowei@zte.com.cn>2016-11-18 15:16:56 +0800
committerSerenaFeng <feng.xiaowei@zte.com.cn>2016-11-23 17:10:44 +0800
commit41076c1e725437f92095fcefd982a154f6d06f32 (patch)
tree8bbebbf65f3c35917c1a0d6e0da03bbdde196219 /functest/ci
parentddf121f9511368eaf5b8e3ebd4e00fbd4f91ee6e (diff)
Adapt vping testcases to the new template
JIRA: FUNCTEST-540 Change-Id: I05f3704e3fc38e21d7d6484f4d7f53f030d5c34b Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'functest/ci')
-rw-r--r--functest/ci/exec_test.sh6
-rw-r--r--functest/ci/testcases.yaml6
2 files changed, 6 insertions, 6 deletions
diff --git a/functest/ci/exec_test.sh b/functest/ci/exec_test.sh
index 234a4d24..fece3b94 100644
--- a/functest/ci/exec_test.sh
+++ b/functest/ci/exec_test.sh
@@ -84,12 +84,6 @@ function run_test(){
"healthcheck")
${FUNCTEST_TEST_DIR}/OpenStack/healthcheck/healthcheck.sh
;;
- "vping_ssh")
- python ${FUNCTEST_TEST_DIR}/OpenStack/vPing/vping.py -m ssh $report
- ;;
- "vping_userdata")
- python ${FUNCTEST_TEST_DIR}/OpenStack/vPing/vping.py -m userdata $report
- ;;
"odl")
odl_tests
[[ "$report" == "-r" ]] && args=-p
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index afd32986..1fb35115 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -37,6 +37,9 @@ tiers:
dependencies:
installer: ''
scenario: '^((?!bgpvpn|odl_l3).)*$'
+ run:
+ module: 'functest.opnfv_tests.OpenStack.vPing.vping_ssh'
+ class: 'VPingSSH'
-
name: vping_userdata
@@ -48,6 +51,9 @@ tiers:
dependencies:
installer: ''
scenario: '^((?!lxd).)*$'
+ run:
+ module: 'functest.opnfv_tests.OpenStack.vPing.vping_userdata'
+ class: 'VPingUserdata'
-
name: tempest_smoke_serial