Renaming test cases for better readability

This patchset proposes a new naming scheme for test cases. The ides is
to replace the current numbered scheme

  <testarea>.tc<number>

with:

  <testarea>.<capability/test case description>

The motivation for this is that a the numbering does not convey any
information about what the test case is doing and hides to which test
case implementation in Functest or Yardstick a test case spec refers.

Note: this patchset has not yet been tested in Dovetail itself. Its goal
is start a discussion about the naming scheme.

JIRA: DOVETAIL-647

Change-Id: If33b4bf88e451b372c2af10895ff92a87d9d961d
Signed-off-by: Georg Kunz <georg.kunz@ericsson.com>

85 files changed, 304 insertions, 785 deletions

diff --git a/etc/compliance/ovp.1.0.0.yml b/etc/compliance/ovp.1.0.0.yml
deleted file mode 100644
index 71f2198d..00000000
--- a/etc/compliance/ovp.1.0.0.yml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-ovp.1.0.0:
-  name: ovp.1.0.0
-  testcases_list:
-  # mandatory test cases
-    # osinterop
-    - dovetail.osinterop.tc001
-    # vping
-    - dovetail.vping.tc001
-    - dovetail.vping.tc002
-    # HA
-    - dovetail.ha.tc001
-    - dovetail.ha.tc002
-    - dovetail.ha.tc003
-    - dovetail.ha.tc004
-    - dovetail.ha.tc005
-    - dovetail.ha.tc006
-    - dovetail.ha.tc007
-    - dovetail.ha.tc008
-  # optional test cases
-    # ipv6
-    - dovetail.ipv6.tc001
-    - dovetail.ipv6.tc002
-    - dovetail.ipv6.tc003
-    - dovetail.ipv6.tc004
-    - dovetail.ipv6.tc005
-    - dovetail.ipv6.tc006
-    - dovetail.ipv6.tc007
-    - dovetail.ipv6.tc008
-    - dovetail.ipv6.tc009
-    - dovetail.ipv6.tc010
-    - dovetail.ipv6.tc011
-    - dovetail.ipv6.tc012
-    - dovetail.ipv6.tc013
-    - dovetail.ipv6.tc014
-    - dovetail.ipv6.tc015
-    - dovetail.ipv6.tc016
-    - dovetail.ipv6.tc017
-    - dovetail.ipv6.tc018
-    - dovetail.ipv6.tc019
-    - dovetail.ipv6.tc020
-    - dovetail.ipv6.tc021
-    - dovetail.ipv6.tc022
-    - dovetail.ipv6.tc023
-    - dovetail.ipv6.tc024
-    - dovetail.ipv6.tc025
-    # tempest
-    - dovetail.tempest.tc001
-    - dovetail.tempest.tc002
-    - dovetail.tempest.tc003
-    - dovetail.tempest.tc004
-    - dovetail.tempest.tc005
-    # sdnvpn
-    - dovetail.sdnvpn.tc001
-    - dovetail.sdnvpn.tc002
-    - dovetail.sdnvpn.tc004
-    - dovetail.sdnvpn.tc008
diff --git a/etc/compliance/ovp.next.yaml b/etc/compliance/ovp.next.yaml
new file mode 100644
index 00000000..deb20093
--- /dev/null
+++ b/etc/compliance/ovp.next.yaml
@@ -0,0 +1,33 @@
+---
+ovp.next:
+  name: ovp.next
+  testcases_list:
+  # mandatory test cases
+    # osinterop
+    - dovetail.tempest.osinterop
+    # vping
+    - dovetail.vping.userdata
+    - dovetail.vping.ssh
+    # HA
+    - 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
+  # optional test cases
+    # ipv6
+    - dovetail.tempest.ipv6
+    # tempest
+    # some of the previous tempest test suites tc001 - tc005 have been merged
+    # with the smoke tests executed as part of the proposed_test test suite
+    - dovetail.tempest.multi_node_scheduling
+    - dovetail.tempest.network_security
+    - dovetail.tempest.vm_lifecycle
+    # sdnvpn
+    - dovetail.sdnvpn.subnet_connectivity
+    - dovetail.sdnvpn.tenant_separation
+    - dovetail.sdnvpn.router_association
+    - dovetail.sdnvpn.router_association_floating_ip
diff --git a/etc/compliance/proposed_tests.yml b/etc/compliance/proposed_tests.yml
index 830743bb..d5e9eef9 100644
--- a/etc/compliance/proposed_tests.yml
+++ b/etc/compliance/proposed_tests.yml
@@ -4,26 +4,24 @@ proposed_tests:
   testcases_list:
   # proposed test cases for 2nd release
     # smoke
-    - dovetail.smoke.tempest_compute
-    - dovetail.smoke.tempest_identity_v2
-    - dovetail.smoke.tempest_identity_v3
-    - dovetail.smoke.tempest_image
-    - dovetail.smoke.tempest_network
-    - dovetail.smoke.tempest_orchestration
-    - dovetail.smoke.tempest_scenario
-    - dovetail.smoke.tempest_volume
-    - dovetail.smoke.tc002
+#    - dovetail.tempest.compute
+#    - dovetail.tempest.identity_v2
+#    - dovetail.tempest.identity_v3
+#    - dovetail.tempest.image
+#    - dovetail.tempest.network
+#    - dovetail.tempest.orchestration
+#    - dovetail.tempest.volume
     # HA
-    - dovetail.ha.tc009
-    - dovetail.ha.tc010
-    - dovetail.ha.tc011
+#    - dovetail.ha.controller_restart
+#    - dovetail.ha.rabbitmq
+#    - dovetail.ha.neutron_l3_agent
     # vnf
-    - dovetail.vnf.tc001
+#    - dovetail.vnf.vims
     # stress
-    - dovetail.stress.tc001
+#    - dovetail.stress.ping
     # sdnvpn
-    - dovetail.sdnvpn.tc000
+#    - dovetail.tempest.bgpvpn
     # patrole
-    - dovetail.security.patrole
+#    - dovetail.security.patrole
     # Neutron trunk port Tempest tests
-    - dovetail.tempest.neutron_trunk_ports
+#    - dovetail.tempest.neutron_trunk_ports
diff --git a/etc/conf/cmd_config.yml b/etc/conf/cmd_config.yml
index ae097185..05456583 100644
--- a/etc/conf/cmd_config.yml
+++ b/etc/conf/cmd_config.yml
@@ -47,7 +47,7 @@ cli:
       testsuite:
         flags:
           - '--testsuite'
-        default: 'ovp.1.0.0'
+        default: 'ovp.next'
         help: 'compliance testsuite.'
       testarea:
         flags:
diff --git a/etc/conf/dovetail_config.yml b/etc/conf/dovetail_config.yml
index d8da5559..9202234a 100644
--- a/etc/conf/dovetail_config.yml
+++ b/etc/conf/dovetail_config.yml
@@ -33,26 +33,20 @@ testsuite_supported:
   - proposed_tests
   - debug
   - healthcheck
-  - ovp.1.0.0
+  - ovp.next
   - onap.1.0.0
 # testarea supported, should adjust accordingly
 testarea_supported:
-  - osinterop
-  - example
   - ha
-  - ipv6
+  - healthcheck
+  - onap
   - sdnvpn
-  - vping
+  - security
+  - snaps
   - stress
   - tempest
-  - optional
-  - mandatory
-  - full
-  - smoke
-  - healthcheck
   - vnf
-  - lifecycle
-  - security
+  - vping
 
 functest_testsuite:
   - refstack_defcore
diff --git a/etc/testcase/example.tc001.yml b/etc/testcase/example.tc001.yml
deleted file mode 100644
index 0ba297a8..00000000
--- a/etc/testcase/example.tc001.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-dovetail.example.tc001:
-  name: dovetail.example.tc001
-  objective: Bulk creation and deletion of IPv6 networks, ports and subnets
-  validate:
-    type: functest
-    testcase: tempest_smoke_serial
-    pre_condition:
-      - 'echo test for precondition'
-    cmds:
-      - 'functest env prepare'
-      - 'functest testcase run {{validate_testcase}} -r'
-    post_condition:
-      - 'echo test for precondition'
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_networks.BulkNetworkOpsIpV6Test.test_bulk_create_delete_network
-      - tempest.api.network.test_networks.BulkNetworkOpsIpV6Test.test_bulk_create_delete_port
-      - tempest.api.network.test_networks.BulkNetworkOpsIpV6Test.test_bulk_create_delete_subnet
diff --git a/etc/testcase/example.tc002.yml b/etc/testcase/example.tc002.yml
deleted file mode 100644
index 72bfa49d..00000000
--- a/etc/testcase/example.tc002.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.example.tc002:
-  name: dovetail.example.tc002
-  objective: VIM ipv6 operations, to create/update/delete an IPv6 network and subnet
-  validate:
-    type: shell
-    testcase: "run shell"
-    pre_condition:
-      - "echo pre_condition"
-    cmds:
-      - "echo test2"
-      - "mkdir xxx"
-    post_condition:
-      - "echo post_condition"
-  report:
-    sub_testcase_list:
diff --git a/etc/testcase/example.tc003.yml b/etc/testcase/example.tc003.yml
deleted file mode 100644
index 3ae0fb07..00000000
--- a/etc/testcase/example.tc003.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-dovetail.example.tc003:
-  name: dovetail.example.tc003
-  objective: doing something useful
-  validate:
-    type: shell
-    testcase: "run shell22"
-    pre_condition:
-    cmds:
-      - "echo test2"
-    post_condition:
-      - ""
-  report:
-    sub_testcase_list:
diff --git a/etc/testcase/ha.cinder_api.yml b/etc/testcase/ha.cinder_api.yml
new file mode 100644
index 00000000..9ba86df5
--- /dev/null
+++ b/etc/testcase/ha.cinder_api.yml
@@ -0,0 +1,11 @@
+---
+dovetail.ha.cinder_api:
+  name: dovetail.ha.cinder_api
+  objective: >
+    This test case will verify the high availability of the
+    volume service provided by OpenStack (cinder-api) on control node.
+  validate:
+    type: yardstick
+    testcase: opnfv_yardstick_tc048
+  report:
+    sub_testcase_list:
diff --git a/etc/testcase/ha.controller_restart.yml b/etc/testcase/ha.controller_restart.yml
new file mode 100644
index 00000000..79cc0933
--- /dev/null
+++ b/etc/testcase/ha.controller_restart.yml
@@ -0,0 +1,9 @@
+---
+dovetail.ha.controller_restart:
+  name: dovetail.ha.controller_restart
+  objective: OpenStack Controll Node abnormally shutdown.
+  validate:
+    type: yardstick
+    testcase: opnfv_yardstick_tc025
+  report:
+    sub_testcase_list:
diff --git a/etc/testcase/ha.cpu_load.yml b/etc/testcase/ha.cpu_load.yml
new file mode 100644
index 00000000..b10fc980
--- /dev/null
+++ b/etc/testcase/ha.cpu_load.yml
@@ -0,0 +1,14 @@
+---
+dovetail.ha.cpu_load:
+  name: dovetail.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%,
+    which breaks down the Openstack services on this node. These Openstack service
+    should able to be accessed by other controller nodes, and the services on
+    failed controller node should be isolated.
+  validate:
+    type: yardstick
+    testcase: opnfv_yardstick_tc051
+  report:
+    sub_testcase_list:
diff --git a/etc/testcase/ha.disk_load.yml b/etc/testcase/ha.disk_load.yml
new file mode 100644
index 00000000..d314546d
--- /dev/null
+++ b/etc/testcase/ha.disk_load.yml
@@ -0,0 +1,13 @@
+---
+dovetail.ha.disk_load:
+  name: dovetail.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
+    services on this node. Read and write services should still be accessed by other
+    controller nodes, and the services on failed controller node should be isolated.
+  validate:
+    type: yardstick
+    testcase: opnfv_yardstick_tc052
+  report:
+    sub_testcase_list:
diff --git a/etc/testcase/ha.glance_api.yml b/etc/testcase/ha.glance_api.yml
new file mode 100644
index 00000000..7e6a2bdf
--- /dev/null
+++ b/etc/testcase/ha.glance_api.yml
@@ -0,0 +1,11 @@
+---
+dovetail.ha.glance_api:
+  name: dovetail.ha.glance_api
+  objective: >
+    This test case will verify the high availability of the
+    image service provided by OpenStack (glance-api) on control node.
+  validate:
+    type: yardstick
+    testcase: opnfv_yardstick_tc047
+  report:
+    sub_testcase_list:
diff --git a/etc/testcase/ha.haproxy.yml b/etc/testcase/ha.haproxy.yml
new file mode 100644
index 00000000..85a64e29
--- /dev/null
+++ b/etc/testcase/ha.haproxy.yml
@@ -0,0 +1,14 @@
+---
+dovetail.ha.haproxy:
+  name: dovetail.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
+    load balance service of a specified controller node is killed, whether other
+    load balancers on other controller nodes will work, and whether the controller node
+    will restart the load balancer are checked.
+  validate:
+    type: yardstick
+    testcase: opnfv_yardstick_tc053
+  report:
+    sub_testcase_list:
diff --git a/etc/testcase/ha.keystone.yml b/etc/testcase/ha.keystone.yml
new file mode 100644
index 00000000..e5f97f22
--- /dev/null
+++ b/etc/testcase/ha.keystone.yml
@@ -0,0 +1,11 @@
+---
+dovetail.ha.keystone:
+  name: dovetail.ha.keystone
+  objective: >
+    This test case will verify the high availability of the
+    user service provided by OpenStack (keystone) on control node.
+  validate:
+    type: yardstick
+    testcase: opnfv_yardstick_tc046
+  report:
+    sub_testcase_list:
diff --git a/etc/testcase/ha.tc011.yml b/etc/testcase/ha.neutron_l3_agent.yml
index 7f5a7d4b..28669258 100644
--- a/etc/testcase/ha.tc011.yml
+++ b/etc/testcase/ha.neutron_l3_agent.yml
@@ -1,7 +1,7 @@
 ---
-dovetail.ha.tc011:
-  name: dovetail.ha.tc011
-  objective: > # OpenStack Controller Virtual Router Service High Availability.
+dovetail.ha.neutron-l3-agent:
+  name: dovetail.ha.neutron_l3_agent
+  objective: OpenStack Controller Virtual Router Service High Availability.
   validate:
     type: yardstick
     testcase: opnfv_yardstick_tc058
diff --git a/etc/testcase/ha.neutron_server.yml b/etc/testcase/ha.neutron_server.yml
new file mode 100644
index 00000000..7523b3bc
--- /dev/null
+++ b/etc/testcase/ha.neutron_server.yml
@@ -0,0 +1,11 @@
+---
+dovetail.ha.neutron_server:
+  name: dovetail.ha.neutron_server
+  objective: >
+    This test case will verify the high availability of the
+    network service provided by OpenStack (neutro-server) on control node.
+  validate:
+    type: yardstick
+    testcase: opnfv_yardstick_tc045
+  report:
+    sub_testcase_list:
diff --git a/etc/testcase/ha.nova_api.yml b/etc/testcase/ha.nova_api.yml
new file mode 100644
index 00000000..31f56a0f
--- /dev/null
+++ b/etc/testcase/ha.nova_api.yml
@@ -0,0 +1,11 @@
+---
+dovetail.ha.nova_api:
+  name: dovetail.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.
+  validate:
+    type: yardstick
+    testcase: opnfv_yardstick_tc019
+  report:
+    sub_testcase_list:
diff --git a/etc/testcase/ha.rabbitmq.yml b/etc/testcase/ha.rabbitmq.yml
new file mode 100644
index 00000000..f55eb7b5
--- /dev/null
+++ b/etc/testcase/ha.rabbitmq.yml
@@ -0,0 +1,9 @@
+---
+dovetail.ha.rabbitmq:
+  name: dovetail.ha.rabbitmq
+  objective: OpenStack Controller Messaging Queue Service High Availability.
+  validate:
+    type: yardstick
+    testcase: opnfv_yardstick_tc056
+  report:
+    sub_testcase_list:
diff --git a/etc/testcase/ha.tc001.yml b/etc/testcase/ha.tc001.yml
deleted file mode 100644
index e938c822..00000000
--- a/etc/testcase/ha.tc001.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-dovetail.ha.tc001:
-  name: dovetail.ha.tc001
-  objective: > # This test case will verify the high availability
-    # of the service provided by OpenStack (like nova-api, neutro-server) on control node.
-  validate:
-    type: yardstick
-    testcase: opnfv_yardstick_tc019
-  report:
-    sub_testcase_list:
diff --git a/etc/testcase/ha.tc002.yml b/etc/testcase/ha.tc002.yml
deleted file mode 100644
index 4ca78b45..00000000
--- a/etc/testcase/ha.tc002.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-dovetail.ha.tc002:
-  name: dovetail.ha.tc002
-  objective: > # This test case will verify the high availability of the
-    # network service provided by OpenStack (neutro-server) on control node.
-  validate:
-    type: yardstick
-    testcase: opnfv_yardstick_tc045
-  report:
-    sub_testcase_list:
diff --git a/etc/testcase/ha.tc003.yml b/etc/testcase/ha.tc003.yml
deleted file mode 100644
index b3a0bf7b..00000000
--- a/etc/testcase/ha.tc003.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-dovetail.ha.tc003:
-  name: dovetail.ha.tc003
-  objective: > # This test case will verify the high availability of the
-    # user service provided by OpenStack (keystone) on control node.
-  validate:
-    type: yardstick
-    testcase: opnfv_yardstick_tc046
-  report:
-    sub_testcase_list:
diff --git a/etc/testcase/ha.tc004.yml b/etc/testcase/ha.tc004.yml
deleted file mode 100644
index b25af983..00000000
--- a/etc/testcase/ha.tc004.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-dovetail.ha.tc004:
-  name: dovetail.ha.tc004
-  objective: > # This test case will verify the high availability of the
-    # image service provided by OpenStack (glance-api) on control node.
-  validate:
-    type: yardstick
-    testcase: opnfv_yardstick_tc047
-  report:
-    sub_testcase_list:
diff --git a/etc/testcase/ha.tc005.yml b/etc/testcase/ha.tc005.yml
deleted file mode 100644
index fd6e14d5..00000000
--- a/etc/testcase/ha.tc005.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-dovetail.ha.tc005:
-  name: dovetail.ha.tc005
-  objective: > # This test case will verify the high availability of the
-    # volume service provided by OpenStack (cinder-api) on control node.
-  validate:
-    type: yardstick
-    testcase: opnfv_yardstick_tc048
-  report:
-    sub_testcase_list:
diff --git a/etc/testcase/ha.tc006.yml b/etc/testcase/ha.tc006.yml
deleted file mode 100644
index aecbe8b2..00000000
--- a/etc/testcase/ha.tc006.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-dovetail.ha.tc006:
-  name: dovetail.ha.tc006
-  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%,
-    # which breaks down the Openstack services on this node. These Openstack service
-    # should able to be accessed by other controller nodes, and the services on
-    # failed controller node should be isolated.
-  validate:
-    type: yardstick
-    testcase: opnfv_yardstick_tc051
-  report:
-    sub_testcase_list:
diff --git a/etc/testcase/ha.tc007.yml b/etc/testcase/ha.tc007.yml
deleted file mode 100644
index 5d985534..00000000
--- a/etc/testcase/ha.tc007.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-dovetail.ha.tc007:
-  name: dovetail.ha.tc007
-  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
-    # services on this node. Read and write services should still be accessed by other
-    # controller nodes, and the services on failed controller node should be isolated.
-  validate:
-    type: yardstick
-    testcase: opnfv_yardstick_tc052
-  report:
-    sub_testcase_list:
diff --git a/etc/testcase/ha.tc008.yml b/etc/testcase/ha.tc008.yml
deleted file mode 100644
index 2287b8d1..00000000
--- a/etc/testcase/ha.tc008.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-dovetail.ha.tc008:
-  name: dovetail.ha.tc008
-  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
-    # load balance service of a specified controller node is killed, whether other
-    # load balancers on other controller nodes will work, and whether the controller node
-    # will restart the load balancer are checked.
-  validate:
-    type: yardstick
-    testcase: opnfv_yardstick_tc053
-  report:
-    sub_testcase_list:
diff --git a/etc/testcase/ha.tc009.yml b/etc/testcase/ha.tc009.yml
deleted file mode 100644
index 10f4e506..00000000
--- a/etc/testcase/ha.tc009.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-dovetail.ha.tc009:
-  name: dovetail.ha.tc009
-  objective: > # OpenStack Controll Node abnormally shutdown.
-  validate:
-    type: yardstick
-    testcase: opnfv_yardstick_tc025
-  report:
-    sub_testcase_list:
diff --git a/etc/testcase/ha.tc010.yml b/etc/testcase/ha.tc010.yml
deleted file mode 100644
index 6508a4dc..00000000
--- a/etc/testcase/ha.tc010.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-dovetail.ha.tc010:
-  name: dovetail.ha.tc010
-  objective: > # OpenStack Controller Messaging Queue Service High Availability.
-  validate:
-    type: yardstick
-    testcase: opnfv_yardstick_tc056
-  report:
-    sub_testcase_list:
diff --git a/etc/testcase/healthcheck.tc002.yml b/etc/testcase/healthcheck.api_check.yml
index 84ca2516..5a8b47b2 100644
--- a/etc/testcase/healthcheck.tc002.yml
+++ b/etc/testcase/healthcheck.api_check.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.healthcheck.tc002:
-  name: dovetail.healthcheck.tc002
+dovetail.healthcheck.api_check:
+  name: dovetail.healthcheck.api_check
   objective: verify OpenStack API with simple queries
   validate:
     type: functest
diff --git a/etc/testcase/healthcheck.tc001.yml b/etc/testcase/healthcheck.connection_check.yml
index e71f063e..195bf504 100644
--- a/etc/testcase/healthcheck.tc001.yml
+++ b/etc/testcase/healthcheck.connection_check.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.healthcheck.tc001:
-  name: dovetail.healthcheck.tc001
+dovetail.healthcheck.connection_check:
+  name: dovetail.healthcheck.connection_check
   objective: check OpenStack API services connectivity through SNAPS framework
   validate:
     type: functest
diff --git a/etc/testcase/healthcheck.tc003.yml b/etc/testcase/healthcheck.snaps_health_check.yml
index 83fb8919..87b4ec4a 100644
--- a/etc/testcase/healthcheck.tc003.yml
+++ b/etc/testcase/healthcheck.snaps_health_check.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.healthcheck.tc003:
-  name: dovetail.healthcheck.tc003
+dovetail.healthcheck.snaps_health_check:
+  name: dovetail.healthcheck.snaps_health_check
   objective: basic VM instance creation with port and IPv4 address through DHCP
   validate:
     type: functest
diff --git a/etc/testcase/ipv6.tc001.yml b/etc/testcase/ipv6.tc001.yml
deleted file mode 100644
index 12db9286..00000000
--- a/etc/testcase/ipv6.tc001.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-dovetail.ipv6.tc001:
-  name: dovetail.ipv6.tc001
-  objective: Bulk creation and deletion of IPv6 networks, ports and subnets
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_networks.BulkNetworkOpsIpV6Test.test_bulk_create_delete_network[id-d4f9024d-1e28-4fc1-a6b1-25dbc6fa11e2,smoke]
-      - tempest.api.network.test_networks.BulkNetworkOpsIpV6Test.test_bulk_create_delete_port[id-48037ff2-e889-4c3b-b86a-8e3f34d2d060,smoke]
-      - tempest.api.network.test_networks.BulkNetworkOpsIpV6Test.test_bulk_create_delete_subnet[id-8936533b-c0aa-4f29-8e53-6cc873aec489,smoke]
diff --git a/etc/testcase/ipv6.tc002.yml b/etc/testcase/ipv6.tc002.yml
deleted file mode 100644
index 1b29d0b1..00000000
--- a/etc/testcase/ipv6.tc002.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc002:
-  name: dovetail.ipv6.tc002
-  objective: VIM ipv6 operations, to create/update/delete an IPv6 network and subnet
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_networks.NetworksIpV6Test.test_create_update_delete_network_subnet[id-0e269138-0da6-4efc-a46d-578161e7b221,smoke]
diff --git a/etc/testcase/ipv6.tc003.yml b/etc/testcase/ipv6.tc003.yml
deleted file mode 100644
index 995e1d91..00000000
--- a/etc/testcase/ipv6.tc003.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc003:
-  name: dovetail.ipv6.tc003
-  objective: VIM ipv6 operations, to check external network visibility
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_networks.NetworksIpV6Test.test_external_network_visibility[id-af774677-42a9-4e4b-bb58-16fe6a5bc1ec,smoke]
diff --git a/etc/testcase/ipv6.tc004.yml b/etc/testcase/ipv6.tc004.yml
deleted file mode 100644
index 023bae6c..00000000
--- a/etc/testcase/ipv6.tc004.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-dovetail.ipv6.tc004:
-  name: dovetail.ipv6.tc004
-  objective: VIM ipv6 operations, to list IPv6 networks and subnets of a tenant
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_networks.NetworksIpV6Test.test_list_networks[id-f7ffdeda-e200-4a7a-bcbe-05716e86bf43,smoke]
-      - tempest.api.network.test_networks.NetworksIpV6Test.test_list_subnets[id-db68ba48-f4ea-49e9-81d1-e367f6d0b20a,smoke]
diff --git a/etc/testcase/ipv6.tc005.yml b/etc/testcase/ipv6.tc005.yml
deleted file mode 100644
index f75f91e9..00000000
--- a/etc/testcase/ipv6.tc005.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-dovetail.ipv6.tc005:
-  name: dovetail.ipv6.tc005
-  objective: VIM ipv6 operations, to show information of an IPv6 network and subnet
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_networks.NetworksIpV6Test.test_show_network[id-2bf13842-c93f-4a69-83ed-717d2ec3b44e,smoke]
-      - tempest.api.network.test_networks.NetworksIpV6Test.test_show_subnet[id-bd635d81-6030-4dd1-b3b9-31ba0cfdf6cc,smoke]
diff --git a/etc/testcase/ipv6.tc006.yml b/etc/testcase/ipv6.tc006.yml
deleted file mode 100644
index 19f61d03..00000000
--- a/etc/testcase/ipv6.tc006.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc006:
-  name: dovetail.ipv6.tc006
-  objective: VIM ipv6 operations, to create an IPv6 port in allowed allocation pools
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_port_in_allowed_allocation_pools[id-0435f278-40ae-48cb-a404-b8a087bc09b1,smoke]
diff --git a/etc/testcase/ipv6.tc007.yml b/etc/testcase/ipv6.tc007.yml
deleted file mode 100644
index 816d6c84..00000000
--- a/etc/testcase/ipv6.tc007.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc007:
-  name: dovetail.ipv6.tc007
-  objective: VIM ipv6 operations, to create an IPv6 port without security groups
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_port_with_no_securitygroups[id-4179dcb9-1382-4ced-84fe-1b91c54f5735,smoke]
diff --git a/etc/testcase/ipv6.tc008.yml b/etc/testcase/ipv6.tc008.yml
deleted file mode 100644
index 1a2a6554..00000000
--- a/etc/testcase/ipv6.tc008.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc008:
-  name: dovetail.ipv6.tc008
-  objective: VIM ipv6 operations, to create/update/delete an IPv6 port
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_update_delete_port[id-c72c1c0c-2193-4aca-aaa4-b1442640f51c,smoke]
diff --git a/etc/testcase/ipv6.tc009.yml b/etc/testcase/ipv6.tc009.yml
deleted file mode 100644
index 417b67f1..00000000
--- a/etc/testcase/ipv6.tc009.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc009:
-  name: dovetail.ipv6.tc009
-  objective: VIM ipv6 operations, to list IPv6 ports of a tenant
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_ports.PortsIpV6TestJSON.test_list_ports[id-cf95b358-3e92-4a29-a148-52445e1ac50e,smoke]
diff --git a/etc/testcase/ipv6.tc010.yml b/etc/testcase/ipv6.tc010.yml
deleted file mode 100644
index e8f4049b..00000000
--- a/etc/testcase/ipv6.tc010.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc010:
-  name: dovetail.ipv6.tc010
-  objective: VIM ipv6 operations, to show information of an IPv6 port
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_ports.PortsIpV6TestJSON.test_show_port[id-c9a685bd-e83f-499c-939f-9f7863ca259f,smoke]
diff --git a/etc/testcase/ipv6.tc011.yml b/etc/testcase/ipv6.tc011.yml
deleted file mode 100644
index 5ed78506..00000000
--- a/etc/testcase/ipv6.tc011.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc011:
-  name: dovetail.ipv6.tc011
-  objective: VIM ipv6 operations, to add multiple interfaces for an IPv6 router
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_routers.RoutersIpV6Test.test_add_multiple_router_interfaces[id-802c73c9-c937-4cef-824b-2191e24a6aab,smoke]
diff --git a/etc/testcase/ipv6.tc012.yml b/etc/testcase/ipv6.tc012.yml
deleted file mode 100644
index 45093570..00000000
--- a/etc/testcase/ipv6.tc012.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc012:
-  name: dovetail.ipv6.tc012
-  objective: VIM ipv6 operations, to add and remove an IPv6 router interface with port_id
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_routers.RoutersIpV6Test.test_add_remove_router_interface_with_port_id[id-2b7d2f37-6748-4d78-92e5-1d590234f0d5,smoke]
diff --git a/etc/testcase/ipv6.tc013.yml b/etc/testcase/ipv6.tc013.yml
deleted file mode 100644
index 4c50788c..00000000
--- a/etc/testcase/ipv6.tc013.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc013:
-  name: dovetail.ipv6.tc013
-  objective: VIM ipv6 operations, to add and remove an IPv6 router interface with subnet_id
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_routers.RoutersIpV6Test.test_add_remove_router_interface_with_subnet_id[id-b42e6e39-2e37-49cc-a6f4-8467e940900a,smoke]
diff --git a/etc/testcase/ipv6.tc014.yml b/etc/testcase/ipv6.tc014.yml
deleted file mode 100644
index 6cd9178d..00000000
--- a/etc/testcase/ipv6.tc014.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc014:
-  name: dovetail.ipv6.tc014
-  objective: VIM ipv6 operations, to create, update, delete, list and show an IPv6 router
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_routers.RoutersIpV6Test.test_create_show_list_update_delete_router[id-f64403e2-8483-4b34-8ccd-b09a87bcc68c,smoke]
diff --git a/etc/testcase/ipv6.tc015.yml b/etc/testcase/ipv6.tc015.yml
deleted file mode 100644
index 9dfd31b6..00000000
--- a/etc/testcase/ipv6.tc015.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc015:
-  name: dovetail.ipv6.tc015
-  objective: VIM ipv6 operations, to create, update, delete, list and show an IPv6 security group
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_security_groups.SecGroupIPv6Test.test_create_list_update_show_delete_security_group[id-bfd128e5-3c92-44b6-9d66-7fe29d22c802,smoke]
diff --git a/etc/testcase/ipv6.tc016.yml b/etc/testcase/ipv6.tc016.yml
deleted file mode 100644
index 87174130..00000000
--- a/etc/testcase/ipv6.tc016.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc016:
-  name: dovetail.ipv6.tc016
-  objective: VIM ipv6 operations, to create, delete and show security group rules
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_security_groups.SecGroupIPv6Test.test_create_show_delete_security_group_rule[id-cfb99e0e-7410-4a3d-8a0c-959a63ee77e9,smoke]
diff --git a/etc/testcase/ipv6.tc017.yml b/etc/testcase/ipv6.tc017.yml
deleted file mode 100644
index 579ecb37..00000000
--- a/etc/testcase/ipv6.tc017.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc017:
-  name: dovetail.ipv6.tc017
-  objective: VIM ipv6 operations, to list all security groups
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_security_groups.SecGroupIPv6Test.test_list_security_groups[id-e30abd17-fef9-4739-8617-dc26da88e686,smoke]
diff --git a/etc/testcase/ipv6.tc018.yml b/etc/testcase/ipv6.tc018.yml
deleted file mode 100644
index af9c5d9f..00000000
--- a/etc/testcase/ipv6.tc018.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc018:
-  name: dovetail.ipv6.tc018
-  objective: VIM ipv6 operations, to show information of an IPv6 port, scenario os-nosdn-nofeature dependent
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    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/ipv6.tc019.yml b/etc/testcase/ipv6.tc019.yml
deleted file mode 100644
index e02fc113..00000000
--- a/etc/testcase/ipv6.tc019.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc019:
-  name: dovetail.ipv6.tc019
-  objective: VIM ipv6 operations, to do IPv6 address assignment - dual stack, DHCPv6 stateless, scenario os-nosdn-nofeature dependent
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_dhcp6_stateless_from_os[compute,id-76f26acd-9688-42b4-bc3e-cd134c4cb09e,network,slow]
diff --git a/etc/testcase/ipv6.tc020.yml b/etc/testcase/ipv6.tc020.yml
deleted file mode 100644
index a650bc02..00000000
--- a/etc/testcase/ipv6.tc020.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc020:
-  name: dovetail.ipv6.tc020
-  objective: VIM ipv6 operations, to do IPv6 Address Assignment - Multiple Prefixes, DHCPv6 Stateless, scenario os-nosdn-nofeature dependent
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.scenario.test_network_v6.TestGettingAddress.test_multi_prefix_dhcpv6_stateless[compute,id-7ab23f41-833b-4a16-a7c9-5b42fe6d4123,network,slow]
diff --git a/etc/testcase/ipv6.tc021.yml b/etc/testcase/ipv6.tc021.yml
deleted file mode 100644
index 7cfa23cd..00000000
--- a/etc/testcase/ipv6.tc021.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc021:
-  name: dovetail.ipv6.tc021
-  objective: VIM ipv6 operations, to do IPv6 Address Assignment - Dual Stack, Multiple Prefixes, DHCPv6 Stateless, scenario os-nosdn-nofeature dependent
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_multi_prefix_dhcpv6_stateless[compute,id-cf1c4425-766b-45b8-be35-e2959728eb00,network]
diff --git a/etc/testcase/ipv6.tc022.yml b/etc/testcase/ipv6.tc022.yml
deleted file mode 100644
index 268255bb..00000000
--- a/etc/testcase/ipv6.tc022.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc022:
-  name: dovetail.ipv6.tc022
-  objective: VIM ipv6 operations, to do IPv6 Address Assignment - SLAAC, scenario os-nosdn-nofeature dependent
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.scenario.test_network_v6.TestGettingAddress.test_slaac_from_os[compute,id-2c92df61-29f0-4eaa-bee3-7c65bef62a43,network,slow]
diff --git a/etc/testcase/ipv6.tc023.yml b/etc/testcase/ipv6.tc023.yml
deleted file mode 100644
index f8cc31cd..00000000
--- a/etc/testcase/ipv6.tc023.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc023:
-  name: dovetail.ipv6.tc023
-  objective: VIM ipv6 operations, to do IPv6 Address Assignment - Dual Stack, SLAAC, scenario os-nosdn-nofeature dependent
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_slaac_from_os[compute,id-b6399d76-4438-4658-bcf5-0d6c8584fde2,network,slow]
diff --git a/etc/testcase/ipv6.tc024.yml b/etc/testcase/ipv6.tc024.yml
deleted file mode 100644
index 6f93d07f..00000000
--- a/etc/testcase/ipv6.tc024.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc024:
-  name: dovetail.ipv6.tc024
-  objective: VIM ipv6 operations, to do IPv6 address assignment - multiple prefixes, SLAAC, scenario os-nosdn-nofeature dependent
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.scenario.test_network_v6.TestGettingAddress.test_multi_prefix_slaac[compute,id-dec222b1-180c-4098-b8c5-cc1b8342d611,network,slow]
diff --git a/etc/testcase/ipv6.tc025.yml b/etc/testcase/ipv6.tc025.yml
deleted file mode 100644
index 7178f92f..00000000
--- a/etc/testcase/ipv6.tc025.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc025:
-  name: dovetail.ipv6.tc025
-  objective: VIM ipv6 operations, to do IPv6 address assignment - dual stack, multiple prefixes, SLAAC, scenario os-nosdn-nofeature dependent
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_multi_prefix_slaac[compute,id-9178ad42-10e4-47e9-8987-e02b170cc5cd,network]
diff --git a/etc/testcase/lifecycle.tc001.yml b/etc/testcase/onap.vnf_lifecycle.yml
index f9c27985..f1e8a34d 100644
--- a/etc/testcase/lifecycle.tc001.yml
+++ b/etc/testcase/onap.vnf_lifecycle.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.lifecycle.tc001:
-  name: dovetail.lifecycle.tc001
+dovetail.onap.vnf_lifecycle:
+  name: dovetail.onap.vnf_lifecycle
   objective: vnf lifecycle tests
   validate:
     type: vnftest
diff --git a/etc/testcase/osinterop.tc002.yml b/etc/testcase/osinterop.tc002.yml
deleted file mode 100644
index 42346a53..00000000
--- a/etc/testcase/osinterop.tc002.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-dovetail.osinterop.tc002:
-  name: dovetail.osinterop.tc002
-  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:
-    # https://refstack.openstack.org/api/v1/guidelines/2016.08/tests?target=compute&type=required&alias=true&flag=false
-  validate:
-    type: functest
-    testcase: refstack_defcore
-    pre_condition:
-      - 'echo test for precondition in testcase'
-    cmds:
-      - 'cd /home/opnfv/repos/refstack-client; source .venv/bin/activate; ./refstack-client test -c /home/opnfv/userconfig/refstack_tempest.conf  -v --test-list /home/opnfv/userconfig/osinterop.txt'
-    post_condition:
-      - 'echo test for postcondition in testcase'
-  report:
-    sub_testcase_list:
diff --git a/etc/testcase/sdnvpn.tc004.yml b/etc/testcase/sdnvpn.router_association.yml
index f3628b8a..2860d98b 100644
--- a/etc/testcase/sdnvpn.tc004.yml
+++ b/etc/testcase/sdnvpn.router_association.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.sdnvpn.tc004:
-  name: dovetail.sdnvpn.tc004
+dovetail.sdnvpn.router_association:
+  name: dovetail.sdnvpn.router_association
   objective: VPN provides connectivity between subnets using association of Neutron Router to VPNs
   validate:
     type: functest
diff --git a/etc/testcase/sdnvpn.tc008.yml b/etc/testcase/sdnvpn.router_association_floating_ip.yml
index 71190223..f105c867 100644
--- a/etc/testcase/sdnvpn.tc008.yml
+++ b/etc/testcase/sdnvpn.router_association_floating_ip.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.sdnvpn.tc008:
-  name: dovetail.sdnvpn.tc008
+dovetail.sdnvpn.router_association_floating_ip:
+  name: dovetail.sdnvpn.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
diff --git a/etc/testcase/sdnvpn.tc001.yml b/etc/testcase/sdnvpn.subnet_connectivity.yml
index a5f9fd00..226653c7 100644
--- a/etc/testcase/sdnvpn.tc001.yml
+++ b/etc/testcase/sdnvpn.subnet_connectivity.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.sdnvpn.tc001:
-  name: dovetail.sdnvpn.tc001
+dovetail.sdnvpn.subnet_connectivity:
+  name: dovetail.sdnvpn.subnet_connectivity
   objective: Connectivity between Neutron subnets through association of Neutron Networks to VPNs
   validate:
     type: functest
diff --git a/etc/testcase/sdnvpn.tc003.yml b/etc/testcase/sdnvpn.tc003.yml
deleted file mode 100644
index e609390a..00000000
--- a/etc/testcase/sdnvpn.tc003.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-dovetail.sdnvpn.tc003:
-  name: dovetail.sdnvpn.tc003
-  objective: Data center gateway integration through BGP peering
-  validate:
-    type: functest
-    testcase: bgpvpn
-    image_name: opnfv/functest-features
-    pre_copy:
-      exist_src_file: sdnvpn_config_testcase3.yaml
-      dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml
-  report:
-    sub_testcase_list:
diff --git a/etc/testcase/sdnvpn.tc002.yml b/etc/testcase/sdnvpn.tenant_separation.yml
index 06f4d65c..b4f2711a 100644
--- a/etc/testcase/sdnvpn.tc002.yml
+++ b/etc/testcase/sdnvpn.tenant_separation.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.sdnvpn.tc002:
-  name: dovetail.sdnvpn.tc002
+dovetail.sdnvpn.tenant_separation:
+  name: dovetail.sdnvpn.tenant_separation
   objective: Separation of tenant networks through association to different VPNs
   validate:
     type: functest
diff --git a/etc/testcase/smoke.tempest_scenario.yml b/etc/testcase/smoke.tempest_scenario.yml
deleted file mode 100644
index 2882cc7d..00000000
--- a/etc/testcase/smoke.tempest_scenario.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-dovetail.smoke.tempest_scenario:
-  name: dovetail.smoke.tempest_scenario
-  objective: tempest smoke test cases about scenario
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.scenario.test_server_basic_ops.TestServerBasicOps.test_server_basic_ops[compute,id-7fff3fb3-91d8-4fd0-bd7d-0204f1f180ba,network,smoke]
-      - tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern[compute,id-557cd2c2-4eb8-4dce-98be-f86765ff311b,image,smoke,volume]
-      - tempest.scenario.test_volume_boot_pattern.TestVolumeBootPatternV2.test_volume_boot_pattern[compute,id-557cd2c2-4eb8-4dce-98be-f86765ff311b,image,smoke,volume]
diff --git a/etc/testcase/smoke.tc002.yml b/etc/testcase/snaps.smoke.yml
index ae9a87f5..3ebbfa27 100644
--- a/etc/testcase/smoke.tc002.yml
+++ b/etc/testcase/snaps.smoke.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.smoke.tc002:
-  name: dovetail.smoke.tc002
+dovetail.snaps.smoke:
+  name: dovetail.snaps.smoke
   objective: snaps smoke test cases
   validate:
     type: functest
diff --git a/etc/testcase/stress.tc001.yml b/etc/testcase/stress.ping.yml
index fd29f276..e1026543 100644
--- a/etc/testcase/stress.tc001.yml
+++ b/etc/testcase/stress.ping.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.stress.tc001:
-  name: dovetail.stress.tc001
+dovetail.stress.ping:
+  name: dovetail.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.
diff --git a/etc/testcase/sdnvpn.tc000.yml b/etc/testcase/tempest.bgpvpn.yml
index a717c705..02072623 100644
--- a/etc/testcase/sdnvpn.tc000.yml
+++ b/etc/testcase/tempest.bgpvpn.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.sdnvpn.tc000:
-  name: dovetail.sdnvpn.tc000
+dovetail.tempest.bgpvpn:
+  name: dovetail.tempest.bgpvpn
   objective: validate BGPVPN API CRUD operations by means of Tempest tests from networking-bgpvpn repository
   validate:
     type: functest
diff --git a/etc/testcase/smoke.tempest_compute.yml b/etc/testcase/tempest.compute.yml
index 0a93f1c1..edfdc6f9 100644
--- a/etc/testcase/smoke.tempest_compute.yml
+++ b/etc/testcase/tempest.compute.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.smoke.tempest_compute:
-  name: dovetail.smoke.tempest_compute
+dovetail.tempest.compute:
+  name: dovetail.tempest.compute
   objective: tempest smoke test cases about compute
   validate:
     type: functest
@@ -21,3 +21,5 @@ dovetail.smoke.tempest_compute:
       - tempest.api.compute.servers.test_attach_interfaces.AttachInterfacesTestJSON.test_add_remove_fixed_ip[id-c7e0e60b-ee45-43d0-abeb-8596fd42a2f9,network,smoke]
       - tempest.api.compute.servers.test_server_addresses.ServerAddressesTestJSON.test_list_server_addresses[id-6eb718c0-02d9-4d5e-acd1-4e0c269cef39,network,smoke]
       - tempest.api.compute.servers.test_server_addresses.ServerAddressesTestJSON.test_list_server_addresses_by_network[id-87bbc374-5538-4f64-b673-2b0e4443cc30,network,smoke]
+      #
+      - tempest.scenario.test_server_basic_ops.TestServerBasicOps.test_server_basic_ops[compute,id-7fff3fb3-91d8-4fd0-bd7d-0204f1f180ba,network,smoke]
diff --git a/etc/testcase/smoke.tempest_identity_v2.yml b/etc/testcase/tempest.identity_v2.yml
index f5aa1b69..7d1ca7cd 100644
--- a/etc/testcase/smoke.tempest_identity_v2.yml
+++ b/etc/testcase/tempest.identity_v2.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.smoke.tempest_identity_v2:
-  name: dovetail.smoke.tempest_identity_v2
+dovetail.tempest.identity_v2:
+  name: dovetail.tempest.identity_v2
   objective: tempest smoke test cases about identity v2
   validate:
     type: functest
diff --git a/etc/testcase/smoke.tempest_identity_v3.yml b/etc/testcase/tempest.identity_v3.yml
index f724bdbe..264bb7a3 100644
--- a/etc/testcase/smoke.tempest_identity_v3.yml
+++ b/etc/testcase/tempest.identity_v3.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.smoke.tempest_identity_v3:
-  name: dovetail.smoke.tempest_identity_v3
+dovetail.tempest.identity_v3:
+  name: dovetail.tempest.identity_v3
   objective: tempest smoke test cases about identity v3
   validate:
     type: functest
diff --git a/etc/testcase/smoke.tempest_image.yml b/etc/testcase/tempest.image.yml
index 4b79deef..6ab0af2e 100644
--- a/etc/testcase/smoke.tempest_image.yml
+++ b/etc/testcase/tempest.image.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.smoke.tempest_image:
-  name: dovetail.smoke.tempest_image
+dovetail.tempest.image:
+  name: dovetail.tempest.image
   objective: tempest smoke test cases about image
   validate:
     type: functest
diff --git a/etc/testcase/tempest.ipv6.yml b/etc/testcase/tempest.ipv6.yml
new file mode 100644
index 00000000..3c2c7984
--- /dev/null
+++ b/etc/testcase/tempest.ipv6.yml
@@ -0,0 +1,68 @@
+---
+dovetail.tempest.ipv6:
+  name: dovetail.tempest.ipv6
+  objective: IPv6 tenant network capabilities
+  validate:
+    type: functest
+    testcase: tempest_custom
+    pre_condition:
+      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
+      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
+    pre_copy:
+      src_file: tempest_custom.txt
+      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
+  report:
+    sub_testcase_list:
+      - tempest.api.network.test_networks.BulkNetworkOpsIpV6Test.test_bulk_create_delete_network[id-d4f9024d-1e28-4fc1-a6b1-25dbc6fa11e2,smoke]
+      - tempest.api.network.test_networks.BulkNetworkOpsIpV6Test.test_bulk_create_delete_port[id-48037ff2-e889-4c3b-b86a-8e3f34d2d060,smoke]
+      - tempest.api.network.test_networks.BulkNetworkOpsIpV6Test.test_bulk_create_delete_subnet[id-8936533b-c0aa-4f29-8e53-6cc873aec489,smoke]
+      #
+      - tempest.api.network.test_networks.NetworksIpV6Test.test_create_update_delete_network_subnet[id-0e269138-0da6-4efc-a46d-578161e7b221,smoke]
+      #
+      - tempest.api.network.test_networks.NetworksIpV6Test.test_external_network_visibility[id-af774677-42a9-4e4b-bb58-16fe6a5bc1ec,smoke]
+      #
+      - tempest.api.network.test_networks.NetworksIpV6Test.test_list_networks[id-f7ffdeda-e200-4a7a-bcbe-05716e86bf43,smoke]
+      - tempest.api.network.test_networks.NetworksIpV6Test.test_list_subnets[id-db68ba48-f4ea-49e9-81d1-e367f6d0b20a,smoke]
+      #
+      - tempest.api.network.test_networks.NetworksIpV6Test.test_show_network[id-2bf13842-c93f-4a69-83ed-717d2ec3b44e,smoke]
+      - tempest.api.network.test_networks.NetworksIpV6Test.test_show_subnet[id-bd635d81-6030-4dd1-b3b9-31ba0cfdf6cc,smoke]
+      #
+      - tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_port_in_allowed_allocation_pools[id-0435f278-40ae-48cb-a404-b8a087bc09b1,smoke]
+      #
+      - tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_port_with_no_securitygroups[id-4179dcb9-1382-4ced-84fe-1b91c54f5735,smoke]
+      #
+      - tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_update_delete_port[id-c72c1c0c-2193-4aca-aaa4-b1442640f51c,smoke]
+      #
+      - tempest.api.network.test_ports.PortsIpV6TestJSON.test_list_ports[id-cf95b358-3e92-4a29-a148-52445e1ac50e,smoke]
+      #
+      - tempest.api.network.test_ports.PortsIpV6TestJSON.test_show_port[id-c9a685bd-e83f-499c-939f-9f7863ca259f,smoke]
+      #
+      - tempest.api.network.test_routers.RoutersIpV6Test.test_add_multiple_router_interfaces[id-802c73c9-c937-4cef-824b-2191e24a6aab,smoke]
+      #
+      - tempest.api.network.test_routers.RoutersIpV6Test.test_add_remove_router_interface_with_port_id[id-2b7d2f37-6748-4d78-92e5-1d590234f0d5,smoke]
+      #
+      - tempest.api.network.test_routers.RoutersIpV6Test.test_add_remove_router_interface_with_subnet_id[id-b42e6e39-2e37-49cc-a6f4-8467e940900a,smoke]
+      #
+      - tempest.api.network.test_routers.RoutersIpV6Test.test_create_show_list_update_delete_router[id-f64403e2-8483-4b34-8ccd-b09a87bcc68c,smoke]
+      #
+      - tempest.api.network.test_security_groups.SecGroupIPv6Test.test_create_list_update_show_delete_security_group[id-bfd128e5-3c92-44b6-9d66-7fe29d22c802,smoke]
+      #
+      - tempest.api.network.test_security_groups.SecGroupIPv6Test.test_create_show_delete_security_group_rule[id-cfb99e0e-7410-4a3d-8a0c-959a63ee77e9,smoke]
+      #
+      - tempest.api.network.test_security_groups.SecGroupIPv6Test.test_list_security_groups[id-e30abd17-fef9-4739-8617-dc26da88e686,smoke]
+      #
+      - tempest.scenario.test_network_v6.TestGettingAddress.test_dhcp6_stateless_from_os[compute,id-d7e1f858-187c-45a6-89c9-bdafde619a9f,network,slow]
+      #
+      - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_dhcp6_stateless_from_os[compute,id-76f26acd-9688-42b4-bc3e-cd134c4cb09e,network,slow]
+      #
+      - tempest.scenario.test_network_v6.TestGettingAddress.test_multi_prefix_dhcpv6_stateless[compute,id-7ab23f41-833b-4a16-a7c9-5b42fe6d4123,network,slow]
+      #
+      - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_multi_prefix_dhcpv6_stateless[compute,id-cf1c4425-766b-45b8-be35-e2959728eb00,network]
+      #
+      - 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]
\ No newline at end of file
diff --git a/etc/testcase/tempest.tc005.yml b/etc/testcase/tempest.multi_node_scheduling.yml
index 8f629bdb..47eef0a0 100644
--- a/etc/testcase/tempest.tc005.yml
+++ b/etc/testcase/tempest.multi_node_scheduling.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.tempest.tc005:
-  name: dovetail.tempest.tc005
+dovetail.tempest.multi_node_scheduling:
+  name: dovetail.tempest.multi_node_scheduling
   objective: simple virtual machine resource scheduling on multiple nodes
   validate:
     type: functest
diff --git a/etc/testcase/smoke.tempest_network.yml b/etc/testcase/tempest.network.yml
index 431faf32..ae27eef5 100644
--- a/etc/testcase/smoke.tempest_network.yml
+++ b/etc/testcase/tempest.network.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.smoke.tempest_network:
-  name: dovetail.smoke.tempest_network
+dovetail.tempest.network:
+  name: dovetail.tempest.network
   objective: tempest smoke test cases about network
   validate:
     type: functest
@@ -27,3 +27,11 @@ dovetail.smoke.tempest_network:
       - tempest.api.network.test_routers.RoutersTest.test_create_show_list_update_delete_router[id-f64403e2-8483-4b34-8ccd-b09a87bcc68c,smoke]
       - tempest.api.network.test_subnetpools_extensions.SubnetPoolsTestJSON.test_create_list_show_update_delete_subnetpools[id-62595970-ab1c-4b7f-8fcc-fddfe55e9811,smoke]
       - tempest.api.network.test_versions.NetworksApiDiscovery.test_api_version_resources[id-cac8a836-c2e0-4304-b556-cd299c7281d1,smoke]
+      #
+      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_mtu_sized_frames[compute,id-b158ea55-472e-4086-8fa9-c64ac0c6c1d0,network]
+      #
+      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_hotplug_nic[compute,id-c5adff73-e961-41f1-b4a9-343614f18cfa,network]
+      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops[compute,id-f323b3ba-82f8-4db7-8ea6-6a895869ec49,network,smoke]
+      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_subnet_details[compute,id-d8bb918e-e2df-48b2-97cd-b73c95450980,network]
+      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_update_instance_port_admin_state[compute,id-f5dfcc22-45fd-409f-954c-5bd500d7890b,network]
+      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_update_router_admin_state[compute,id-04b9fe4e-85e8-4aea-b937-ea93885ac59f,network]
diff --git a/etc/testcase/tempest.tc002.yml b/etc/testcase/tempest.network_security.yml
index 36fe9b36..48bb00c4 100644
--- a/etc/testcase/tempest.tc002.yml
+++ b/etc/testcase/tempest.network_security.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.tempest.tc002:
-  name: dovetail.tempest.tc002
+dovetail.tempest.network_security:
+  name: dovetail.tempest.network_security
   objective: filtering packets based on security rules and port security in data path
   validate:
     type: functest
diff --git a/etc/testcase/smoke.tempest_orchestration.yml b/etc/testcase/tempest.orchestration.yml
index d544a23f..75d8a8c9 100644
--- a/etc/testcase/smoke.tempest_orchestration.yml
+++ b/etc/testcase/tempest.orchestration.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.smoke.tempest_orchestration:
-  name: dovetail.smoke.tempest_orchestration
+dovetail.tempest.orchestration:
+  name: dovetail.tempest.orchestration
   objective: tempest smoke test cases about orchestration
   validate:
     type: functest
diff --git a/etc/testcase/osinterop.tc001.yml b/etc/testcase/tempest.osinterop.yml
index e375da6d..b9c08e47 100644
--- a/etc/testcase/osinterop.tc001.yml
+++ b/etc/testcase/tempest.osinterop.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.osinterop.tc001:
-  name: dovetail.osinterop.tc001
+dovetail.tempest.osinterop:
+  name: dovetail.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:
diff --git a/etc/testcase/tempest.tc001.yml b/etc/testcase/tempest.tc001.yml
deleted file mode 100644
index b93363ea..00000000
--- a/etc/testcase/tempest.tc001.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.tempest.tc001:
-  name: dovetail.tempest.tc001
-  objective: forwarding packets through virtual networks in data path
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_mtu_sized_frames[compute,id-b158ea55-472e-4086-8fa9-c64ac0c6c1d0,network]
diff --git a/etc/testcase/tempest.tc003.yml b/etc/testcase/tempest.tc003.yml
deleted file mode 100644
index 980cc367..00000000
--- a/etc/testcase/tempest.tc003.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-dovetail.tempest.tc003:
-  name: dovetail.tempest.tc003
-  objective: dynamic network runtime operations through the life of a VNF
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_hotplug_nic[compute,id-c5adff73-e961-41f1-b4a9-343614f18cfa,network]
-      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops[compute,id-f323b3ba-82f8-4db7-8ea6-6a895869ec49,network,smoke]
-      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_subnet_details[compute,id-d8bb918e-e2df-48b2-97cd-b73c95450980,network]
-      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_update_instance_port_admin_state[compute,id-f5dfcc22-45fd-409f-954c-5bd500d7890b,network]
-      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_update_router_admin_state[compute,id-04b9fe4e-85e8-4aea-b937-ea93885ac59f,network]
diff --git a/etc/testcase/tempest.tc004.yml b/etc/testcase/tempest.vm_lifecycle.yml
index 2df96cac..09ce65d4 100644
--- a/etc/testcase/tempest.tc004.yml
+++ b/etc/testcase/tempest.vm_lifecycle.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.tempest.tc004:
-  name: dovetail.tempest.tc004
+dovetail.tempest.vm_lifecycle:
+  name: dovetail.tempest.vm_lifecycle
   objective: correct behavior after common virtual machine life cycles events
   validate:
     type: functest
diff --git a/etc/testcase/smoke.tempest_volume.yml b/etc/testcase/tempest.volume.yml
index 0a6e3b6f..ce43271f 100644
--- a/etc/testcase/smoke.tempest_volume.yml
+++ b/etc/testcase/tempest.volume.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.smoke.tempest_volume:
-  name: dovetail.smoke.tempest_volume
+dovetail.tempest.volume:
+  name: dovetail.tempest.volume
   objective: tempest smoke test cases about volume
   validate:
     type: functest
@@ -17,3 +17,6 @@ dovetail.smoke.tempest_volume:
       - tempest.api.volume.test_volumes_get.VolumesV1GetTest.test_volume_create_get_update_delete[id-27fb0e9f-fb64-41dd-8bdb-1ffa762f0d51,smoke]
       - tempest.api.volume.test_volumes_get.VolumesV1GetTest.test_volume_create_get_update_delete_from_image[id-54a01030-c7fc-447c-86ee-c1182beae638,image,smoke]
       - tempest.api.volume.test_volumes_list.VolumesV1ListTestJSON.test_volume_list[id-0b6ddd39-b948-471f-8038-4787978747c4,smoke]
+      #
+      - tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern[compute,id-557cd2c2-4eb8-4dce-98be-f86765ff311b,image,smoke,volume]
+      - tempest.scenario.test_volume_boot_pattern.TestVolumeBootPatternV2.test_volume_boot_pattern[compute,id-557cd2c2-4eb8-4dce-98be-f86765ff311b,image,smoke,volum
diff --git a/etc/testcase/vnf.tc001.yml b/etc/testcase/vnf.vims.yml
index 5fe02fb3..4a36fe08 100644
--- a/etc/testcase/vnf.tc001.yml
+++ b/etc/testcase/vnf.vims.yml
@@ -1,7 +1,7 @@
 ---
-dovetail.vnf.tc001:
-  name: dovetail.vnf.tc001
-  objective: testing for Cleawater IMS deployment using Cloudify orchestrator
+dovetail.vnf.vims:
+  name: dovetail.vnf.vims
+  objective: testing for Clearwater IMS deployment using Cloudify orchestrator
   validate:
     type: functest
     testcase: cloudify_ims
diff --git a/etc/testcase/vping.tc002.yml b/etc/testcase/vping.ssh.yml
index a800a4db..a46bcc89 100644
--- a/etc/testcase/vping.tc002.yml
+++ b/etc/testcase/vping.ssh.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.vping.tc002:
-  name: dovetail.vping.tc002
+dovetail.vping.ssh:
+  name: dovetail.vping.ssh
   objective: testing for vping using ssh
   validate:
     type: functest
diff --git a/etc/testcase/vping.tc001.yml b/etc/testcase/vping.userdata.yml
index e3b501be..9a6f4c5a 100644
--- a/etc/testcase/vping.tc001.yml
+++ b/etc/testcase/vping.userdata.yml
@@ -1,6 +1,6 @@
 ---
-dovetail.vping.tc001:
-  name: dovetail.vping.tc001
+dovetail.vping.userdata:
+  name: dovetail.vping.userdata
   objective: testing for vping using userdata
   validate:
     type: functest