50 files changed, 265 insertions, 267 deletions
diff --git a/dovetail/cli/commands/cli_testcase.py b/dovetail/cli/commands/cli_testcase.py
index 05154882..3ae76c22 100644
--- a/dovetail/cli/commands/cli_testcase.py
+++ b/dovetail/cli/commands/cli_testcase.py
@@ -60,9 +60,7 @@ class CliTestcase(object):
                 click.echo("No testsuite defined yet in dovetail!!!")
 
     def show_testcase(self, name):
-        tc_path = os.path.join(
-            constants.TESTCASE_PATH,
-            "%s.yml" % (name[9:] if name.startswith('dovetail.') else name))
+        tc_path = os.path.join(constants.TESTCASE_PATH, "{}.yml".format(name))
         if os.path.isfile(tc_path):
             with open(tc_path, 'r') as stream:
                 try:
diff --git a/etc/compliance/debug.yml b/etc/compliance/debug.yml
index 84aad837..e74cff25 100644
--- a/etc/compliance/debug.yml
+++ b/etc/compliance/debug.yml
@@ -7,4 +7,4 @@ debug:
   name: debug
   testcases_list:
     optional:
-      - dovetail.vping.userdata
+      - functest.vping.userdata
diff --git a/etc/compliance/healthcheck.yml b/etc/compliance/healthcheck.yml
index 1db46990..01b670d0 100644
--- a/etc/compliance/healthcheck.yml
+++ b/etc/compliance/healthcheck.yml
@@ -5,6 +5,6 @@ healthcheck:
   name: healthcheck
   testcases_list:
     optional:
-      - dovetail.healthcheck.snaps_health_check
-      - dovetail.healthcheck.connection_check
-      - dovetail.healthcheck.api_check
+      - functest.healthcheck.snaps_health_check
+      - functest.healthcheck.connection_check
+      - functest.healthcheck.api_check
diff --git a/etc/compliance/onap.1.0.0.yml b/etc/compliance/onap.1.0.0.yml
index 43492ab1..e9e805c4 100644
--- a/etc/compliance/onap.1.0.0.yml
+++ b/etc/compliance/onap.1.0.0.yml
@@ -3,4 +3,4 @@ onap.1.0.0:
   name: onap.1.0.0
   testcases_list:
     optional:
-      - dovetail.lifecycle.tc001
+      - onap.lifecycle.tc001
diff --git a/etc/compliance/ovp.next.yaml b/etc/compliance/ovp.next.yaml
index 7693b921..41dae024 100644
--- a/etc/compliance/ovp.next.yaml
+++ b/etc/compliance/ovp.next.yaml
@@ -3,42 +3,42 @@ ovp.next:
   name: ovp.next
   testcases_list:
     mandatory:
-      - dovetail.vping.userdata
-      - dovetail.vping.ssh
-      - dovetail.tempest.osinterop
-      - dovetail.tempest.compute
-      - dovetail.tempest.identity_v2
-      - dovetail.tempest.identity_v3
-      - dovetail.tempest.image
-      - dovetail.tempest.network_api
-      - dovetail.tempest.volume
-      - dovetail.tempest.neutron_trunk_ports
-      - dovetail.tempest.ipv6_api
-      - dovetail.security.patrole
-      - dovetail.ha.nova_api
-      - dovetail.ha.neutron_server
-      - dovetail.ha.keystone
-      - dovetail.ha.glance_api
-      - dovetail.ha.cinder_api
-      - dovetail.ha.cpu_load
-      - dovetail.ha.disk_load
-      - dovetail.ha.haproxy
-      - dovetail.ha.rabbitmq
-      - dovetail.ha.database
-      - dovetail.stress.ping
+      - functest.vping.userdata
+      - functest.vping.ssh
+      - functest.tempest.osinterop
+      - functest.tempest.compute
+      - functest.tempest.identity_v2
+      - functest.tempest.identity_v3
+      - functest.tempest.image
+      - functest.tempest.network_api
+      - functest.tempest.volume
+      - functest.tempest.neutron_trunk_ports
+      - functest.tempest.ipv6_api
+      - functest.security.patrole
+      - yardstick.ha.nova_api
+      - yardstick.ha.neutron_server
+      - yardstick.ha.keystone
+      - yardstick.ha.glance_api
+      - yardstick.ha.cinder_api
+      - yardstick.ha.cpu_load
+      - yardstick.ha.disk_load
+      - yardstick.ha.haproxy
+      - yardstick.ha.rabbitmq
+      - yardstick.ha.database
+      - bottlenecks.stress.ping
     optional:
-      - dovetail.tempest.ipv6_scenario
-      - dovetail.tempest.multi_node_scheduling
-      - dovetail.tempest.network_security
-      - dovetail.tempest.vm_lifecycle
-      - dovetail.tempest.network_scenario
-      - dovetail.tempest.bgpvpn
-      - dovetail.sdnvpn.subnet_connectivity
-      - dovetail.sdnvpn.tenant_separation
-      - dovetail.sdnvpn.router_association
-      - dovetail.sdnvpn.router_association_floating_ip
-      - dovetail.ha.neutron_l3_agent
-      - dovetail.ha.controller_restart
-      - dovetail.vnf.vims
-      - dovetail.vnf.vepc
-      - dovetail.snaps.smoke
+      - functest.tempest.ipv6_scenario
+      - functest.tempest.multi_node_scheduling
+      - functest.tempest.network_security
+      - functest.tempest.vm_lifecycle
+      - functest.tempest.network_scenario
+      - functest.tempest.bgpvpn
+      - functest.bgpvpn.subnet_connectivity
+      - functest.bgpvpn.tenant_separation
+      - functest.bgpvpn.router_association
+      - functest.bgpvpn.router_association_floating_ip
+      - yardstick.ha.neutron_l3_agent
+      - yardstick.ha.controller_restart
+      - functest.vnf.vims
+      - functest.vnf.vepc
+      - functest.snaps.smoke
diff --git a/etc/conf/dovetail_config.yml b/etc/conf/dovetail_config.yml
index 57efbbff..0e17c3d5 100644
--- a/etc/conf/dovetail_config.yml
+++ b/etc/conf/dovetail_config.yml
@@ -24,7 +24,7 @@ testarea_supported:
   - ha
   - healthcheck
   - onap
-  - sdnvpn
+  - bgpvpn
   - security
   - snaps
   - stress
diff --git a/etc/testcase/stress.ping.yml b/etc/testcase/bottlenecks.stress.ping.yml
index 4c8e2c58..63717047 100644
--- a/etc/testcase/stress.ping.yml
+++ b/etc/testcase/bottlenecks.stress.ping.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.stress.ping:
-  name: dovetail.stress.ping
+bottlenecks.stress.ping:
+  name: bottlenecks.stress.ping
   objective: > # This test case verifies the ability of the SUT setting up VM pairs
     # for different tenants and providing acceptable capacity after the amount of
     # VM pairs reaches certain quantity.
@@ -10,9 +10,9 @@ dovetail.stress.ping:
   report:
     source_archive_files:
       - bottlenecks.log
-      - dovetail.stress.ping.out
+      - bottlenecks.stress.ping.out
     dest_archive_files:
-      - stress_logs/dovetail.stress.ping.log
-      - stress_logs/dovetail.stress.ping.out
-    check_results_file: stress_logs/dovetail.stress.ping.out
+      - stress_logs/bottlenecks.stress.ping.log
+      - stress_logs/bottlenecks.stress.ping.out
+    check_results_file: stress_logs/bottlenecks.stress.ping.out
     sub_testcase_list:
diff --git a/etc/testcase/sdnvpn.router_association.yml b/etc/testcase/functest.bgpvpn.router_association.yml
index f20669cd..6b30315b 100644
--- a/etc/testcase/sdnvpn.router_association.yml
+++ b/etc/testcase/functest.bgpvpn.router_association.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.sdnvpn.router_association:
-  name: dovetail.sdnvpn.router_association
+functest.bgpvpn.router_association:
+  name: functest.bgpvpn.router_association
   objective: VPN provides connectivity between subnets using association of Neutron Router to VPNs
   validate:
     type: functest
@@ -13,6 +13,6 @@ dovetail.sdnvpn.router_association:
     source_archive_files:
       - functest.log
     dest_archive_files:
-      - sdnvpn_logs/dovetail.sdnvpn.router_association.log
+      - bgpvpn_logs/functest.bgpvpn.router_association.log
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
diff --git a/etc/testcase/sdnvpn.router_association_floating_ip.yml b/etc/testcase/functest.bgpvpn.router_association_floating_ip.yml
index 1c4fc59d..d6d0355c 100644
--- a/etc/testcase/sdnvpn.router_association_floating_ip.yml
+++ b/etc/testcase/functest.bgpvpn.router_association_floating_ip.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.sdnvpn.router_association_floating_ip:
-  name: dovetail.sdnvpn.router_association_floating_ip
+functest.bgpvpn.router_association_floating_ip:
+  name: functest.bgpvpn.router_association_floating_ip
   objective: associate Neutron Router with an attached subnet to a VPN and verify reachability of the Floating IP
   validate:
     type: functest
@@ -13,6 +13,6 @@ dovetail.sdnvpn.router_association_floating_ip:
     source_archive_files:
       - functest.log
     dest_archive_files:
-      - sdnvpn_logs/dovetail.sdnvpn.router_association_floating_ip.log
+      - bgpvpn_logs/functest.bgpvpn.router_association_floating_ip.log
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
diff --git a/etc/testcase/sdnvpn.subnet_connectivity.yml b/etc/testcase/functest.bgpvpn.subnet_connectivity.yml
index 05a098f7..296cafd0 100644
--- a/etc/testcase/sdnvpn.subnet_connectivity.yml
+++ b/etc/testcase/functest.bgpvpn.subnet_connectivity.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.sdnvpn.subnet_connectivity:
-  name: dovetail.sdnvpn.subnet_connectivity
+functest.bgpvpn.subnet_connectivity:
+  name: functest.bgpvpn.subnet_connectivity
   objective: Connectivity between Neutron subnets through association of Neutron Networks to VPNs
   validate:
     type: functest
@@ -13,6 +13,6 @@ dovetail.sdnvpn.subnet_connectivity:
     source_archive_files:
       - functest.log
     dest_archive_files:
-      - sdnvpn_logs/dovetail.sdnvpn.subnet_connectivity.log
+      - bgpvpn_logs/functest.bgpvpn.subnet_connectivity.log
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
diff --git a/etc/testcase/sdnvpn.tenant_separation.yml b/etc/testcase/functest.bgpvpn.tenant_separation.yml
index e99620ac..91a3b571 100644
--- a/etc/testcase/sdnvpn.tenant_separation.yml
+++ b/etc/testcase/functest.bgpvpn.tenant_separation.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.sdnvpn.tenant_separation:
-  name: dovetail.sdnvpn.tenant_separation
+functest.bgpvpn.tenant_separation:
+  name: functest.bgpvpn.tenant_separation
   objective: Separation of tenant networks through association to different VPNs
   validate:
     type: functest
@@ -13,6 +13,6 @@ dovetail.sdnvpn.tenant_separation:
     source_archive_files:
       - functest.log
     dest_archive_files:
-      - sdnvpn_logs/dovetail.sdnvpn.tenant_separation.log
+      - bgpvpn_logs/functest.bgpvpn.tenant_separation.log
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
diff --git a/etc/testcase/healthcheck.api_check.yml b/etc/testcase/functest.healthcheck.api_check.yml
index ed1a350b..8738d332 100644
--- a/etc/testcase/healthcheck.api_check.yml
+++ b/etc/testcase/functest.healthcheck.api_check.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.healthcheck.api_check:
-  name: dovetail.healthcheck.api_check
+functest.healthcheck.api_check:
+  name: functest.healthcheck.api_check
   objective: verify OpenStack API with simple queries
   validate:
     type: functest
@@ -9,6 +9,6 @@ dovetail.healthcheck.api_check:
     source_archive_files:
       - functest.log
     dest_archive_files:
-      - healthcheck_logs/dovetail.healthcheck.api_check.log
+      - healthcheck_logs/functest.healthcheck.api_check.log
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
diff --git a/etc/testcase/healthcheck.connection_check.yml b/etc/testcase/functest.healthcheck.connection_check.yml
index f6446497..f869c907 100644
--- a/etc/testcase/healthcheck.connection_check.yml
+++ b/etc/testcase/functest.healthcheck.connection_check.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.healthcheck.connection_check:
-  name: dovetail.healthcheck.connection_check
+functest.healthcheck.connection_check:
+  name: functest.healthcheck.connection_check
   objective: check OpenStack API services connectivity through SNAPS framework
   validate:
     type: functest
@@ -9,6 +9,6 @@ dovetail.healthcheck.connection_check:
     source_archive_files:
       - functest.log
     dest_archive_files:
-      - healthcheck_logs/dovetail.healthcheck.connection_check.log
+      - healthcheck_logs/functest.healthcheck.connection_check.log
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
diff --git a/etc/testcase/healthcheck.snaps_health_check.yml b/etc/testcase/functest.healthcheck.snaps_health_check.yml
index 5d183445..d179968e 100644
--- a/etc/testcase/healthcheck.snaps_health_check.yml
+++ b/etc/testcase/functest.healthcheck.snaps_health_check.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.healthcheck.snaps_health_check:
-  name: dovetail.healthcheck.snaps_health_check
+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
@@ -9,6 +9,6 @@ dovetail.healthcheck.snaps_health_check:
     source_archive_files:
       - functest.log
     dest_archive_files:
-      - healthcheck_logs/dovetail.healthcheck.snaps_health_check.log
+      - healthcheck_logs/functest.healthcheck.snaps_health_check.log
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
diff --git a/etc/testcase/security.patrole.yml b/etc/testcase/functest.security.patrole.yml
index 8230cbeb..e3418f76 100644
--- a/etc/testcase/security.patrole.yml
+++ b/etc/testcase/functest.security.patrole.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.security.patrole:
-  name: dovetail.security.patrole
+functest.security.patrole:
+  name: functest.security.patrole
   objective: Run Patrole to perform RBAC tests of the image and networking services
   validate:
     type: functest
@@ -14,9 +14,9 @@ dovetail.security.patrole:
       - patrole/tempest.log
       - patrole/tempest-report.html
     dest_archive_files:
-      - security_logs/dovetail.security.patrole.functest.log
-      - security_logs/dovetail.security.patrole.log
-      - security_logs/dovetail.security.patrole.html
+      - security_logs/functest.security.patrole.functest.log
+      - security_logs/functest.security.patrole.log
+      - security_logs/functest.security.patrole.html
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
       - patrole_tempest_plugin.tests.api.image.test_image_namespace_objects_rbac.ImageNamespacesObjectsRbacTest.test_create_metadef_object_in_namespace
diff --git a/etc/testcase/snaps.smoke.yml b/etc/testcase/functest.snaps.smoke.yml
index f012a7cd..fc0cd4e0 100644
--- a/etc/testcase/snaps.smoke.yml
+++ b/etc/testcase/functest.snaps.smoke.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.snaps.smoke:
-  name: dovetail.snaps.smoke
+functest.snaps.smoke:
+  name: functest.snaps.smoke
   objective: snaps smoke test cases
   validate:
     type: functest
@@ -9,6 +9,6 @@ dovetail.snaps.smoke:
     source_archive_files:
       - functest.log
     dest_archive_files:
-      - snaps_logs/dovetail.snaps.smoke.log
+      - snaps_logs/functest.snaps.smoke.log
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
diff --git a/etc/testcase/tempest.bgpvpn.yml b/etc/testcase/functest.tempest.bgpvpn.yml
index df64dc40..bcac7541 100644
--- a/etc/testcase/tempest.bgpvpn.yml
+++ b/etc/testcase/functest.tempest.bgpvpn.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.tempest.bgpvpn:
-  name: dovetail.tempest.bgpvpn
+functest.tempest.bgpvpn:
+  name: functest.tempest.bgpvpn
   objective: validate BGPVPN API CRUD operations by means of Tempest tests from networking-bgpvpn repository
   validate:
     type: functest
@@ -18,9 +18,9 @@ dovetail.tempest.bgpvpn:
       - tempest_custom/tempest.log
       - tempest_custom/tempest-report.html
     dest_archive_files:
-      - tempest_logs/dovetail.tempest.bgpvpn.functest.log
-      - tempest_logs/dovetail.tempest.bgpvpn.log
-      - tempest_logs/dovetail.tempest.bgpvpn.html
+      - tempest_logs/functest.tempest.bgpvpn.functest.log
+      - tempest_logs/functest.tempest.bgpvpn.log
+      - tempest_logs/functest.tempest.bgpvpn.html
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
       - networking_bgpvpn_tempest.tests.api.test_bgpvpn.BgpvpnTest.test_associate_disassociate_network
diff --git a/etc/testcase/tempest.compute.yml b/etc/testcase/functest.tempest.compute.yml
index 7e126bea..3cef7485 100644
--- a/etc/testcase/tempest.compute.yml
+++ b/etc/testcase/functest.tempest.compute.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.tempest.compute:
-  name: dovetail.tempest.compute
+functest.tempest.compute:
+  name: functest.tempest.compute
   objective: tempest smoke test cases about compute
   validate:
     type: functest
@@ -17,9 +17,9 @@ dovetail.tempest.compute:
       - tempest_custom/tempest.log
       - tempest_custom/tempest-report.html
     dest_archive_files:
-      - tempest_logs/dovetail.tempest.compute.functest.log
-      - tempest_logs/dovetail.tempest.compute.log
-      - tempest_logs/dovetail.tempest.compute.html
+      - tempest_logs/functest.tempest.compute.functest.log
+      - tempest_logs/functest.tempest.compute.log
+      - tempest_logs/functest.tempest.compute.html
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
       - tempest.api.compute.flavors.test_flavors.FlavorsV2TestJSON.test_get_flavor[id-1f12046b-753d-40d2-abb6-d8eb8b30cb2f,smoke]
diff --git a/etc/testcase/tempest.identity_v2.yml b/etc/testcase/functest.tempest.identity_v2.yml
index 3cd22aea..1da6b2a4 100644
--- a/etc/testcase/tempest.identity_v2.yml
+++ b/etc/testcase/functest.tempest.identity_v2.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.tempest.identity_v2:
-  name: dovetail.tempest.identity_v2
+functest.tempest.identity_v2:
+  name: functest.tempest.identity_v2
   objective: tempest smoke test cases about identity v2
   validate:
     type: functest
@@ -17,9 +17,9 @@ dovetail.tempest.identity_v2:
       - tempest_custom/tempest.log
       - tempest_custom/tempest-report.html
     dest_archive_files:
-      - tempest_logs/dovetail.tempest.identity_v2.functest.log
-      - tempest_logs/dovetail.tempest.identity_v2.log
-      - tempest_logs/dovetail.tempest.identity_v2.html
+      - tempest_logs/functest.tempest.identity_v2.functest.log
+      - tempest_logs/functest.tempest.identity_v2.log
+      - tempest_logs/functest.tempest.identity_v2.html
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
       - tempest.api.identity.admin.v2.test_services.ServicesTestJSON.test_list_services[id-34ea6489-012d-4a86-9038-1287cadd5eca,smoke]
diff --git a/etc/testcase/tempest.identity_v3.yml b/etc/testcase/functest.tempest.identity_v3.yml
index bc55f5ab..ed9a8ca9 100644
--- a/etc/testcase/tempest.identity_v3.yml
+++ b/etc/testcase/functest.tempest.identity_v3.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.tempest.identity_v3:
-  name: dovetail.tempest.identity_v3
+functest.tempest.identity_v3:
+  name: functest.tempest.identity_v3
   objective: tempest smoke test cases about identity v3
   validate:
     type: functest
@@ -17,9 +17,9 @@ dovetail.tempest.identity_v3:
       - tempest_custom/tempest.log
       - tempest_custom/tempest-report.html
     dest_archive_files:
-      - tempest_logs/dovetail.tempest.identity_v3.functest.log
-      - tempest_logs/dovetail.tempest.identity_v3.log
-      - tempest_logs/dovetail.tempest.identity_v3.html
+      - tempest_logs/functest.tempest.identity_v3.functest.log
+      - tempest_logs/functest.tempest.identity_v3.log
+      - tempest_logs/functest.tempest.identity_v3.html
     check_results_file: '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]
diff --git a/etc/testcase/tempest.image.yml b/etc/testcase/functest.tempest.image.yml
index 917aedfc..547dbcf7 100644
--- a/etc/testcase/tempest.image.yml
+++ b/etc/testcase/functest.tempest.image.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.tempest.image:
-  name: dovetail.tempest.image
+functest.tempest.image:
+  name: functest.tempest.image
   objective: tempest smoke test cases about image
   validate:
     type: functest
@@ -17,9 +17,9 @@ dovetail.tempest.image:
       - tempest_custom/tempest.log
       - tempest_custom/tempest-report.html
     dest_archive_files:
-      - tempest_logs/dovetail.tempest.image.functest.log
-      - tempest_logs/dovetail.tempest.image.log
-      - tempest_logs/dovetail.tempest.image.html
+      - tempest_logs/functest.tempest.image.functest.log
+      - tempest_logs/functest.tempest.image.log
+      - tempest_logs/functest.tempest.image.html
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
       - tempest.api.image.v2.test_images.BasicOperationsImagesTest.test_register_upload_get_image_file[id-139b765e-7f3d-4b3d-8b37-3ca3876ee318,smoke]
diff --git a/etc/testcase/tempest.ipv6_api.yml b/etc/testcase/functest.tempest.ipv6_api.yml
index 5423f082..47aade6a 100644
--- a/etc/testcase/tempest.ipv6_api.yml
+++ b/etc/testcase/functest.tempest.ipv6_api.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.tempest.ipv6_api:
-  name: dovetail.tempest.ipv6_api
+functest.tempest.ipv6_api:
+  name: functest.tempest.ipv6_api
   objective: IPv6 API tempest tests
   validate:
     type: functest
@@ -17,9 +17,9 @@ dovetail.tempest.ipv6_api:
       - tempest_custom/tempest.log
       - tempest_custom/tempest-report.html
     dest_archive_files:
-      - tempest_logs/dovetail.tempest.ipv6_api.functest.log
-      - tempest_logs/dovetail.tempest.ipv6_api.log
-      - tempest_logs/dovetail.tempest.ipv6_api.html
+      - tempest_logs/functest.tempest.ipv6_api.functest.log
+      - tempest_logs/functest.tempest.ipv6_api.log
+      - tempest_logs/functest.tempest.ipv6_api.html
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
       - tempest.api.network.test_networks.BulkNetworkOpsIpV6Test.test_bulk_create_delete_network[id-d4f9024d-1e28-4fc1-a6b1-25dbc6fa11e2,smoke]
diff --git a/etc/testcase/tempest.ipv6_scenario.yml b/etc/testcase/functest.tempest.ipv6_scenario.yml
index f35d5236..4b0758bb 100644
--- a/etc/testcase/tempest.ipv6_scenario.yml
+++ b/etc/testcase/functest.tempest.ipv6_scenario.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.tempest.ipv6_scenario:
-  name: dovetail.tempest.ipv6_scenario
+functest.tempest.ipv6_scenario:
+  name: functest.tempest.ipv6_scenario
   objective: IPv6 tempest scenario tests
   validate:
     type: functest
@@ -17,9 +17,9 @@ dovetail.tempest.ipv6_scenario:
       - tempest_custom/tempest.log
       - tempest_custom/tempest-report.html
     dest_archive_files:
-      - tempest_logs/dovetail.tempest.ipv6_scenario.functest.log
-      - tempest_logs/dovetail.tempest.ipv6_scenario.log
-      - tempest_logs/dovetail.tempest.ipv6_scenario.html
+      - tempest_logs/functest.tempest.ipv6_scenario.functest.log
+      - tempest_logs/functest.tempest.ipv6_scenario.log
+      - tempest_logs/functest.tempest.ipv6_scenario.html
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
       - tempest.scenario.test_network_v6.TestGettingAddress.test_dhcp6_stateless_from_os[compute,id-d7e1f858-187c-45a6-89c9-bdafde619a9f,network,slow]
diff --git a/etc/testcase/tempest.multi_node_scheduling.yml b/etc/testcase/functest.tempest.multi_node_scheduling.yml
index 99224ef5..ae20074f 100644
--- a/etc/testcase/tempest.multi_node_scheduling.yml
+++ b/etc/testcase/functest.tempest.multi_node_scheduling.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.tempest.multi_node_scheduling:
-  name: dovetail.tempest.multi_node_scheduling
+functest.tempest.multi_node_scheduling:
+  name: functest.tempest.multi_node_scheduling
   objective: simple virtual machine resource scheduling on multiple nodes
   validate:
     type: functest
@@ -17,9 +17,9 @@ dovetail.tempest.multi_node_scheduling:
       - tempest_custom/tempest.log
       - tempest_custom/tempest-report.html
     dest_archive_files:
-      - tempest_logs/dovetail.tempest.multi_node_scheduling.functest.log
-      - tempest_logs/dovetail.tempest.multi_node_scheduling.log
-      - tempest_logs/dovetail.tempest.multi_node_scheduling.html
+      - tempest_logs/functest.tempest.multi_node_scheduling.functest.log
+      - tempest_logs/functest.tempest.multi_node_scheduling.log
+      - tempest_logs/functest.tempest.multi_node_scheduling.html
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
       - tempest.scenario.test_server_multinode.TestServerMultinode.test_schedule_to_all_nodes[compute,id-9cecbe35-b9d4-48da-a37e-7ce70aa43d30,network,smoke]
diff --git a/etc/testcase/tempest.network_api.yml b/etc/testcase/functest.tempest.network_api.yml
index d28a0cbe..bac7c663 100644
--- a/etc/testcase/tempest.network_api.yml
+++ b/etc/testcase/functest.tempest.network_api.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.tempest.network_api:
-  name: dovetail.tempest.network_api
+functest.tempest.network_api:
+  name: functest.tempest.network_api
   objective: tempest smoke API test cases covering networking capabilities
   validate:
     type: functest
@@ -17,9 +17,9 @@ dovetail.tempest.network_api:
       - tempest_custom/tempest.log
       - tempest_custom/tempest-report.html
     dest_archive_files:
-      - tempest_logs/dovetail.tempest.network_api.functest.log
-      - tempest_logs/dovetail.tempest.network_api.log
-      - tempest_logs/dovetail.tempest.network_api.html
+      - tempest_logs/functest.tempest.network_api.functest.log
+      - tempest_logs/functest.tempest.network_api.log
+      - tempest_logs/functest.tempest.network_api.html
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
       - tempest.api.network.test_extensions.ExtensionsTestJSON.test_list_show_extensions[id-ef28c7e6-e646-4979-9d67-deb207bc5564,smoke]
diff --git a/etc/testcase/tempest.network_scenario.yml b/etc/testcase/functest.tempest.network_scenario.yml
index 5e1a9609..f048c1b4 100644
--- a/etc/testcase/tempest.network_scenario.yml
+++ b/etc/testcase/functest.tempest.network_scenario.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.tempest.network_scenario:
-  name: dovetail.tempest.network_scenario
+functest.tempest.network_scenario:
+  name: functest.tempest.network_scenario
   objective: tempest smoke scenario test cases covering networking capabilities
   validate:
     type: functest
@@ -17,9 +17,9 @@ dovetail.tempest.network_scenario:
       - tempest_custom/tempest.log
       - tempest_custom/tempest-report.html
     dest_archive_files:
-      - tempest_logs/dovetail.tempest.network_scenario.functest.log
-      - tempest_logs/dovetail.tempest.network_scenario.log
-      - tempest_logs/dovetail.tempest.network_scenario.html
+      - tempest_logs/functest.tempest.network_scenario.functest.log
+      - tempest_logs/functest.tempest.network_scenario.log
+      - tempest_logs/functest.tempest.network_scenario.html
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
       - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_hotplug_nic[compute,id-c5adff73-e961-41f1-b4a9-343614f18cfa,network]
diff --git a/etc/testcase/tempest.network_security.yml b/etc/testcase/functest.tempest.network_security.yml
index dd9e3e7a..b8eaa25a 100644
--- a/etc/testcase/tempest.network_security.yml
+++ b/etc/testcase/functest.tempest.network_security.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.tempest.network_security:
-  name: dovetail.tempest.network_security
+functest.tempest.network_security:
+  name: functest.tempest.network_security
   objective: filtering packets based on security rules and port security in data path
   validate:
     type: functest
@@ -17,9 +17,9 @@ dovetail.tempest.network_security:
       - tempest_custom/tempest.log
       - tempest_custom/tempest-report.html
     dest_archive_files:
-      - tempest_logs/dovetail.tempest.network_security.functest.log
-      - tempest_logs/dovetail.tempest.network_security.log
-      - tempest_logs/dovetail.tempest.network_security.html
+      - tempest_logs/functest.tempest.network_security.functest.log
+      - tempest_logs/functest.tempest.network_security.log
+      - tempest_logs/functest.tempest.network_security.html
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
       - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_port_security_macspoofing_port[compute,id-7c0bb1a2-d053-49a4-98f9-ca1a1d849f63,network,slow]
diff --git a/etc/testcase/tempest.osinterop.yml b/etc/testcase/functest.tempest.osinterop.yml
index fe50024c..56438af6 100644
--- a/etc/testcase/tempest.osinterop.yml
+++ b/etc/testcase/functest.tempest.osinterop.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.tempest.osinterop:
-  name: dovetail.tempest.osinterop
+functest.tempest.osinterop:
+  name: functest.tempest.osinterop
   objective: > # Set of OpenStack interoperability test cases not flagged and required. It only contains OpenStack core (no object storage)
     # The approved guidelines (2016.08) are valid for Kilo, Liberty, Mitaka and Newton releases of OpenStack
     # The list can be generated using the Rest API from RefStack project:
@@ -17,9 +17,9 @@ dovetail.tempest.osinterop:
       - refstack_defcore/tempest.log
       - refstack_defcore/tempest-report.html
     dest_archive_files:
-      - tempest_logs/dovetail.tempest.osinterop.functest.log
-      - tempest_logs/dovetail.tempest.osinterop.log
-      - tempest_logs/dovetail.tempest.osinterop.html
+      - tempest_logs/functest.tempest.osinterop.functest.log
+      - tempest_logs/functest.tempest.osinterop.log
+      - tempest_logs/functest.tempest.osinterop.html
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
       - tempest.api.network.test_security_groups.SecGroupTest.test_create_security_group_rule_with_icmp_type_code[id-c9463db8-b44d-4f52-b6c0-8dbda99f26ce]
diff --git a/etc/testcase/tempest.trunk-ports.yml b/etc/testcase/functest.tempest.trunk-ports.yml
index 344fb588..e19f879f 100644
--- a/etc/testcase/tempest.trunk-ports.yml
+++ b/etc/testcase/functest.tempest.trunk-ports.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.tempest.neutron_trunk_ports:
-  name: dovetail.tempest.neutron_trunk_ports
+functest.tempest.neutron_trunk_ports:
+  name: functest.tempest.neutron_trunk_ports
   objective: Run Neutron trunk port Tempest tests
   validate:
     type: functest
@@ -14,9 +14,9 @@ dovetail.tempest.neutron_trunk_ports:
       - neutron_trunk/tempest.log
       - neutron_trunk/tempest-report.html
     dest_archive_files:
-      - tempest_logs/dovetail.tempest.neutron_trunk_ports.functest.log
-      - tempest_logs/dovetail.tempest.neutron_trunk_ports.log
-      - tempest_logs/dovetail.tempest.neutron_trunk_ports.html
+      - tempest_logs/functest.tempest.neutron_trunk_ports.functest.log
+      - tempest_logs/functest.tempest.neutron_trunk_ports.log
+      - tempest_logs/functest.tempest.neutron_trunk_ports.html
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
       - neutron.tests.tempest.api.test_trunk.TrunkTestJSON.test_add_subport
diff --git a/etc/testcase/tempest.vm_lifecycle.yml b/etc/testcase/functest.tempest.vm_lifecycle.yml
index d86f8282..c05a1d3c 100644
--- a/etc/testcase/tempest.vm_lifecycle.yml
+++ b/etc/testcase/functest.tempest.vm_lifecycle.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.tempest.vm_lifecycle:
-  name: dovetail.tempest.vm_lifecycle
+functest.tempest.vm_lifecycle:
+  name: functest.tempest.vm_lifecycle
   objective: correct behavior after common virtual machine life cycles events
   validate:
     type: functest
@@ -17,9 +17,9 @@ dovetail.tempest.vm_lifecycle:
       - tempest_custom/tempest.log
       - tempest_custom/tempest-report.html
     dest_archive_files:
-      - tempest_logs/dovetail.tempest.vm_lifecycle.functest.log
-      - tempest_logs/dovetail.tempest.vm_lifecycle.log
-      - tempest_logs/dovetail.tempest.vm_lifecycle.html
+      - tempest_logs/functest.tempest.vm_lifecycle.functest.log
+      - tempest_logs/functest.tempest.vm_lifecycle.log
+      - tempest_logs/functest.tempest.vm_lifecycle.html
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
       - tempest.scenario.test_minimum_basic.TestMinimumBasicScenario.test_minimum_basic_scenario[compute,id-bdbb5441-9204-419d-a225-b4fdbfb1a1a8,image,network,volume]
diff --git a/etc/testcase/tempest.volume.yml b/etc/testcase/functest.tempest.volume.yml
index 9b925c18..293470bf 100644
--- a/etc/testcase/tempest.volume.yml
+++ b/etc/testcase/functest.tempest.volume.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.tempest.volume:
-  name: dovetail.tempest.volume
+functest.tempest.volume:
+  name: functest.tempest.volume
   objective: tempest smoke test cases about volume
   validate:
     type: functest
@@ -17,9 +17,9 @@ dovetail.tempest.volume:
       - tempest_custom/tempest.log
       - tempest_custom/tempest-report.html
     dest_archive_files:
-      - tempest_logs/dovetail.tempest.volume.functest.log
-      - tempest_logs/dovetail.tempest.volume.log
-      - tempest_logs/dovetail.tempest.volume.html
+      - tempest_logs/functest.tempest.volume.functest.log
+      - tempest_logs/functest.tempest.volume.log
+      - tempest_logs/functest.tempest.volume.html
     check_results_file: '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]
diff --git a/etc/testcase/vnf.vepc.yml b/etc/testcase/functest.vnf.vepc.yml
index fec985fe..7cf09f6e 100644
--- a/etc/testcase/vnf.vepc.yml
+++ b/etc/testcase/functest.vnf.vepc.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.vnf.vepc:
-  name: dovetail.vnf.vepc
+functest.vnf.vepc:
+  name: functest.vnf.vepc
   objective: Deploy a vEPC using Juju and perform EPC-specific test cases (e.g. attaching a UE to the EPC).
   validate:
     type: functest
@@ -10,6 +10,6 @@ dovetail.vnf.vepc:
     source_archive_files:
       - functest.log
     dest_archive_files:
-      - vnf_logs/dovetail.vnf.vepc.log
+      - vnf_logs/functest.vnf.vepc.log
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
diff --git a/etc/testcase/vnf.vims.yml b/etc/testcase/functest.vnf.vims.yml
index 8dc7ce4a..3e95e9d7 100644
--- a/etc/testcase/vnf.vims.yml
+++ b/etc/testcase/functest.vnf.vims.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.vnf.vims:
-  name: dovetail.vnf.vims
+functest.vnf.vims:
+  name: functest.vnf.vims
   objective: testing for Clearwater IMS deployment using Cloudify orchestrator
   validate:
     type: functest
@@ -10,6 +10,6 @@ dovetail.vnf.vims:
     source_archive_files:
       - functest.log
     dest_archive_files:
-      - vnf_logs/dovetail.vnf.vims.log
+      - vnf_logs/functest.vnf.vims.log
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
diff --git a/etc/testcase/vping.ssh.yml b/etc/testcase/functest.vping.ssh.yml
index a2a96034..913aa2e1 100644
--- a/etc/testcase/vping.ssh.yml
+++ b/etc/testcase/functest.vping.ssh.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.vping.ssh:
-  name: dovetail.vping.ssh
+functest.vping.ssh:
+  name: functest.vping.ssh
   objective: testing for vping using ssh
   validate:
     type: functest
@@ -9,6 +9,6 @@ dovetail.vping.ssh:
     source_archive_files:
       - functest.log
     dest_archive_files:
-      - vping_logs/dovetail.vping.ssh.log
+      - vping_logs/functest.vping.ssh.log
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
diff --git a/etc/testcase/vping.userdata.yml b/etc/testcase/functest.vping.userdata.yml
index 0bf1f9a0..5ef9e880 100644
--- a/etc/testcase/vping.userdata.yml
+++ b/etc/testcase/functest.vping.userdata.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.vping.userdata:
-  name: dovetail.vping.userdata
+functest.vping.userdata:
+  name: functest.vping.userdata
   objective: testing for vping using userdata
   validate:
     type: functest
@@ -9,6 +9,6 @@ dovetail.vping.userdata:
     source_archive_files:
       - functest.log
     dest_archive_files:
-      - vping_logs/dovetail.vping.userdata.log
+      - vping_logs/functest.vping.userdata.log
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
diff --git a/etc/testcase/ha.controller_restart.yml b/etc/testcase/ha.controller_restart.yml
deleted file mode 100644
index d64b06b9..00000000
--- a/etc/testcase/ha.controller_restart.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ha.controller_restart:
-  name: dovetail.ha.controller_restart
-  objective: OpenStack Controll Node abnormally shutdown.
-  validate:
-    type: yardstick
-    testcase: opnfv_yardstick_tc025
-  report:
-    source_archive_files:
-      - yardstick.log
-      - dovetail.ha.controller_restart.out
-    dest_archive_files:
-      - ha_logs/dovetail.ha.controller_restart.log
-      - ha_logs/dovetail.ha.controller_restart.out
-    check_results_file: ha_logs/dovetail.ha.controller_restart.out
-    sub_testcase_list:
diff --git a/etc/testcase/onap.onap.vnf_lifecycle.yml b/etc/testcase/onap.onap.vnf_lifecycle.yml
new file mode 100644
index 00000000..9bb928ce
--- /dev/null
+++ b/etc/testcase/onap.onap.vnf_lifecycle.yml
@@ -0,0 +1,16 @@
+---
+onap.onap.vnf_lifecycle:
+  name: onap.onap.vnf_lifecycle
+  objective: vnf lifecycle tests
+  validate:
+    type: vnftest
+    testcase: onap_vnftest_tc001
+  report:
+    source_archive_files:
+      - vnftest.log
+      - onap.onap.vnf_lifecycle.out
+    dest_archive_files:
+      - onap_logs/onap.onap.vnf_lifecycle.log
+      - onap_logs/onap.onap.vnf_lifecycle.out
+    check_results_file: onap_logs/onap.onap.vnf_lifecycle.out
+    sub_testcase_list:
diff --git a/etc/testcase/onap.vnf_lifecycle.yml b/etc/testcase/onap.vnf_lifecycle.yml
deleted file mode 100644
index cc1789ce..00000000
--- a/etc/testcase/onap.vnf_lifecycle.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.onap.vnf_lifecycle:
-  name: dovetail.onap.vnf_lifecycle
-  objective: vnf lifecycle tests
-  validate:
-    type: vnftest
-    testcase: onap_vnftest_tc001
-  report:
-    source_archive_files:
-      - vnftest.log
-      - dovetail.onap.vnf_lifecycle.out
-    dest_archive_files:
-      - onap_logs/dovetail.onap.vnf_lifecycle.log
-      - onap_logs/dovetail.onap.vnf_lifecycle.out
-    check_results_file: onap_logs/dovetail.onap.vnf_lifecycle.out
-    sub_testcase_list:
diff --git a/etc/testcase/ha.cinder_api.yml b/etc/testcase/yardstick.ha.cinder_api.yml
index 207e91f2..ca99e10d 100644
--- a/etc/testcase/ha.cinder_api.yml
+++ b/etc/testcase/yardstick.ha.cinder_api.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.ha.cinder_api:
-  name: dovetail.ha.cinder_api
+yardstick.ha.cinder_api:
+  name: yardstick.ha.cinder_api
   objective: >
     This test case will verify the high availability of the
     volume service provided by OpenStack (cinder-api) on control node.
@@ -10,9 +10,9 @@ dovetail.ha.cinder_api:
   report:
     source_archive_files:
       - yardstick.log
-      - dovetail.ha.cinder_api.out
+      - yardstick.ha.cinder_api.out
     dest_archive_files:
-      - ha_logs/dovetail.ha.cinder_api.log
-      - ha_logs/dovetail.ha.cinder_api.out
-    check_results_file: ha_logs/dovetail.ha.cinder_api.out
+      - ha_logs/yardstick.ha.cinder_api.log
+      - ha_logs/yardstick.ha.cinder_api.out
+    check_results_file: ha_logs/yardstick.ha.cinder_api.out
     sub_testcase_list:
diff --git a/etc/testcase/yardstick.ha.controller_restart.yml b/etc/testcase/yardstick.ha.controller_restart.yml
new file mode 100644
index 00000000..fba59f8d
--- /dev/null
+++ b/etc/testcase/yardstick.ha.controller_restart.yml
@@ -0,0 +1,16 @@
+---
+yardstick.ha.controller_restart:
+  name: yardstick.ha.controller_restart
+  objective: OpenStack Controll Node abnormally shutdown.
+  validate:
+    type: yardstick
+    testcase: opnfv_yardstick_tc025
+  report:
+    source_archive_files:
+      - yardstick.log
+      - yardstick.ha.controller_restart.out
+    dest_archive_files:
+      - ha_logs/yardstick.ha.controller_restart.log
+      - ha_logs/yardstick.ha.controller_restart.out
+    check_results_file: ha_logs/yardstick.ha.controller_restart.out
+    sub_testcase_list:
diff --git a/etc/testcase/ha.cpu_load.yml b/etc/testcase/yardstick.ha.cpu_load.yml
index c8b57683..f991df89 100644
--- a/etc/testcase/ha.cpu_load.yml
+++ b/etc/testcase/yardstick.ha.cpu_load.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.ha.cpu_load:
-  name: dovetail.ha.cpu_load
+yardstick.ha.cpu_load:
+  name: yardstick.ha.cpu_load
   objective: >
     This test case will verify the high availability of control node.
     When the CPU usage of a specified controller node is stressed to 100%,
@@ -13,9 +13,9 @@ dovetail.ha.cpu_load:
   report:
     source_archive_files:
       - yardstick.log
-      - dovetail.ha.cpu_load.out
+      - yardstick.ha.cpu_load.out
     dest_archive_files:
-      - ha_logs/dovetail.ha.cpu_load.log
-      - ha_logs/dovetail.ha.cpu_load.out
-    check_results_file: ha_logs/dovetail.ha.cpu_load.out
+      - ha_logs/yardstick.ha.cpu_load.log
+      - ha_logs/yardstick.ha.cpu_load.out
+    check_results_file: ha_logs/yardstick.ha.cpu_load.out
     sub_testcase_list:
diff --git a/etc/testcase/ha.database.yml b/etc/testcase/yardstick.ha.database.yml
index 427ccb11..a653f397 100644
--- a/etc/testcase/ha.database.yml
+++ b/etc/testcase/yardstick.ha.database.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.ha.database:
-  name: dovetail.ha.database
+yardstick.ha.database:
+  name: yardstick.ha.database
   objective: >
     This test case verifies the high-availability of the OpenStack
     controller database instance.
@@ -10,9 +10,9 @@ dovetail.ha.database:
   report:
     source_archive_files:
       - yardstick.log
-      - dovetail.ha.database.out
+      - yardstick.ha.database.out
     dest_archive_files:
-      - ha_logs/dovetail.ha.database.log
-      - ha_logs/dovetail.ha.database.out
-    check_results_file: ha_logs/dovetail.ha.database.out
+      - ha_logs/yardstick.ha.database.log
+      - ha_logs/yardstick.ha.database.out
+    check_results_file: ha_logs/yardstick.ha.database.out
     sub_testcase_list:
diff --git a/etc/testcase/ha.disk_load.yml b/etc/testcase/yardstick.ha.disk_load.yml
index 628cb94d..6311a7bd 100644
--- a/etc/testcase/ha.disk_load.yml
+++ b/etc/testcase/yardstick.ha.disk_load.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.ha.disk_load:
-  name: dovetail.ha.disk_load
+yardstick.ha.disk_load:
+  name: yardstick.ha.disk_load
   objective: >
     This test case will verify the high availability of control node.
     When the disk I/O of a specified disk is blocked, which breaks down the Openstack
@@ -12,9 +12,9 @@ dovetail.ha.disk_load:
   report:
     source_archive_files:
       - yardstick.log
-      - dovetail.ha.disk_load.out
+      - yardstick.ha.disk_load.out
     dest_archive_files:
-      - ha_logs/dovetail.ha.disk_load.log
-      - ha_logs/dovetail.ha.disk_load.out
-    check_results_file: ha_logs/dovetail.ha.disk_load.out
+      - ha_logs/yardstick.ha.disk_load.log
+      - ha_logs/yardstick.ha.disk_load.out
+    check_results_file: ha_logs/yardstick.ha.disk_load.out
     sub_testcase_list:
diff --git a/etc/testcase/ha.glance_api.yml b/etc/testcase/yardstick.ha.glance_api.yml
index 6a4a8fc9..ee900cf1 100644
--- a/etc/testcase/ha.glance_api.yml
+++ b/etc/testcase/yardstick.ha.glance_api.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.ha.glance_api:
-  name: dovetail.ha.glance_api
+yardstick.ha.glance_api:
+  name: yardstick.ha.glance_api
   objective: >
     This test case will verify the high availability of the
     image service provided by OpenStack (glance-api) on control node.
@@ -10,9 +10,9 @@ dovetail.ha.glance_api:
   report:
     source_archive_files:
       - yardstick.log
-      - dovetail.ha.glance_api.out
+      - yardstick.ha.glance_api.out
     dest_archive_files:
-      - ha_logs/dovetail.ha.glance_api.log
-      - ha_logs/dovetail.ha.glance_api.out
-    check_results_file: ha_logs/dovetail.ha.glance_api.out
+      - ha_logs/yardstick.ha.glance_api.log
+      - ha_logs/yardstick.ha.glance_api.out
+    check_results_file: ha_logs/yardstick.ha.glance_api.out
     sub_testcase_list:
diff --git a/etc/testcase/ha.haproxy.yml b/etc/testcase/yardstick.ha.haproxy.yml
index 3b1b6f4e..6fc1df9d 100644
--- a/etc/testcase/ha.haproxy.yml
+++ b/etc/testcase/yardstick.ha.haproxy.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.ha.haproxy:
-  name: dovetail.ha.haproxy
+yardstick.ha.haproxy:
+  name: yardstick.ha.haproxy
   objective: >
     This test case will verify the high availability of the load balance
     service(current is HAProxy) that supports OpenStack on controller node. When the
@@ -13,9 +13,9 @@ dovetail.ha.haproxy:
   report:
     source_archive_files:
       - yardstick.log
-      - dovetail.ha.haproxy.out
+      - yardstick.ha.haproxy.out
     dest_archive_files:
-      - ha_logs/dovetail.ha.haproxy.log
-      - ha_logs/dovetail.ha.haproxy.out
-    check_results_file: ha_logs/dovetail.ha.haproxy.out
+      - ha_logs/yardstick.ha.haproxy.log
+      - ha_logs/yardstick.ha.haproxy.out
+    check_results_file: ha_logs/yardstick.ha.haproxy.out
     sub_testcase_list:
diff --git a/etc/testcase/ha.keystone.yml b/etc/testcase/yardstick.ha.keystone.yml
index c9de127f..101b255b 100644
--- a/etc/testcase/ha.keystone.yml
+++ b/etc/testcase/yardstick.ha.keystone.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.ha.keystone:
-  name: dovetail.ha.keystone
+yardstick.ha.keystone:
+  name: yardstick.ha.keystone
   objective: >
     This test case will verify the high availability of the
     user service provided by OpenStack (keystone) on control node.
@@ -10,9 +10,9 @@ dovetail.ha.keystone:
   report:
     source_archive_files:
       - yardstick.log
-      - dovetail.ha.keystone.out
+      - yardstick.ha.keystone.out
     dest_archive_files:
-      - ha_logs/dovetail.ha.keystone.log
-      - ha_logs/dovetail.ha.keystone.out
-    check_results_file: ha_logs/dovetail.ha.keystone.out
+      - ha_logs/yardstick.ha.keystone.log
+      - ha_logs/yardstick.ha.keystone.out
+    check_results_file: ha_logs/yardstick.ha.keystone.out
     sub_testcase_list:
diff --git a/etc/testcase/ha.neutron_l3_agent.yml b/etc/testcase/yardstick.ha.neutron_l3_agent.yml
index a4daad7e..1fb2326d 100644
--- a/etc/testcase/ha.neutron_l3_agent.yml
+++ b/etc/testcase/yardstick.ha.neutron_l3_agent.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.ha.neutron_l3_agent:
-  name: dovetail.ha.neutron_l3_agent
+yardstick.ha.neutron_l3_agent:
+  name: yardstick.ha.neutron_l3_agent
   objective: OpenStack Controller Virtual Router Service High Availability.
   validate:
     type: yardstick
@@ -24,9 +24,9 @@ dovetail.ha.neutron_l3_agent:
   report:
     source_archive_files:
       - yardstick.log
-      - dovetail.ha.neutron_l3_agent.out
+      - yardstick.ha.neutron_l3_agent.out
     dest_archive_files:
-      - ha_logs/dovetail.ha.neutron_l3_agent.log
-      - ha_logs/dovetail.ha.neutron_l3_agent.out
-    check_results_file: ha_logs/dovetail.ha.neutron_l3_agent.out
+      - ha_logs/yardstick.ha.neutron_l3_agent.log
+      - ha_logs/yardstick.ha.neutron_l3_agent.out
+    check_results_file: ha_logs/yardstick.ha.neutron_l3_agent.out
     sub_testcase_list:
diff --git a/etc/testcase/ha.neutron_server.yml b/etc/testcase/yardstick.ha.neutron_server.yml
index 98bfd7dd..9d741c2b 100644
--- a/etc/testcase/ha.neutron_server.yml
+++ b/etc/testcase/yardstick.ha.neutron_server.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.ha.neutron_server:
-  name: dovetail.ha.neutron_server
+yardstick.ha.neutron_server:
+  name: yardstick.ha.neutron_server
   objective: >
     This test case will verify the high availability of the
     network service provided by OpenStack (neutro-server) on control node.
@@ -10,9 +10,9 @@ dovetail.ha.neutron_server:
   report:
     source_archive_files:
       - yardstick.log
-      - dovetail.ha.neutron_server.out
+      - yardstick.ha.neutron_server.out
     dest_archive_files:
-      - ha_logs/dovetail.ha.neutron_server.log
-      - ha_logs/dovetail.ha.neutron_server.out
-    check_results_file: ha_logs/dovetail.ha.neutron_server.out
+      - ha_logs/yardstick.ha.neutron_server.log
+      - ha_logs/yardstick.ha.neutron_server.out
+    check_results_file: ha_logs/yardstick.ha.neutron_server.out
     sub_testcase_list:
diff --git a/etc/testcase/ha.nova_api.yml b/etc/testcase/yardstick.ha.nova_api.yml
index 3de0d26d..b15f2db6 100644
--- a/etc/testcase/ha.nova_api.yml
+++ b/etc/testcase/yardstick.ha.nova_api.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.ha.nova_api:
-  name: dovetail.ha.nova_api
+yardstick.ha.nova_api:
+  name: yardstick.ha.nova_api
   objective: >
     This test case will verify the high availability
     of the service provided by OpenStack (like nova-api, neutro-server) on control node.
@@ -10,9 +10,9 @@ dovetail.ha.nova_api:
   report:
     source_archive_files:
       - yardstick.log
-      - dovetail.ha.nova_api.out
+      - yardstick.ha.nova_api.out
     dest_archive_files:
-      - ha_logs/dovetail.ha.nova_api.log
-      - ha_logs/dovetail.ha.nova_api.out
-    check_results_file: ha_logs/dovetail.ha.nova_api.out
+      - ha_logs/yardstick.ha.nova_api.log
+      - ha_logs/yardstick.ha.nova_api.out
+    check_results_file: ha_logs/yardstick.ha.nova_api.out
     sub_testcase_list:
diff --git a/etc/testcase/ha.rabbitmq.yml b/etc/testcase/yardstick.ha.rabbitmq.yml
index 39611b44..027cb358 100644
--- a/etc/testcase/ha.rabbitmq.yml
+++ b/etc/testcase/yardstick.ha.rabbitmq.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.ha.rabbitmq:
-  name: dovetail.ha.rabbitmq
+yardstick.ha.rabbitmq:
+  name: yardstick.ha.rabbitmq
   objective: OpenStack Controller Messaging Queue Service High Availability.
   validate:
     type: yardstick
@@ -8,9 +8,9 @@ dovetail.ha.rabbitmq:
   report:
     source_archive_files:
       - yardstick.log
-      - dovetail.ha.rabbitmq.out
+      - yardstick.ha.rabbitmq.out
     dest_archive_files:
-      - ha_logs/dovetail.ha.rabbitmq.log
-      - ha_logs/dovetail.ha.rabbitmq.out
-    check_results_file: ha_logs/dovetail.ha.rabbitmq.out
+      - ha_logs/yardstick.ha.rabbitmq.log
+      - ha_logs/yardstick.ha.rabbitmq.out
+    check_results_file: ha_logs/yardstick.ha.rabbitmq.out
     sub_testcase_list: