X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fci%2Ftestcases.yaml;h=68d1a369a5f57a5c0c7514d25bb23aa5d93b1eb1;hb=refs%2Fchanges%2F61%2F58961%2F4;hp=53641af47f58fc836cc88e872faf86dbb24d2567;hpb=e5f28f769cf230af91cdd6651e19c64fba22e5a2;p=functest.git

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 53641af47..68d1a369a 100644
--- 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'
 
             -
@@ -60,85 +58,74 @@ tiers:
                     class: 'TenantNetwork2'
 
             -
-                case_name: singlevm1
+                case_name: vmready1
                 project_name: functest
                 criteria: 100
                 blocking: true
                 description: >-
                     It inherits from TenantNetwork1 which creates all network
-                    resources and completes it by booting a VM attached to that
+                    resources and prepares a future VM attached to that
                     network.
                 dependencies:
                     installer: ''
                     scenario: ''
                 run:
                     module: 'functest.core.singlevm'
-                    class: 'SingleVm1'
+                    class: 'VmReady1'
 
             -
-                case_name: singlevm2
+                case_name: vmready2
                 project_name: functest
                 criteria: 100
                 blocking: true
                 description: >-
                     It creates new user/project before creating and configuring
-                    all tenant network ressources and vms required by advanced
-                    testcases.
+                    all tenant network ressources, flavors, images, etc.
+                    required by advanced testcases.
                 dependencies:
                     installer: ''
                     scenario: ''
                 run:
                     module: 'functest.core.singlevm'
-                    class: 'SingleVm2'
+                    class: 'VmReady2'
 
             -
-                case_name: api_check
+                case_name: singlevm1
                 project_name: functest
                 criteria: 100
                 blocking: true
                 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.
+                    It inherits from TenantNetwork1 which creates all network
+                    resources and completes it by booting a VM attached to that
+                    network.
                 dependencies:
                     installer: ''
-                    scenario: '^((?!lxd).)*$'
+                    scenario: ''
                 run:
-                    module: 'functest.opnfv_tests.openstack.snaps.api_check'
-                    class: 'ApiCheck'
+                    module: 'functest.core.singlevm'
+                    class: 'SingleVm1'
 
             -
-                case_name: snaps_health_check
+                case_name: singlevm2
                 project_name: functest
                 criteria: 100
                 blocking: true
                 description: >-
-                    This test case creates executes the SimpleHealthCheck
-                    Python test class which creates an, image, flavor, network,
-                    and Cirros VM instance and observes the console output to
-                    validate the single port obtains the correct IP address.
+                    It creates new user/project before creating and configuring
+                    all tenant network ressources and vms required by advanced
+                    testcases.
                 dependencies:
                     installer: ''
-                    scenario: '^((?!lxd).)*$'
+                    scenario: ''
                 run:
-                    module: 'functest.opnfv_tests.openstack.snaps.health_check'
-                    class: 'HealthCheck'
-
-    -
-        name: smoke
-        order: 1
-        ci_loop: '(daily)|(weekly)'
-        description: >-
-            Set of basic Functional tests to validate the OPNFV scenarios.
-        testcases:
+                    module: 'functest.core.singlevm'
+                    class: 'SingleVm2'
 
             -
                 case_name: vping_ssh
                 project_name: functest
                 criteria: 100
-                blocking: false
+                blocking: true
                 description: >-
                     This test case verifies: 1) SSH to an instance using
                     floating IPs over the public network. 2) Connectivity
@@ -154,7 +141,7 @@ tiers:
                 case_name: vping_userdata
                 project_name: functest
                 criteria: 100
-                blocking: false
+                blocking: true
                 description: >-
                     This test case verifies:  1) Boot a VM with given userdata.
                     2) Connectivity between 2 instances over a private network.
@@ -170,7 +157,7 @@ tiers:
                 case_name: cinder_test
                 project_name: functest
                 criteria: 100
-                blocking: false
+                blocking: true
                 description: >-
                     This test case verifies: 1) Attach volume and to 1
                     instance; 2) Write data on volume 3) Detach volume
@@ -183,6 +170,48 @@ tiers:
                     module: 'functest.opnfv_tests.openstack.cinder.cinder_test'
                     class: 'CinderCheck'
 
+            -
+                case_name: api_check
+                project_name: functest
+                criteria: 100
+                blocking: true
+                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.
+                dependencies:
+                    installer: ''
+                    scenario: '^((?!lxd).)*$'
+                run:
+                    module: 'functest.opnfv_tests.openstack.snaps.api_check'
+                    class: 'ApiCheck'
+
+            -
+                case_name: snaps_health_check
+                project_name: functest
+                criteria: 100
+                blocking: true
+                description: >-
+                    This test case creates executes the SimpleHealthCheck
+                    Python test class which creates an, image, flavor, network,
+                    and Cirros VM instance and observes the console output to
+                    validate the single port obtains the correct IP address.
+                dependencies:
+                    installer: ''
+                    scenario: '^((?!lxd).)*$'
+                run:
+                    module: 'functest.opnfv_tests.openstack.snaps.health_check'
+                    class: 'HealthCheck'
+
+    -
+        name: smoke
+        order: 1
+        ci_loop: '(daily)|(weekly)'
+        description: >-
+            Set of basic Functional tests to validate the OPNFV scenarios.
+        testcases:
             -
                 case_name: tempest_smoke_serial
                 project_name: functest