X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fsmoke%2Ftestcases.yaml;h=3bfca8686272e46fa4bf1ef807e06f194696423a;hb=refs%2Fchanges%2F91%2F59491%2F6;hp=bfc9a4cdc201fc7781fdfc278808ee12a147c944;hpb=b76e3c83b913bf969c9ec48e0f7174dc90f32ffd;p=functest.git

diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index bfc9a4cdc..3bfca8686 100644
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -8,39 +8,7 @@ tiers:
             Set of basic Functional tests to validate the OPNFV scenarios.
         testcases:
             -
-                case_name: vping_ssh
-                project_name: functest
-                criteria: 100
-                blocking: true
-                description: >-
-                    This test case verifies: 1) SSH to an instance using
-                    floating IPs over the public network. 2) Connectivity
-                    between 2 instances over a private network.
-                dependencies:
-                    installer: ''
-                    scenario: '^((?!odl_l3|odl-bgpvpn|gluon).)*$'
-                run:
-                    module: 'functest.opnfv_tests.openstack.vping.vping_ssh'
-                    class: 'VPingSSH'
-
-            -
-                case_name: vping_userdata
-                project_name: functest
-                criteria: 100
-                blocking: true
-                description: >-
-                    This test case verifies:  1) Boot a VM with given userdata.
-                    2) Connectivity between 2 instances over a private network.
-                dependencies:
-                    installer: ''
-                    scenario: '^((?!lxd).)*$'
-                run:
-                    module:
-                        'functest.opnfv_tests.openstack.vping.vping_userdata'
-                    class: 'VPingUserdata'
-
-            -
-                case_name: tempest_smoke_serial
+                case_name: tempest_smoke
                 project_name: functest
                 criteria: 100
                 blocking: false
@@ -54,7 +22,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
@@ -110,46 +80,22 @@ tiers:
                             - 'test_networks_multiprovider_rbac'
 
             -
-                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'
-                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: odl_netvirt
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    Test Suite for the OpenDaylight SDN Controller when
-                    the NetVirt features are installed. It integrates
-                    some test suites from upstream using Robot as the
-                    test framework.
-                dependencies:
-                    installer: 'apex'
-                    scenario: 'os-odl_l3-nofeature'
+                    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
-                            - /src/odl_test/csit/suites/openstack/connectivity
+                    module:
+                        'functest.opnfv_tests.openstack.shaker.shaker'
+                    class: 'Shaker'
 
             -
                 case_name: snaps_smoke
@@ -186,5 +132,24 @@ 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
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    It leverages on the tempest plugin containing tests used to
+                    verify the functionality of a barbican installation
+                dependencies:
+                    installer: '^((?!fuel|apex|compass|daisy|osa).)*$'
+                    scenario: ''
+                run:
+                    module: 'functest.opnfv_tests.openstack.tempest.tempest'
+                    class: 'TempestCommon'
+                    args:
+                        mode: 'barbican_tempest_plugin.tests.(api|scenario)'