From fb815013c60c89d54b79772bcb792a2cec4cb82e Mon Sep 17 00:00:00 2001
From: helenyao <yaohelan@huawei.com>
Date: Sun, 26 Feb 2017 21:27:05 -0500
Subject: Adopt TestcaseBase for ONOS and ONOS SFC

1. Adopted TestcaseBase for ONOS and ONOS SFC
2. Removed the ONOS testcase from exec_test.sh

This patch is not meant to refactor the code which can
be improved in a later patch.

Change-Id: Ib8ac47742f598648c7575c9a8968477307629d42
Signed-off-by: helenyao <yaohelan@huawei.com>
---
 functest/ci/config_functest.yaml | 6 +++---
 functest/ci/exec_test.sh         | 6 ------
 functest/ci/testcases.yaml       | 7 ++++++-
 3 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'functest/ci')

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 7beb9d4b..a3eebab7 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 aa0cfaf7..6f776101 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 ccf9baee..1e5ba758 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'
-- 
cgit 1.2.3-korg