Merge "Refactor tempest common"

[functest.git] / functest / ci / testcases.yaml

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index a441553..2f5c8c0 100644 (file)
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -16,15 +16,13 @@ tiers:
                 description: >-
                     This test case verifies the retrieval of OpenStack clients:
                     Keystone, Glance, Neutron and Nova and may perform some
-                    simple queries. When the config value of
-                    snaps.use_keystone is True, functest must have access to
-                    the cloud's private network.
+                    simple queries.
                 dependencies:
                     installer: ''
                     scenario: ''
                 run:
                     module:
-                        'functest.opnfv_tests.openstack.snaps.connection_check'
+                        'functest.opnfv_tests.openstack.api.connection_check'
                     class: 'ConnectionCheck'
 
             -
@@ -172,6 +170,26 @@ tiers:
                     module: 'functest.opnfv_tests.openstack.cinder.cinder_test'
                     class: 'CinderCheck'
 
+            -
+                case_name: odl
+                project_name: functest
+                criteria: 100
+                blocking: true
+                description: >-
+                    Test Suite for the OpenDaylight SDN Controller. It
+                    integrates some test suites from upstream using
+                    Robot as the test framework.
+                dependencies:
+                    installer: ''
+                    scenario: 'odl'
+                run:
+                    module: 'functest.opnfv_tests.sdn.odl.odl'
+                    class: 'ODLTests'
+                    args:
+                        suites:
+                            - /src/odl_test/csit/suites/integration/basic
+                            - /src/odl_test/csit/suites/openstack/neutron
+
             -
                 case_name: api_check
                 project_name: functest
@@ -215,7 +233,7 @@ tiers:
             Set of basic Functional tests to validate the OPNFV scenarios.
         testcases:
             -
-                case_name: tempest_smoke_serial
+                case_name: tempest_smoke
                 project_name: functest
                 criteria: 100
                 blocking: false
@@ -229,7 +247,9 @@ tiers:
                     scenario: ''
                 run:
                     module: 'functest.opnfv_tests.openstack.tempest.tempest'
-                    class: 'TempestSmokeSerial'
+                    class: 'TempestCommon'
+                    args:
+                        mode: '^tempest\.(api|scenario).*\[.*\bsmoke\b.*\]$'
 
             -
                 case_name: rally_sanity
@@ -285,42 +305,39 @@ tiers:
                             - 'test_networks_multiprovider_rbac'
 
             -
-                case_name: shaker
+                case_name: vmtp
                 project_name: functest
                 criteria: 100
                 blocking: false
                 description: >-
-                    Shaker wraps around popular system network testing tools
-                    like iperf, iperf3 and netperf (with help of flent). Shaker
-                    is able to deploy OpenStack instances and networks in
-                    different topologies.
+                    VMTP is a small python application that will automatically
+                    perform ping connectivity, round trip time measurement
+                    (latency) and TCP/UDP throughput
                 dependencies:
                     installer: ''
                     scenario: ''
                 run:
                     module:
-                        'functest.opnfv_tests.openstack.shaker.shaker'
-                    class: 'Shaker'
+                        'functest.opnfv_tests.openstack.vmtp.vmtp'
+                    class: 'Vmtp'
 
             -
-                case_name: odl
+                case_name: shaker
                 project_name: functest
                 criteria: 100
                 blocking: false
                 description: >-
-                    Test Suite for the OpenDaylight SDN Controller. It
-                    integrates some test suites from upstream using
-                    Robot as the test framework.
+                    Shaker wraps around popular system network testing tools
+                    like iperf, iperf3 and netperf (with help of flent). Shaker
+                    is able to deploy OpenStack instances and networks in
+                    different topologies.
                 dependencies:
                     installer: ''
-                    scenario: 'odl'
+                    scenario: ''
                 run:
-                    module: 'functest.opnfv_tests.sdn.odl.odl'
-                    class: 'ODLTests'
-                    args:
-                        suites:
-                            - /src/odl_test/csit/suites/integration/basic
-                            - /src/odl_test/csit/suites/openstack/neutron
+                    module:
+                        'functest.opnfv_tests.openstack.shaker.shaker'
+                    class: 'Shaker'
 
             -
                 case_name: snaps_smoke
@@ -357,8 +374,10 @@ tiers:
                     installer: '(fuel)|(apex)|(compass)'
                     scenario: ''
                 run:
-                    module: 'functest.opnfv_tests.openstack.tempest.tempest'
+                    module: 'functest.opnfv_tests.openstack.trunk.trunk'
                     class: 'TempestNeutronTrunk'
+                    args:
+                        mode: 'neutron_tempest_plugin.(api|scenario).test_trunk'
 
             -
                 case_name: barbican
@@ -369,11 +388,13 @@ tiers:
                     It leverages on the tempest plugin containing tests used to
                     verify the functionality of a barbican installation
                 dependencies:
-                    installer: '^((?!fuel|apex|compass|daisy).)*$'
+                    installer: '^((?!fuel|apex|compass|daisy|osa).)*$'
                     scenario: ''
                 run:
                     module: 'functest.opnfv_tests.openstack.tempest.tempest'
-                    class: 'TempestBarbican'
+                    class: 'TempestCommon'
+                    args:
+                        mode: 'barbican_tempest_plugin.tests.(api|scenario)'
 
     -
         name: features
@@ -471,7 +492,7 @@ tiers:
             Extensive testing of OpenStack API.
         testcases:
             -
-                case_name: tempest_full_parallel
+                case_name: tempest_full
                 project_name: functest
                 criteria: 80
                 blocking: false
@@ -484,7 +505,9 @@ tiers:
                     scenario: ''
                 run:
                     module: 'functest.opnfv_tests.openstack.tempest.tempest'
-                    class: 'TempestFullParallel'
+                    class: 'TempestCommon'
+                    args:
+                        mode: '^tempest\.'
 
             -
                 case_name: rally_full