Move vping_* and cinder_test into healthcheck

Change-Id: I193c6dcdf90fe8eac46884fe5a5a329b0e5a7322
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

3 files changed, 93 insertions, 94 deletions

diff --git a/docker/healthcheck/testcases.yaml b/docker/healthcheck/testcases.yaml
index 087ee9edc..12dc7d298 100644
--- a/docker/healthcheck/testcases.yaml
+++ b/docker/healthcheck/testcases.yaml
@@ -124,6 +124,55 @@ tiers:
                     class: 'SingleVm2'
 
             -
+                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: '^((?!lxd).)*$'
+                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: cinder_test
+                project_name: functest
+                criteria: 100
+                blocking: true
+                description: >-
+                    This test case verifies: 1) Attach volume and to 1
+                    instance; 2) Write data on volume 3) Detach volume
+                    from instance 1, attach it on instance 2 3) Read volume
+                    data
+                dependencies:
+                    installer: ''
+                    scenario: '^((?!lxd).)*$'
+                run:
+                    module: 'functest.opnfv_tests.openstack.cinder.cinder_test'
+                    class: 'CinderCheck'
+
+            -
                 case_name: api_check
                 project_name: functest
                 criteria: 100
diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index ca2126173..be26ab039 100644
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -8,55 +8,6 @@ tiers:
             Set of basic Functional tests to validate the OPNFV scenarios.
         testcases:
             -
-                case_name: vping_ssh
-                project_name: functest
-                criteria: 100
-                blocking: false
-                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: '^((?!lxd).)*$'
-                run:
-                    module: 'functest.opnfv_tests.openstack.vping.vping_ssh'
-                    class: 'VPingSSH'
-
-            -
-                case_name: vping_userdata
-                project_name: functest
-                criteria: 100
-                blocking: false
-                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: cinder_test
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    This test case verifies: 1) Attach volume and to 1
-                    instance; 2) Write data on volume 3) Detach volume
-                    from instance 1, attach it on instance 2 3) Read volume
-                    data
-                dependencies:
-                    installer: ''
-                    scenario: '^((?!lxd).)*$'
-                run:
-                    module: 'functest.opnfv_tests.openstack.cinder.cinder_test'
-                    class: 'CinderCheck'
-
-            -
                 case_name: tempest_smoke_serial
                 project_name: functest
                 criteria: 100
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index e375166f0..a4415536c 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -124,97 +124,96 @@ tiers:
                     class: 'SingleVm2'
 
             -
-                case_name: api_check
+                case_name: vping_ssh
                 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.
+                    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: '^((?!lxd).)*$'
                 run:
-                    module: 'functest.opnfv_tests.openstack.snaps.api_check'
-                    class: 'ApiCheck'
+                    module: 'functest.opnfv_tests.openstack.vping.vping_ssh'
+                    class: 'VPingSSH'
 
             -
-                case_name: snaps_health_check
+                case_name: vping_userdata
                 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.
+                    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.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.opnfv_tests.openstack.vping.vping_userdata'
+                    class: 'VPingUserdata'
 
             -
-                case_name: vping_ssh
+                case_name: cinder_test
                 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
-                    between 2 instances over a private network.
+                    This test case verifies: 1) Attach volume and to 1
+                    instance; 2) Write data on volume 3) Detach volume
+                    from instance 1, attach it on instance 2 3) Read volume
+                    data
                 dependencies:
                     installer: ''
                     scenario: '^((?!lxd).)*$'
                 run:
-                    module: 'functest.opnfv_tests.openstack.vping.vping_ssh'
-                    class: 'VPingSSH'
+                    module: 'functest.opnfv_tests.openstack.cinder.cinder_test'
+                    class: 'CinderCheck'
 
             -
-                case_name: vping_userdata
+                case_name: api_check
                 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.
+                    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.vping.vping_userdata'
-                    class: 'VPingUserdata'
+                    module: 'functest.opnfv_tests.openstack.snaps.api_check'
+                    class: 'ApiCheck'
 
             -
-                case_name: cinder_test
+                case_name: snaps_health_check
                 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
-                    from instance 1, attach it on instance 2 3) Read volume
-                    data
+                    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.cinder.cinder_test'
-                    class: 'CinderCheck'
+                    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