Update Dovetail for XCI and Functest Hunter

All info are recorded in etherpad
https://etherpad.opnfv.org/p/Dovetail_XCI_TCs

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

27 files changed, 19 insertions, 336 deletions

diff --git a/docs/release/release-notes/index.rst b/docs/release/release-notes/index.rst
index 7efaac4c..1ec19960 100644
--- a/docs/release/release-notes/index.rst
+++ b/docs/release/release-notes/index.rst
@@ -93,7 +93,6 @@ There are a total of 432 mandatory test cases.
 
 - functest.vnf.vims (1)
 - functest.vnf.vepc (1)
-- functest.snaps.smoke  (1)
 - yardstick.ha.neutron_l3_agent  (1)
 - yardstick.ha.controller_restart (1)
 - functest.tempest.ipv6_scenario (8)
@@ -104,7 +103,7 @@ There are a total of 432 mandatory test cases.
 - functest.tempest.bgpvpn (15)
 - functest.security.patrole_vxlan_dependent (2)
 
-There are a total of 57 optional test cases.
+There are a total of 58 optional test cases.
 
 OPNFV Test Projects and Components
 ----------------------------------
diff --git a/docs/testing/user/ovpaddendum/index.rst b/docs/testing/user/ovpaddendum/index.rst
index c84f85de..7072d3f1 100644
--- a/docs/testing/user/ovpaddendum/index.rst
+++ b/docs/testing/user/ovpaddendum/index.rst
@@ -350,7 +350,6 @@ of OVP is as follows:
   - yardstick.ha.controller_restart
   - functest.vnf.vims
   - functest.vnf.vepc
-  - functest.snaps.smoke
 
 \* The OPNFV OVP utilizes the same set of test cases as the OpenStack
 interoperability program *OpenStack Powered Compute*. Passing the OPNFV OVP
diff --git a/docs/testing/user/testspecification/index.rst b/docs/testing/user/testspecification/index.rst
index b4232b68..69df2a01 100644
--- a/docs/testing/user/testspecification/index.rst
+++ b/docs/testing/user/testspecification/index.rst
@@ -30,7 +30,6 @@ specification documents.
    highavailability/index
    security_patrole/index
    security_patrole_vxlan_dependent/index
-   snaps_smoke/index
    stress/index
    tempest_compute/index
    tempest_identity_v3/index
diff --git a/docs/testing/user/testspecification/snaps_smoke/index.rst b/docs/testing/user/testspecification/snaps_smoke/index.rst
deleted file mode 100644
index dff2b2b5..00000000
--- a/docs/testing/user/testspecification/snaps_smoke/index.rst
+++ /dev/null
@@ -1,232 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-.. http://creativecommons.org/licenses/by/4.0
-.. (c) Ericsson AB
-
-==============================
-SNAPS smoke test specification
-==============================
-
-.. toctree::
-   :maxdepth: 2
-
-Scope
-=====
-
-The SNAPS smoke test case contains tests that setup and destroy environments
-with VMs with and without Floating IPs with a newly created user and project.
-
-References
-==========
-
-This smoke test executes the Python Tests included with the SNAPS libraries
-that exercise many of the OpenStack APIs within Keystone, Glance, Neutron,
-and Nova.
-
-- https://wiki.opnfv.org/display/PROJ/SNAPS-OO
-
-System Under Test (SUT)
-=======================
-
-The SUT is assumed to be the NFVi and VIM in operation on a Pharos compliant infrastructure.
-
-
-Test Area Structure
-===================
-
-The test area is structured in individual tests as listed below.
-For detailed information on the individual steps and assertions performed
-by the tests, review the Python source code accessible via the following links:
-
-**Dynamic creation of User/Project objects to be leveraged for the integration tests:**
-
-- `Create Image Success tests <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_image_tests.py#L254>`_
-    - snaps.openstack.tests.create_image_tests.CreateImageSuccessTests.test_create_delete_image
-    - snaps.openstack.tests.create_image_tests.CreateImageSuccessTests.test_create_image_clean_file
-    - snaps.openstack.tests.create_image_tests.CreateImageSuccessTests.test_create_image_clean_url
-    - snaps.openstack.tests.create_image_tests.CreateImageSuccessTests.test_create_image_clean_url_properties
-    - snaps.openstack.tests.create_image_tests.CreateImageSuccessTests.test_create_same_image
-    - snaps.openstack.tests.create_image_tests.CreateImageSuccessTests.test_create_same_image_new_settings
-
-- `Create Image Negative tests <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_image_tests.py#L463>`_
-    - snaps.openstack.tests.create_image_tests.CreateImageNegativeTests.test_bad_image_file
-    - snaps.openstack.tests.create_image_tests.CreateImageNegativeTests.test_bad_image_image_type
-    - snaps.openstack.tests.create_image_tests.CreateImageNegativeTests.test_bad_image_name
-    - snaps.openstack.tests.create_image_tests.CreateImageNegativeTests.test_bad_image_url
-
-- `Create Image Multi Part tests <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_image_tests.py#L551>`_
-    - snaps.openstack.tests.create_image_tests.CreateMultiPartImageTests.test_create_three_part_image_from_file_3_creators
-    - snaps.openstack.tests.create_image_tests.CreateMultiPartImageTests.test_create_three_part_image_from_url
-    - snaps.openstack.tests.create_image_tests.CreateMultiPartImageTests.test_create_three_part_image_from_url_3_creators
-
-- `Create Keypairs tests <https://github.com/opnfv/snaps/blob/stable%2Ffraser/snaps/openstack/tests/create_keypairs_tests.py#L192>`_
-    - snaps.openstack.tests.create_keypairs_tests.CreateKeypairsTests.test_create_delete_keypair
-    - snaps.openstack.tests.create_keypairs_tests.CreateKeypairsTests.test_create_keypair_from_file
-    - snaps.openstack.tests.create_keypairs_tests.CreateKeypairsTests.test_create_keypair_large_key
-    - snaps.openstack.tests.create_keypairs_tests.CreateKeypairsTests.test_create_keypair_only
-    - snaps.openstack.tests.create_keypairs_tests.CreateKeypairsTests.test_create_keypair_save_both
-    - snaps.openstack.tests.create_keypairs_tests.CreateKeypairsTests.test_create_keypair_save_pub_only
-
-- `Create Keypairs Cleanup tests <https://github.com/opnfv/snaps/blob/stable%2Ffraser/snaps/openstack/tests/create_keypairs_tests.py#L361>`_
-    - snaps.openstack.tests.create_keypairs_tests.CreateKeypairsCleanupTests.test_create_keypair_exist_files_delete
-    - snaps.openstack.tests.create_keypairs_tests.CreateKeypairsCleanupTests.test_create_keypair_exist_files_keep
-    - snaps.openstack.tests.create_keypairs_tests.CreateKeypairsCleanupTests.test_create_keypair_gen_files_delete_1
-    - snaps.openstack.tests.create_keypairs_tests.CreateKeypairsCleanupTests.test_create_keypair_gen_files_delete_2
-    - snaps.openstack.tests.create_keypairs_tests.CreateKeypairsCleanupTests.test_create_keypair_gen_files_keep
-
-- `Create Network Success tests <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_network_tests.py#L355>`_
-    - snaps.openstack.tests.create_network_tests.CreateNetworkSuccessTests.test_create_delete_network
-    - snaps.openstack.tests.create_network_tests.CreateNetworkSuccessTests.test_create_network_router_admin_user_to_new_project
-    - snaps.openstack.tests.create_network_tests.CreateNetworkSuccessTests.test_create_network_router_new_user_to_admin_project
-    - snaps.openstack.tests.create_network_tests.CreateNetworkSuccessTests.test_create_network_with_router
-    - snaps.openstack.tests.create_network_tests.CreateNetworkSuccessTests.test_create_network_without_router
-    - snaps.openstack.tests.create_network_tests.CreateNetworkSuccessTests.test_create_networks_same_name
-
-- `Create Router Success tests <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_router_tests.py#L118>`_
-    - snaps.openstack.tests.create_router_tests.CreateRouterSuccessTests.test_create_delete_router
-    - snaps.openstack.tests.create_router_tests.CreateRouterSuccessTests.test_create_router_admin_state_True
-    - snaps.openstack.tests.create_router_tests.CreateRouterSuccessTests.test_create_router_admin_state_false
-    - snaps.openstack.tests.create_router_tests.CreateRouterSuccessTests.test_create_router_admin_user_to_new_project
-    - snaps.openstack.tests.create_router_tests.CreateRouterSuccessTests.test_create_router_external_network
-    - snaps.openstack.tests.create_router_tests.CreateRouterSuccessTests.test_create_router_new_user_as_admin_project
-    - snaps.openstack.tests.create_router_tests.CreateRouterSuccessTests.test_create_router_private_network
-    - snaps.openstack.tests.create_router_tests.CreateRouterSuccessTests.test_create_router_vanilla
-    - snaps.openstack.tests.create_router_tests.CreateRouterSuccessTests.test_create_router_with_ext_port
-    - snaps.openstack.tests.create_router_tests.CreateRouterSuccessTests.test_create_with_internal_sub
-    - snaps.openstack.tests.create_router_tests.CreateRouterSuccessTests.test_create_with_invalid_internal_sub
-
-- `Create Router Negative tests <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_router_tests.py#L514>`_
-    - snaps.openstack.tests.create_router_tests.CreateRouterNegativeTests.test_create_router_admin_ports
-    - snaps.openstack.tests.create_router_tests.CreateRouterNegativeTests.test_create_router_invalid_gateway_name
-    - snaps.openstack.tests.create_router_tests.CreateRouterNegativeTests.test_create_router_noname
-
-
-- `Create QoS tests <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_qos_tests.py#L112>`_
-    - snaps.openstack.tests.create_qos_tests.CreateQoSTests.test_create_delete_qos
-    - snaps.openstack.tests.create_qos_tests.CreateQoSTests.test_create_qos
-    - snaps.openstack.tests.create_qos_tests.CreateQoSTests.test_create_same_qos
-
-- `Create Simple Volume Success tests <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_volume_tests.py#L116>`_
-    - snaps.openstack.tests.create_volume_tests.CreateSimpleVolumeSuccessTests.test_create_delete_volume
-    - snaps.openstack.tests.create_volume_tests.CreateSimpleVolumeSuccessTests.test_create_same_volume
-    - snaps.openstack.tests.create_volume_tests.CreateSimpleVolumeSuccessTests.test_create_volume_simple
-
-- `Create Simple Volume Failure tests <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_volume_tests.py#L116>`_
-    - snaps.openstack.tests.create_volume_tests.CreateSimpleVolumeFailureTests.test_create_volume_bad_image
-    - snaps.openstack.tests.create_volume_tests.CreateSimpleVolumeFailureTests.test_create_volume_bad_size
-    - snaps.openstack.tests.create_volume_tests.CreateSimpleVolumeFailureTests.test_create_volume_bad_type
-
-- `Create Volume With Type tests <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_volume_tests.py#L286>`_
-    - snaps.openstack.tests.create_volume_tests.CreateVolumeWithTypeTests.test_bad_volume_type
-    - snaps.openstack.tests.create_volume_tests.CreateVolumeWithTypeTests.test_valid_volume_type
-
-- `Create Volume With Image tests <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_volume_tests.py#L336>`_
-    - snaps.openstack.tests.create_volume_tests.CreateVolumeWithImageTests.test_bad_image_name
-    - snaps.openstack.tests.create_volume_tests.CreateVolumeWithImageTests.test_valid_volume_image
-
-- `Create Simple Volume Type Success tests <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_volume_type_tests.py#L113>`_
-    - snaps.openstack.tests.create_volume_type_tests.CreateSimpleVolumeTypeSuccessTests.test_create_delete_volume_type
-    - snaps.openstack.tests.create_volume_type_tests.CreateSimpleVolumeTypeSuccessTests.test_create_same_volume_type
-    - snaps.openstack.tests.create_volume_type_tests.CreateSimpleVolumeTypeSuccessTests.test_create_volume_type
-
-- `Create Volume Type Complex tests <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_volume_type_tests.py#L206>`_
-    - snaps.openstack.tests.create_volume_type_tests.CreateVolumeTypeComplexTests.test_volume_type_with_encryption
-    - snaps.openstack.tests.create_volume_type_tests.CreateVolumeTypeComplexTests.test_volume_type_with_qos
-    - snaps.openstack.tests.create_volume_type_tests.CreateVolumeTypeComplexTests.test_volume_type_with_qos_and_encryption
-
-- `Simple Health Check <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_instance_tests.py#L283>`_
-    - snaps.openstack.tests.create_instance_tests.SimpleHealthCheck.test_check_vm_ip_dhcp
-
-- `Create Instance Two Net tests <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_instance_tests.py#L2835>`_
-    - snaps.openstack.tests.create_instance_tests.CreateInstanceTwoNetTests.test_ping_via_router
-
-- `Create Instance Simple tests <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_instance_tests.py#L408>`_
-    - snaps.openstack.tests.create_instance_tests.CreateInstanceSimpleTests.test_create_admin_instance
-    - snaps.openstack.tests.create_instance_tests.CreateInstanceSimpleTests.test_create_delete_instance
-
-- `Create Instance Port Manipulation tests <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_instance_tests.py#L1343>`_
-    - snaps.openstack.tests.create_instance_tests.CreateInstancePortManipulationTests.test_set_allowed_address_pairs
-    - snaps.openstack.tests.create_instance_tests.CreateInstancePortManipulationTests.test_set_allowed_address_pairs_bad_ip
-    - snaps.openstack.tests.create_instance_tests.CreateInstancePortManipulationTests.test_set_allowed_address_pairs_bad_mac
-    - snaps.openstack.tests.create_instance_tests.CreateInstancePortManipulationTests.test_set_custom_invalid_ip_one_subnet
-    - snaps.openstack.tests.create_instance_tests.CreateInstancePortManipulationTests.test_set_custom_invalid_mac
-    - snaps.openstack.tests.create_instance_tests.CreateInstancePortManipulationTests.test_set_custom_mac_and_ip
-    - snaps.openstack.tests.create_instance_tests.CreateInstancePortManipulationTests.test_set_custom_valid_ip_one_subnet
-    - snaps.openstack.tests.create_instance_tests.CreateInstancePortManipulationTests.test_set_custom_valid_mac
-    - snaps.openstack.tests.create_instance_tests.CreateInstancePortManipulationTests.test_set_one_port_two_ip_one_subnet
-    - snaps.openstack.tests.create_instance_tests.CreateInstancePortManipulationTests.test_set_one_port_two_ip_two_subnets
-
-- `Instance Security Group tests <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_instance_tests.py#L283>`_
-    - snaps.openstack.tests.create_instance_tests.InstanceSecurityGroupTests.test_add_invalid_security_group
-    - snaps.openstack.tests.create_instance_tests.InstanceSecurityGroupTests.test_add_same_security_group
-    - snaps.openstack.tests.create_instance_tests.InstanceSecurityGroupTests.test_add_security_group
-    - snaps.openstack.tests.create_instance_tests.InstanceSecurityGroupTests.test_remove_security_group
-    - snaps.openstack.tests.create_instance_tests.InstanceSecurityGroupTests.test_remove_security_group_never_added
-
-- `Create Instance On Compute Host <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_instance_tests.py#L1738>`_
-    - snaps.openstack.tests.create_instance_tests.CreateInstanceOnComputeHost.test_deploy_vm_to_each_compute_node
-
-- `Create Instance From Three Part Image <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_instance_tests.py#L2205>`_
-    - snaps.openstack.tests.create_instance_tests.CreateInstanceFromThreePartImage.test_create_instance_from_three_part_image
-
-- `Create Instance Volume tests <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_instance_tests.py#L3062>`_
-    - snaps.openstack.tests.create_instance_tests.CreateInstanceVolumeTests.test_create_instance_with_one_volume
-    - snaps.openstack.tests.create_instance_tests.CreateInstanceVolumeTests.test_create_instance_with_two_volumes
-
-- `Create Instance Single Network tests <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_instance_tests.py#L687>`_
-    - snaps.openstack.tests.create_instance_tests.CreateInstanceSingleNetworkTests.test_single_port_static
-    - snaps.openstack.tests.create_instance_tests.CreateInstanceSingleNetworkTests.test_ssh_client_fip_after_active
-    - snaps.openstack.tests.create_instance_tests.CreateInstanceSingleNetworkTests.test_ssh_client_fip_after_init
-    - snaps.openstack.tests.create_instance_tests.CreateInstanceSingleNetworkTests.test_ssh_client_fip_after_reboot
-    - snaps.openstack.tests.create_instance_tests.CreateInstanceSingleNetworkTests.test_ssh_client_fip_before_active
-    - snaps.openstack.tests.create_instance_tests.CreateInstanceSingleNetworkTests.test_ssh_client_fip_reverse_engineer
-    - snaps.openstack.tests.create_instance_tests.CreateInstanceSingleNetworkTests.test_ssh_client_fip_second_creator
-
-
-- `Create Stack Success tests <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_stack_tests.py#L131>`_
-    - snaps.openstack.tests.create_stack_tests.CreateStackSuccessTests.test_create_delete_stack
-    - snaps.openstack.tests.create_stack_tests.CreateStackSuccessTests.test_create_same_stack
-    - snaps.openstack.tests.create_stack_tests.CreateStackSuccessTests.test_create_stack_short_timeout
-    - snaps.openstack.tests.create_stack_tests.CreateStackSuccessTests.test_create_stack_template_dict
-    - snaps.openstack.tests.create_stack_tests.CreateStackSuccessTests.test_create_stack_template_file
-    - snaps.openstack.tests.create_stack_tests.CreateStackSuccessTests.test_retrieve_network_creators
-    - snaps.openstack.tests.create_stack_tests.CreateStackSuccessTests.test_retrieve_vm_inst_creators
-
-- `Create Stack Volume tests <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_stack_tests.py#L735>`_
-    - snaps.openstack.tests.create_stack_tests.CreateStackVolumeTests.test_retrieve_volume_creator
-    - snaps.openstack.tests.create_stack_tests.CreateStackVolumeTests.test_retrieve_volume_type_creator
-
-- `Create Stack Flavor tests <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_stack_tests.py#L829>`_
-    - snaps.openstack.tests.create_stack_tests.CreateStackFlavorTests.test_retrieve_flavor_creator
-
-- `Create Stack Keypair tests <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_stack_tests.py#L888>`_
-    - snaps.openstack.tests.create_stack_tests.CreateStackKeypairTests.test_retrieve_keypair_creator
-
-- `Create Stack Security Group tests <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_stack_tests.py#L969>`_
-    - snaps.openstack.tests.create_stack_tests.CreateStackSecurityGroupTests.test_retrieve_security_group_creatorl
-
-- `Create Stack Negative tests <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_stack_tests.py#L1062>`_
-    - snaps.openstack.tests.create_stack_tests.CreateStackNegativeTests.test_bad_stack_file
-    - snaps.openstack.tests.create_stack_tests.CreateStackNegativeTest.test_missing_dependencies
-
-- `Create Security Group tests <https://github.com/opnfv/snaps/blob/stable%2Ffraser/snaps/openstack/tests/create_security_group_tests.py#L199>`_
-    - snaps.openstack.tests.create_security_group_tests.CreateSecurityGroupTests.test_add_rule
-    - snaps.openstack.tests.create_security_group_tests.CreateSecurityGroupTests.test_create_delete_group
-    - snaps.openstack.tests.create_security_group_tests.CreateSecurityGroupTests.test_create_group_admin_user_to_new_project
-    - snaps.openstack.tests.create_security_group_tests.CreateSecurityGroupTests.test_create_group_new_user_to_admin_project
-    - snaps.openstack.tests.create_security_group_tests.CreateSecurityGroupTests.test_create_group_with_one_complex_rule
-    - snaps.openstack.tests.create_security_group_tests.CreateSecurityGroupTests.test_create_group_with_one_simple_rule
-    - snaps.openstack.tests.create_security_group_tests.CreateSecurityGroupTests.test_create_group_with_several_rules
-    - snaps.openstack.tests.create_security_group_tests.CreateSecurityGroupTests.test_create_group_without_rules
-    - snaps.openstack.tests.create_security_group_tests.CreateSecurityGroupTests.test_remove_rule_by_id
-    - snaps.openstack.tests.create_security_group_tests.CreateSecurityGroupTests.test_remove_rule_by_setting
-
-**Floating IP and Ansible provisioning:**
-
-- `Create Stack Floating tests <https://github.com/opnfv/snaps/blob/stable/fraser/snaps/openstack/tests/create_stack_tests.py#L414>`_
-    - snaps.openstack.tests.create_stack_tests.CreateStackFloatingIpTests.test_connect_via_ssh_heat_vm
-    - snaps.openstack.tests.create_stack_tests.CreateStackFloatingIpTests.test_connect_via_ssh_heat_vm_derived
-
-
-- `Ansible Provisioning tests <https://github.com/opnfv/snaps/blob/stable%2Ffraser/snaps/provisioning/tests/ansible_utils_tests.py#L48>`_
-    - snaps.provisioning.tests.ansible_utils_tests.AnsibleProvisioningTests.test_apply_simple_playbook
-    - snaps.provisioning.tests.ansible_utils_tests.AnsibleProvisioningTests.test_apply_template_playbook
diff --git a/docs/testing/user/testspecification/tempest_identity_v3/index.rst b/docs/testing/user/testspecification/tempest_identity_v3/index.rst
index bb60b204..df5bdbb6 100644
--- a/docs/testing/user/testspecification/tempest_identity_v3/index.rst
+++ b/docs/testing/user/testspecification/tempest_identity_v3/index.rst
@@ -53,7 +53,7 @@ OVP test suite.
     - tempest.api.identity.admin.v3.test_credentials.CredentialsTestJSON.test_credentials_create_get_update_delete
 
 - `Create and Verify Domain <https://github.com/openstack/tempest/blob/12.2.0/tempest/api/identity/admin/v3/test_domains.py#L159>`_
-    - tempest.api.identity.admin.v3.test_domains.DefaultDomainTestJSON.test_default_domain_exists
+    - tempest.api.identity.v3.test_domains.DefaultDomainTestJSON.test_default_domain_exists
 
 - `Create, Update and Delete Domain <https://github.com/openstack/tempest/blob/12.2.0/tempest/api/identity/admin/v3/test_domains.py>`_
     - tempest.api.identity.admin.v3.test_domains.DomainsTestJSON.test_create_update_delete_domain
diff --git a/docs/testing/user/testspecification/tempest_vm_lifecycle/index.rst b/docs/testing/user/testspecification/tempest_vm_lifecycle/index.rst
index 7091929a..bbfd2884 100644
--- a/docs/testing/user/testspecification/tempest_vm_lifecycle/index.rst
+++ b/docs/testing/user/testspecification/tempest_vm_lifecycle/index.rst
@@ -575,7 +575,7 @@ Test Case 10 - Resize volume backed server
 Test case specification
 -----------------------
 
-tempest.scenario.test_server_advanced_ops.TestServerAdvancedOps.test_resize_volume_backed_server_confirm
+tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_resize_volume_backed_server_confirm
 
 Test preconditions
 ------------------
diff --git a/docs/testing/user/userguide/cli_reference.rst b/docs/testing/user/userguide/cli_reference.rst
index 010c7a50..532da0a5 100644
--- a/docs/testing/user/userguide/cli_reference.rst
+++ b/docs/testing/user/userguide/cli_reference.rst
@@ -170,7 +170,6 @@ Dovetail List Commands
        yardstick.ha.controller_restart
        functest.vnf.vims
        functest.vnf.vepc
-       functest.snaps.smoke
 
 Dovetail Show Commands
 ----------------------
diff --git a/docs/testing/user/userguide/testing_guide.rst b/docs/testing/user/userguide/testing_guide.rst
index 5636c982..d28969d3 100644
--- a/docs/testing/user/userguide/testing_guide.rst
+++ b/docs/testing/user/userguide/testing_guide.rst
@@ -724,10 +724,6 @@ Host by default within the directory specified below.
 
      * Its log is stored in ``stress_logs/bottlenecks.stress.XXX.log``.
 
-   * Snaps test cases
-
-     * Its log is stored in ``snaps_logs/functest.snaps.smoke.log``.
-
    * VNF test cases
 
      * Its log is stored in ``vnf_logs/functest.vnf.XXX.log``.
diff --git a/etc/compliance/healthcheck.yml b/etc/compliance/healthcheck.yml
index aabccf56..ad461cad 100644
--- a/etc/compliance/healthcheck.yml
+++ b/etc/compliance/healthcheck.yml
@@ -14,6 +14,4 @@ healthcheck:
   name: healthcheck
   testcases_list:
     optional:
-      - functest.healthcheck.snaps_health_check
       - functest.healthcheck.connection_check
-      - functest.healthcheck.api_check
diff --git a/etc/compliance/ovp.2019.0x.yaml b/etc/compliance/ovp.2019.0x.yaml
index 5b9f493e..c0d9fe29 100644
--- a/etc/compliance/ovp.2019.0x.yaml
+++ b/etc/compliance/ovp.2019.0x.yaml
@@ -47,4 +47,3 @@ ovp.2019.0x:
       - yardstick.ha.controller_restart
       - functest.vnf.vims
       - functest.vnf.vepc
-      - functest.snaps.smoke
diff --git a/etc/testcase/functest.healthcheck.api_check.yml b/etc/testcase/functest.healthcheck.api_check.yml
deleted file mode 100644
index 377eecde..00000000
--- a/etc/testcase/functest.healthcheck.api_check.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-##############################################################################
-# Copyright (c) 2019 opnfv.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
----
-functest.healthcheck.api_check:
-  name: functest.healthcheck.api_check
-  objective: verify OpenStack API with simple queries
-  validate:
-    type: functest
-    testcase: api_check
-    image_name: opnfv/functest-healthcheck
-  report:
-    source_archive_files:
-      - functest.log
-    dest_archive_files:
-      - healthcheck_logs/functest.healthcheck.api_check.log
-    check_results_files:
-      - 'functest_results.txt'
-    sub_testcase_list:
diff --git a/etc/testcase/functest.healthcheck.snaps_health_check.yml b/etc/testcase/functest.healthcheck.snaps_health_check.yml
deleted file mode 100644
index 13dcc253..00000000
--- a/etc/testcase/functest.healthcheck.snaps_health_check.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-##############################################################################
-# Copyright (c) 2019 opnfv.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
----
-functest.healthcheck.snaps_health_check:
-  name: functest.healthcheck.snaps_health_check
-  objective: basic VM instance creation with port and IPv4 address through DHCP
-  validate:
-    type: functest
-    testcase: snaps_health_check
-    image_name: opnfv/functest-healthcheck
-  report:
-    source_archive_files:
-      - functest.log
-    dest_archive_files:
-      - healthcheck_logs/functest.healthcheck.snaps_health_check.log
-    check_results_files:
-      - 'functest_results.txt'
-    sub_testcase_list:
diff --git a/etc/testcase/functest.rally.authenticate.yml b/etc/testcase/functest.rally.authenticate.yml
index b5979f3c..f488ea04 100644
--- a/etc/testcase/functest.rally.authenticate.yml
+++ b/etc/testcase/functest.rally.authenticate.yml
@@ -14,7 +14,7 @@ functest.rally.authenticate:
   validate:
     type: functest
     testcase: rally_full
-    image_name: opnfv/functest-components
+    image_name: opnfv/functest-benchmarking
     pre_condition:
       - 'cp /home/opnfv/userconfig/rally_authenticate_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
   report:
diff --git a/etc/testcase/functest.rally.cinder.yml b/etc/testcase/functest.rally.cinder.yml
index 137c2f8f..80365071 100644
--- a/etc/testcase/functest.rally.cinder.yml
+++ b/etc/testcase/functest.rally.cinder.yml
@@ -14,7 +14,7 @@ functest.rally.cinder:
   validate:
     type: functest
     testcase: rally_full
-    image_name: opnfv/functest-components
+    image_name: opnfv/functest-benchmarking
     pre_condition:
       - 'cp /home/opnfv/userconfig/rally_cinder_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
   report:
diff --git a/etc/testcase/functest.rally.glance.yaml b/etc/testcase/functest.rally.glance.yaml
index 8439d991..df075cfa 100644
--- a/etc/testcase/functest.rally.glance.yaml
+++ b/etc/testcase/functest.rally.glance.yaml
@@ -14,7 +14,7 @@ functest.rally.glance:
   validate:
     type: functest
     testcase: rally_full
-    image_name: opnfv/functest-components
+    image_name: opnfv/functest-benchmarking
     pre_condition:
       - 'cp /home/opnfv/userconfig/rally_glance_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
   report:
diff --git a/etc/testcase/functest.rally.gnocchi.yml b/etc/testcase/functest.rally.gnocchi.yml
index 5ddb605a..6e0063c6 100644
--- a/etc/testcase/functest.rally.gnocchi.yml
+++ b/etc/testcase/functest.rally.gnocchi.yml
@@ -14,7 +14,7 @@ functest.rally.gnocchi:
   validate:
     type: functest
     testcase: rally_full
-    image_name: opnfv/functest-components
+    image_name: opnfv/functest-benchmarking
     pre_condition:
       - 'cp /home/opnfv/userconfig/rally_gnocchi_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
   report:
diff --git a/etc/testcase/functest.rally.heat.yml b/etc/testcase/functest.rally.heat.yml
index 44e7ab16..75edc850 100644
--- a/etc/testcase/functest.rally.heat.yml
+++ b/etc/testcase/functest.rally.heat.yml
@@ -14,7 +14,7 @@ functest.rally.heat:
   validate:
     type: functest
     testcase: rally_full
-    image_name: opnfv/functest-components
+    image_name: opnfv/functest-benchmarking
     pre_condition:
       - 'cp /home/opnfv/userconfig/rally_heat_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
   report:
diff --git a/etc/testcase/functest.rally.keystone.yml b/etc/testcase/functest.rally.keystone.yml
index 5e334300..51256ac6 100644
--- a/etc/testcase/functest.rally.keystone.yml
+++ b/etc/testcase/functest.rally.keystone.yml
@@ -14,7 +14,7 @@ functest.rally.keystone:
   validate:
     type: functest
     testcase: rally_full
-    image_name: opnfv/functest-components
+    image_name: opnfv/functest-benchmarking
     pre_condition:
       - 'cp /home/opnfv/userconfig/rally_keystone_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
   report:
diff --git a/etc/testcase/functest.rally.neutron.yml b/etc/testcase/functest.rally.neutron.yml
index 9bce0b3e..e1236e30 100644
--- a/etc/testcase/functest.rally.neutron.yml
+++ b/etc/testcase/functest.rally.neutron.yml
@@ -14,7 +14,7 @@ functest.rally.neutron:
   validate:
     type: functest
     testcase: rally_full
-    image_name: opnfv/functest-components
+    image_name: opnfv/functest-benchmarking
     pre_condition:
       - 'cp /home/opnfv/userconfig/rally_neutron_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
   report:
diff --git a/etc/testcase/functest.rally.nova.yml b/etc/testcase/functest.rally.nova.yml
index a0c72f6d..df3d9904 100644
--- a/etc/testcase/functest.rally.nova.yml
+++ b/etc/testcase/functest.rally.nova.yml
@@ -14,7 +14,7 @@ functest.rally.nova:
   validate:
     type: functest
     testcase: rally_full
-    image_name: opnfv/functest-components
+    image_name: opnfv/functest-benchmarking
     pre_condition:
       - 'cp /home/opnfv/userconfig/rally_nova_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
   report:
diff --git a/etc/testcase/functest.rally.quotas.yml b/etc/testcase/functest.rally.quotas.yml
index dc88b385..fde32a37 100644
--- a/etc/testcase/functest.rally.quotas.yml
+++ b/etc/testcase/functest.rally.quotas.yml
@@ -14,7 +14,7 @@ functest.rally.quotas:
   validate:
     type: functest
     testcase: rally_full
-    image_name: opnfv/functest-components
+    image_name: opnfv/functest-benchmarking
     pre_condition:
       - 'cp /home/opnfv/userconfig/rally_quotas_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
   report:
diff --git a/etc/testcase/functest.security.patrole_vxlan_dependent.yml b/etc/testcase/functest.security.patrole_vxlan_dependent.yml
index c2e2bd5e..20ae3396 100644
--- a/etc/testcase/functest.security.patrole_vxlan_dependent.yml
+++ b/etc/testcase/functest.security.patrole_vxlan_dependent.yml
@@ -30,5 +30,5 @@ functest.security.patrole_vxlan_dependent:
     check_results_files:
       - 'functest_results.txt'
     sub_testcase_list:
-      - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_network_type[admin]
-      - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_segmentation_id[admin]
+      - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_network_type[id-3c42f7b8-b80c-44ef-8fa4-69ec4b1836bc]
+      - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_segmentation_id[id-b9decb7b-68ef-4504-b99b-41edbf7d2af5]
diff --git a/etc/testcase/functest.snaps.smoke.yml b/etc/testcase/functest.snaps.smoke.yml
deleted file mode 100644
index 7699ce3f..00000000
--- a/etc/testcase/functest.snaps.smoke.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-##############################################################################
-# Copyright (c) 2019 opnfv.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
----
-functest.snaps.smoke:
-  name: functest.snaps.smoke
-  objective: snaps smoke test cases
-  validate:
-    type: functest
-    testcase: snaps_smoke
-  report:
-    source_archive_files:
-      - functest.log
-    dest_archive_files:
-      - snaps_logs/functest.snaps.smoke.log
-    check_results_files:
-      - 'functest_results.txt'
-    sub_testcase_list:
diff --git a/etc/testcase/functest.tempest.identity_v3.yml b/etc/testcase/functest.tempest.identity_v3.yml
index 3dd498ca..ba40f8c2 100644
--- a/etc/testcase/functest.tempest.identity_v3.yml
+++ b/etc/testcase/functest.tempest.identity_v3.yml
@@ -31,7 +31,6 @@ functest.tempest.identity_v3:
       - 'functest_results.txt'
     sub_testcase_list:
       - tempest.api.identity.admin.v3.test_credentials.CredentialsTestJSON.test_credentials_create_get_update_delete[id-7cd59bf9-bda4-4c72-9467-d21cab278355,smoke]
-      - tempest.api.identity.admin.v3.test_domains.DefaultDomainTestJSON.test_default_domain_exists[id-17a5de24-e6a0-4e4a-a9ee-d85b6e5612b5,smoke]
       - tempest.api.identity.admin.v3.test_domains.DomainsTestJSON.test_create_update_delete_domain[id-f2f5b44a-82e8-4dad-8084-0661ea3b18cf,smoke]
       - tempest.api.identity.admin.v3.test_endpoints.EndPointsTestJSON.test_update_endpoint[id-37e8f15e-ee7c-4657-a1e7-f6b61e375eff,smoke]
       - tempest.api.identity.admin.v3.test_groups.GroupsV3TestJSON.test_group_users_add_list_delete[id-1598521a-2f36-4606-8df9-30772bd51339,smoke]
@@ -41,3 +40,4 @@ functest.tempest.identity_v3:
       - tempest.api.identity.admin.v3.test_services.ServicesTestJSON.test_create_update_get_service[id-5193aad5-bcb7-411d-85b0-b3b61b96ef06,smoke]
       - tempest.api.identity.admin.v3.test_trusts.TrustsV3TestJSON.test_get_trusts_all[id-4773ebd5-ecbf-4255-b8d8-b63e6f72b65d,smoke]
       - tempest.api.identity.v3.test_api_discovery.TestApiDiscovery.test_list_api_versions[id-721f480f-35b6-46c7-846e-047e6acea0dc,smoke]
+      - tempest.api.identity.v3.test_domains.DefaultDomainTestJSON.test_default_domain_exists[id-17a5de24-e6a0-4e4a-a9ee-d85b6e5612b5,smoke]
diff --git a/etc/testcase/functest.tempest.ipv6_scenario.yml b/etc/testcase/functest.tempest.ipv6_scenario.yml
index 8649eee7..5e660041 100644
--- a/etc/testcase/functest.tempest.ipv6_scenario.yml
+++ b/etc/testcase/functest.tempest.ipv6_scenario.yml
@@ -37,4 +37,4 @@ functest.tempest.ipv6_scenario:
       - tempest.scenario.test_network_v6.TestGettingAddress.test_slaac_from_os[compute,id-2c92df61-29f0-4eaa-bee3-7c65bef62a43,network,slow]
       - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_slaac_from_os[compute,id-b6399d76-4438-4658-bcf5-0d6c8584fde2,network,slow]
       - tempest.scenario.test_network_v6.TestGettingAddress.test_multi_prefix_slaac[compute,id-dec222b1-180c-4098-b8c5-cc1b8342d611,network,slow]
-      - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_multi_prefix_slaac[compute,id-9178ad42-10e4-47e9-8987-e02b170cc5cd,network]
+      - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_multi_prefix_slaac[compute,id-9178ad42-10e4-47e9-8987-e02b170cc5cd,network,slow]
diff --git a/etc/testcase/functest.tempest.vm_lifecycle.yml b/etc/testcase/functest.tempest.vm_lifecycle.yml
index 4c8b248e..edd32c62 100644
--- a/etc/testcase/functest.tempest.vm_lifecycle.yml
+++ b/etc/testcase/functest.tempest.vm_lifecycle.yml
@@ -33,12 +33,12 @@ functest.tempest.vm_lifecycle:
       - 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,slow]
       - tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_pause_unpause[compute,id-2b2642db-6568-4b35-b812-eceed3fa20ce,network,slow]
-      - 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_reboot[compute,id-7b6860c2-afa3-4846-9522-adeb38dfbe08,network,slow]
       - tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_rebuild[compute,id-88a529c2-1daa-4c85-9aec-d541ba3eb699,network,slow]
       - tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_resize[compute,id-719eb59d-2f42-4b66-b8b1-bb1254473967,network,slow]
       - tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_stop_start[compute,id-61f1aa9a-1573-410e-9054-afa557cab021,network,slow]
       - tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_suspend_resume[compute,id-5cdf9499-541d-4923-804e-b9a60620a7f0,network,slow]
-      - tempest.scenario.test_server_advanced_ops.TestServerAdvancedOps.test_resize_volume_backed_server_confirm[compute,id-e6c28180-7454-4b59-b188-0257af08a63b,slow,volume]
+      - tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_resize_volume_backed_server_confirm[id-e6c28180-7454-4b59-b188-0257af08a63b,volume]
       - tempest.scenario.test_server_advanced_ops.TestServerAdvancedOps.test_server_sequence_suspend_resume[compute,id-949da7d5-72c8-4808-8802-e3d70df98e2c,slow]
       - tempest.scenario.test_shelve_instance.TestShelveInstance.test_shelve_instance[compute,id-1164e700-0af0-4a4c-8792-35909a88743c,image,network,slow]
       - tempest.scenario.test_shelve_instance.TestShelveInstance.test_shelve_volume_backed_instance[compute,id-c1b6318c-b9da-490b-9c67-9339b627271f,image,network,slow,volume]
diff --git a/etc/testcase/functest.tempest.volume.yml b/etc/testcase/functest.tempest.volume.yml
index 73d48707..c9e85969 100644
--- a/etc/testcase/functest.tempest.volume.yml
+++ b/etc/testcase/functest.tempest.volume.yml
@@ -31,4 +31,4 @@ functest.tempest.volume:
       - 'functest_results.txt'
     sub_testcase_list:
       - tempest.api.volume.test_volumes_actions.VolumesActionsTest.test_attach_detach_volume_to_instance[compute,id-fff42874-7db5-4487-a8e1-ddda5fb5288d,smoke]
-      - tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern[compute,id-557cd2c2-4eb8-4dce-98be-f86765ff311b,image,volume]
+      - tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern[compute,id-557cd2c2-4eb8-4dce-98be-f86765ff311b,image,slow,volume]