Remove one sub test case from dovetail.tempest.tc004

1. Currently, dovetail.tempest.tc004 has 13 sub test cases defined in its
   config file and specification document of the test case. All these
   sub test cases are picked from tempest based on it's version 15.0.0.
2. For Dovetail 1st release, it fixes the version of Functest to be
   opnfv/dovetail:cvp.0.5.0, and Functest integretes tempest 14.0.0
   in this version and it's E release.
3. There is one sub test case in dovetail.tempest.tc004 that is new in
   tempest 15.0.0, so it can not be recognized and executed by Functest D
   and E release. It is 'test_server_connectivity_cold_migration_revert'.
4. Remove this sub test case from dovetail.tempest.tc004. This means remove it
   from the test case config file and specification document.

JIRA: DOVETAIL-561

Change-Id: Ia927af040794c7027a741a282ed75fe401f99ff1
Signed-off-by: xudan <xudan16@huawei.com>

2 files changed, 10 insertions, 62 deletions

diff --git a/docs/testing/user/testspecification/machinelifecycle/index.rst b/docs/testing/user/testspecification/machinelifecycle/index.rst
index a61a0b32..5b46b90f 100644
--- a/docs/testing/user/testspecification/machinelifecycle/index.rst
+++ b/docs/testing/user/testspecification/machinelifecycle/index.rst
@@ -240,59 +240,8 @@ Post conditions
 
 N/A
 
------------------------------------
-Test Case 3 - Cold migration revert
------------------------------------
-
-Test case specification
------------------------
-
-tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_cold_migration_revert
-
-Test preconditions
-------------------
-
-* At least 2 compute nodes
-* Nova, neutron services are available
-* One public network
-
-Basic test flow execution description and pass/fail criteria
-------------------------------------------------------------
-
-Test execution
-''''''''''''''
-
-* Test action 1: Create a keypair KEYP1
-* Test action 2: Create a server VM1 with KEYP1
-* Test action 3: Create a floating IP FIP1 and assign FIP1 to VM1
-* Test action 4: Get VM1's host info SRC_HOST
-* Test action 5: Wait for VM1 to reach 'ACTIVE' status
-* **Test assertion 1:** Verify can ping FIP1 successfully and can SSH to VM1 via FIP1
-* Test action 6: Cold migrate VM1
-* Test action 7: Wait for VM1 to reach 'VERIFY_RESIZE' status
-* Test action 8: Revert resize VM1
-* Test action 9: Wait for VM1 to reach 'ACTIVE' status
-* **Test assertion 2:** Verify can ping FIP1 successfully and can SSH to VM1 via FIP1
-* Test action 10: Get VM1's host info DST_HOST
-* **Test assertion 3:** Verify SRC_HOST equals to DST_HOST
-* Test action 11: Delete KEYP1, VM1 and FIP1
-
-Pass / fail criteria
-''''''''''''''''''''
-
-This test evaluates the ability to revert cold-migrated VMs. Specifically, the test verifies that:
-
-* Cold migrate operation can be reverted.
-
-In order to pass this test, all test assertions listed in the test execution above need to pass.
-
-Post conditions
----------------
-
-N/A
-
 --------------------------------------
-Test Case 4 - Pause and unpause server
+Test Case 3 - Pause and unpause server
 --------------------------------------
 
 Test case specification
@@ -341,7 +290,7 @@ Post conditions
 N/A
 
 ---------------------------
-Test Case 5 - Reboot server
+Test Case 4 - Reboot server
 ---------------------------
 
 Test case specification
@@ -384,7 +333,7 @@ Post conditions
 N/A
 
 ----------------------------
-Test Case 6 - Rebuild server
+Test Case 5 - Rebuild server
 ----------------------------
 
 Test case specification
@@ -427,7 +376,7 @@ Post conditions
 N/A
 
 ---------------------------
-Test Case 7 - Resize server
+Test Case 6 - Resize server
 ---------------------------
 
 Test case specification
@@ -472,7 +421,7 @@ Post conditions
 N/A
 
 -----------------------------------
-Test Case 8 - Stop and start server
+Test Case 7 - Stop and start server
 -----------------------------------
 
 Test case specification
@@ -520,7 +469,7 @@ Post conditions
 N/A
 
 ---------------------------------------
-Test Case 9 - Suspend and resume server
+Test Case 8 - Suspend and resume server
 ---------------------------------------
 
 Test case specification
@@ -568,7 +517,7 @@ Post conditions
 N/A
 
 ----------------------------------------------------
-Test Case 10 - Suspend and resume server in sequence
+Test Case 9 - Suspend and resume server in sequence
 ----------------------------------------------------
 
 Test case specification
@@ -619,7 +568,7 @@ Post conditions
 N/A
 
 ------------------------------------------
-Test Case 11 - Resize volume backed server
+Test Case 10 - Resize volume backed server
 ------------------------------------------
 
 Test case specification
@@ -663,7 +612,7 @@ Post conditions
 N/A
 
 -----------------------------------------
-Test Case 12 - Shelve and unshelve server
+Test Case 11 - Shelve and unshelve server
 -----------------------------------------
 
 Test case specification
@@ -712,7 +661,7 @@ Post conditions
 N/A
 
 -------------------------------------------------------
-Test Case 13 - Shelve and unshelve volume backed server
+Test Case 12 - Shelve and unshelve volume backed server
 -------------------------------------------------------
 
 Test case specification
diff --git a/dovetail/testcase/tempest.tc004.yml b/dovetail/testcase/tempest.tc004.yml
index c9e9c8f6..55ef5c23 100644
--- a/dovetail/testcase/tempest.tc004.yml
+++ b/dovetail/testcase/tempest.tc004.yml
@@ -14,7 +14,6 @@ dovetail.tempest.tc004:
     sub_testcase_list:
       - tempest.scenario.test_minimum_basic.TestMinimumBasicScenario.test_minimum_basic_scenario[compute,id-bdbb5441-9204-419d-a225-b4fdbfb1a1a8,image,network,volume]
       - tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_cold_migration[compute,id-a4858f6c-401e-4155-9a49-d5cd053d1a2f,network]
-      - tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_cold_migration_revert[compute,id-25b188d7-0183-4b1e-a11d-15840c8e2fd6,network]
       - tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_pause_unpause[compute,id-2b2642db-6568-4b35-b812-eceed3fa20ce,network]
       - tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_reboot[compute,id-7b6860c2-afa3-4846-9522-adeb38dfbe08,network]
       - tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_rebuild[compute,id-88a529c2-1daa-4c85-9aec-d541ba3eb699,network]