Merge "Move api_check and connection check to healthcheck category"

4 files changed, 40 insertions, 41 deletions

diff --git a/docs/devguide/index.rst b/docs/devguide/index.rst
index 6624f8a70..21af912b1 100644
--- a/docs/devguide/index.rst
+++ b/docs/devguide/index.rst
@@ -63,11 +63,11 @@ Functest internal test cases
 The internal test cases in Danube are:
 
  * healthcheck
+ * connection_check
+ * api_check
  * vping_ssh
  * vping_userdata
  * odl
- * connection_check
- * api_check
  * snaps_smoke
  * tempest_smoke_serial
  * rally_sanity
diff --git a/docs/userguide/index.rst b/docs/userguide/index.rst
index bc02776aa..7e821a84d 100644
--- a/docs/userguide/index.rst
+++ b/docs/userguide/index.rst
@@ -236,7 +236,7 @@ SNAPS stands for "SNA/NFV Application development Platform and Stack".
 This project seeks to develop baseline OpenStack NFV installations. It has been
 developed by Steven Pisarski and provided an object oriented library to perform
 functional and performance tests. It has been declined in several test suites in
-Functest.
+Functest, 2 are part of healthcheck tier, one belongs to smoke tier.
 
 connection check
 ^^^^^^^^^^^^^^^^
@@ -251,7 +251,7 @@ snaps.use_keystone is True, functest must have access to the cloud's private
 network.
 This suite consists in 49 tests (test duration< 2 minutes)
 
-Snaps_smoke
+snaps_smoke
 ^^^^^^^^^^^
 This test case contains tests that setup and destroy environments with VMs with
 and without Floating IPs with a newly created user and project. Set the config
diff --git a/docs/userguide/runfunctest.rst b/docs/userguide/runfunctest.rst
index ef1017104..ecf3a209e 100644
--- a/docs/userguide/runfunctest.rst
+++ b/docs/userguide/runfunctest.rst
@@ -62,10 +62,10 @@ command::
 
   root@22e436918db0:~/repos/functest/ci# functest testcase list
   healthcheck
+  api_check
+  connection_check
   vping_ssh
   vping_userdata
-  connection_check
-  api_check
   snaps_smoke
   tempest_smoke_serial
   rally_sanity
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 12d791f08..6397f764c 100755
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -18,7 +18,41 @@ tiers:
                 dependencies:
                     installer: ''
                     scenario: '^((?!lxd).)*$'
+            -
+                name: connection_check
+                criteria: 'status == "PASS"'
+                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: '^((?!netvirt).)*$'
+                    scenario: ''
+                run:
+                    module: 'functest.opnfv_tests.openstack.snaps.connection_check'
+                    class: 'ConnectionCheck'
+
+            -
+                name: api_check
+                criteria: 'status == "PASS"'
+                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: '^((?!netvirt).)*$'
+                    scenario: ''
+                run:
+                    module: 'functest.opnfv_tests.openstack.snaps.api_check'
+                    class: 'ApiCheck'
     -
         name: smoke
         order: 1
@@ -116,41 +150,6 @@ tiers:
                     installer: ''
                     scenario: 'onos'
 
-            -
-                name: connection_check
-                criteria: 'status == "PASS"'
-                blocking: false
-                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: '^((?!netvirt).)*$'
-                    scenario: ''
-                run:
-                    module: 'functest.opnfv_tests.openstack.snaps.connection_check'
-                    class: 'ConnectionCheck'
-
-            -
-                name: api_check
-                criteria: 'status == "PASS"'
-                blocking: false
-                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: '^((?!netvirt).)*$'
-                    scenario: ''
-                run:
-                    module: 'functest.opnfv_tests.openstack.snaps.api_check'
-                    class: 'ApiCheck'
 
             -
                 name: snaps_smoke