Merge "Refactor tempest common"

5 files changed, 9 insertions, 13 deletions

diff --git a/docs/testing/developer/devguide/index.rst b/docs/testing/developer/devguide/index.rst
index aabd72d4c..caa1ccb3b 100644
--- a/docs/testing/developer/devguide/index.rst
+++ b/docs/testing/developer/devguide/index.rst
@@ -90,8 +90,8 @@ The internal test cases in Euphrates are:
  * odl
  * rally_full
  * rally_sanity
- * tempest_smoke_serial
- * tempest_full_parallel
+ * tempest_smoke
+ * tempest_full
  * cloudify_ims
 
 By internal, we mean that this particular test cases have been developed and/or
diff --git a/docs/testing/user/userguide/reporting.rst b/docs/testing/user/userguide/reporting.rst
index 337c203db..7c8c48ece 100644
--- a/docs/testing/user/userguide/reporting.rst
+++ b/docs/testing/user/userguide/reporting.rst
@@ -25,7 +25,7 @@ and features) corresponding to this scenario.
    +---------------------+---------+---------+---------+---------+
    | vPing_userdata      |    X    |    X    |    X    |    X    |
    +---------------------+---------+---------+---------+---------+
-   | tempest_smoke_serial|    X    |    X    |    X    |    X    |
+   | tempest_smoke       |    X    |    X    |    X    |    X    |
    +---------------------+---------+---------+---------+---------+
    | rally_sanity        |    X    |    X    |    X    |    X    |
    +---------------------+---------+---------+---------+---------+
diff --git a/docs/testing/user/userguide/test_details.rst b/docs/testing/user/userguide/test_details.rst
index 688b67431..992b546f5 100644
--- a/docs/testing/user/userguide/test_details.rst
+++ b/docs/testing/user/userguide/test_details.rst
@@ -166,17 +166,14 @@ console output is stored to a *log* file for further analysis.
 The Tempest testcases are distributed across three
 Tiers:
 
-  * Smoke Tier - Test Case 'tempest_smoke_serial'
-  * Components Tier - Test case 'tempest_full_parallel'
+  * Smoke Tier - Test Case 'tempest_smoke'
+  * Components Tier - Test case 'tempest_full'
   * Neutron Trunk Port - Test case 'neutron_trunk'
   * OpenStack interop testcases - Test case 'refstack_defcore'
   * Testing and verifying RBAC policy enforcement - Test case 'patrole'
 
-NOTE: Test case 'tempest_smoke_serial' executes a defined set of tempest smoke
-tests with a single thread (i.e. serial mode). Test case
-'tempest_full_parallel' executes all defined Tempest tests using several
-concurrent threads (i.e. parallel mode). The number of threads activated
-corresponds to the number of available logical CPUs.
+NOTE: Test case 'tempest_smoke' executes a defined set of tempest smoke
+tests. Test case 'tempest_full' executes all defined Tempest tests.
 
 NOTE: The 'neutron_trunk' test set allows to connect a VM to multiple VLAN
 separated networks using a single NIC. The feature neutron trunk ports have
diff --git a/docs/testing/user/userguide/test_overview.rst b/docs/testing/user/userguide/test_overview.rst
index d85668687..2ff14f732 100644
--- a/docs/testing/user/userguide/test_overview.rst
+++ b/docs/testing/user/userguide/test_overview.rst
@@ -55,7 +55,7 @@ validate the scenario for the release.
 |             |               +------------+----------------------------------+
 |             |               | tempest    | Generate and run a relevant      |
 |             |               | \_smoke    | Tempest Test Suite in smoke mode.|
-|             |               | \_serial   | The generated test set is        |
+|             |               |            | The generated test set is        |
 |             |               |            | dependent on the OpenStack       |
 |             |               |            | deployment environment           |
 |             |               +------------+----------------------------------+
diff --git a/docs/testing/user/userguide/troubleshooting.rst b/docs/testing/user/userguide/troubleshooting.rst
index 375b6ed28..5755544e6 100644
--- a/docs/testing/user/userguide/troubleshooting.rst
+++ b/docs/testing/user/userguide/troubleshooting.rst
@@ -20,8 +20,7 @@ VIM
 ---
 
 This section covers the test cases related to the VIM (healthcheck, vping_ssh,
-vping_userdata, tempest_smoke_serial, tempest_full_parallel, rally_sanity,
-rally_full).
+vping_userdata, tempest_smoke, tempest_full, rally_sanity, rally_full).
 
 vPing common
 ^^^^^^^^^^^^