[dovetail tool] support shell scripts for testcase validation

JIRA: DOVETAIL-46

1. for now a testcase has two kinds of validation types(functest, yardstick),
and it is not enough to check the complete funcionality
2. add new validation type(shell) for extra validation of the test case to make
result more accurate and more convincing.

Change-Id: I45dca6b8dbd888757da163189d261f6e4dba5034
Signed-off-by: Leo Wang <grakiss.wanglei@huawei.com>

35 files changed, 107 insertions, 33 deletions

diff --git a/dovetail/testcase/example.tc001.yml b/dovetail/testcase/example.tc001.yml
new file mode 100644
index 00000000..eaf7e754
--- /dev/null
+++ b/dovetail/testcase/example.tc001.yml
@@ -0,0 +1,18 @@
+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}}'
+    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/dovetail/testcase/example.tc002.yml b/dovetail/testcase/example.tc002.yml
new file mode 100644
index 00000000..89d000c9
--- /dev/null
+++ b/dovetail/testcase/example.tc002.yml
@@ -0,0 +1,15 @@
+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"
+    post_condition:
+      - "echo post_condition"
+  report:
+    sub_testcase_list:
+
diff --git a/dovetail/testcase/ipv6.tc001.yml b/dovetail/testcase/ipv6.tc001.yml
index 1d9a9c38..0bc0baaa 100644
--- a/dovetail/testcase/ipv6.tc001.yml
+++ b/dovetail/testcase/ipv6.tc001.yml
@@ -1,9 +1,17 @@
 dovetail.ipv6.tc001:
   name: dovetail.ipv6.tc001
   objective: Bulk creation and deletion of IPv6 networks, ports and subnets
-  scripts:
+  validate:
     type: functest
     testcase: tempest_smoke_serial
+    pre_condition:
+      - 'echo test for precondition'
+    cmds:
+      - 'functest env prepare'
+      - 'functest testcase run {{validate_testcase}}'
+    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
diff --git a/dovetail/testcase/ipv6.tc002.yml b/dovetail/testcase/ipv6.tc002.yml
index 86af7300..efdc7dce 100644
--- a/dovetail/testcase/ipv6.tc002.yml
+++ b/dovetail/testcase/ipv6.tc002.yml
@@ -1,9 +1,11 @@
 dovetail.ipv6.tc002:
   name: dovetail.ipv6.tc002
   objective: VIM ipv6 operations, to create/update/delete an IPv6 network and subnet
-  scripts:
+  validate:
     type: functest
     testcase: tempest_smoke_serial
+  report:
     sub_testcase_list:
       - tempest.api.network.test_networks.NetworksIpV6Test.test_create_update_delete_network_subnet
       - tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_create_update_delete_network_subnet
+
diff --git a/dovetail/testcase/ipv6.tc003.yml b/dovetail/testcase/ipv6.tc003.yml
index 1fedf32c..0b7dc9b2 100644
--- a/dovetail/testcase/ipv6.tc003.yml
+++ b/dovetail/testcase/ipv6.tc003.yml
@@ -1,9 +1,10 @@
 dovetail.ipv6.tc003:
   name: dovetail.ipv6.tc003
   objective: VIM ipv6 operations, to check external network visibility
-  scripts:
+  validate:
     type: functest
     testcase: tempest_smoke_serial
+  report:
     sub_testcase_list:
       - tempest.api.network.test_networks.NetworksIpV6Test.test_external_network_visibility
       - tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_external_network_visibility
diff --git a/dovetail/testcase/ipv6.tc004.yml b/dovetail/testcase/ipv6.tc004.yml
index 53f9f2ed..10a977e1 100644
--- a/dovetail/testcase/ipv6.tc004.yml
+++ b/dovetail/testcase/ipv6.tc004.yml
@@ -1,9 +1,10 @@
 dovetail.ipv6.tc004:
   name: dovetail.ipv6.tc004
   objective: VIM ipv6 operations, to list IPv6 networks and subnets of a tenant
-  scripts:
+  validate:
     type: functest
     testcase: tempest_smoke_serial
+  report:
     sub_testcase_list:
       - tempest.api.network.test_networks.NetworksIpV6Test.test_list_networks
       - tempest.api.network.test_networks.NetworksIpV6Test.test_list_subnets
diff --git a/dovetail/testcase/ipv6.tc005.yml b/dovetail/testcase/ipv6.tc005.yml
index 737127ca..8d6deece 100644
--- a/dovetail/testcase/ipv6.tc005.yml
+++ b/dovetail/testcase/ipv6.tc005.yml
@@ -1,9 +1,10 @@
 dovetail.ipv6.tc005:
   name: dovetail.ipv6.tc005
   objective: VIM ipv6 operations, to show information of an IPv6 network and subnet
-  scripts:
+  validate:
     type: functest
     testcase: tempest_smoke_serial
+  report:
     sub_testcase_list:
       - tempest.api.network.test_networks.NetworksIpV6Test.test_show_network
       - tempest.api.network.test_networks.NetworksIpV6Test.test_show_subnet
diff --git a/dovetail/testcase/ipv6.tc006.yml b/dovetail/testcase/ipv6.tc006.yml
index 2aff3bba..96a902c5 100644
--- a/dovetail/testcase/ipv6.tc006.yml
+++ b/dovetail/testcase/ipv6.tc006.yml
@@ -1,8 +1,9 @@
 dovetail.ipv6.tc006:
   name: dovetail.ipv6.tc006
   objective: VIM ipv6 operations, to create an IPv6 port in allowed allocation pools
-  scripts:
+  validate:
     type: functest
     testcase: tempest_smoke_serial
+  report:
     sub_testcase_list:
       - tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_port_in_allowed_allocation_pools
diff --git a/dovetail/testcase/ipv6.tc007.yml b/dovetail/testcase/ipv6.tc007.yml
index 695ae2e6..9e9de499 100644
--- a/dovetail/testcase/ipv6.tc007.yml
+++ b/dovetail/testcase/ipv6.tc007.yml
@@ -1,8 +1,9 @@
 dovetail.ipv6.tc007:
   name: dovetail.ipv6.tc007
   objective: VIM ipv6 operations, to create an IPv6 port without security groups
-  scripts:
+  validate:
     type: functest
     testcase: tempest_smoke_serial
+  report:
     sub_testcase_list:
       - tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_port_with_no_securitygroups
diff --git a/dovetail/testcase/ipv6.tc008.yml b/dovetail/testcase/ipv6.tc008.yml
index f1889446..e057a570 100644
--- a/dovetail/testcase/ipv6.tc008.yml
+++ b/dovetail/testcase/ipv6.tc008.yml
@@ -1,8 +1,9 @@
 dovetail.ipv6.tc008:
   name: dovetail.ipv6.tc008
   objective: VIM ipv6 operations, to create/update/delete an IPv6 port
-  scripts:
+  validate:
     type: functest
     testcase: tempest_smoke_serial
+  report:
     sub_testcase_list:
       - tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_update_delete_port
diff --git a/dovetail/testcase/ipv6.tc009.yml b/dovetail/testcase/ipv6.tc009.yml
index 790c0ec7..56e8015b 100644
--- a/dovetail/testcase/ipv6.tc009.yml
+++ b/dovetail/testcase/ipv6.tc009.yml
@@ -1,8 +1,9 @@
 dovetail.ipv6.tc009:
   name: dovetail.ipv6.tc009
   objective: VIM ipv6 operations, to list IPv6 ports of a tenant
-  scripts:
+  validate:
     type: functest
     testcase: tempest_smoke_serial
+  report:
     sub_testcase_list:
       - tempest.api.network.test_ports.PortsIpV6TestJSON.test_list_ports
diff --git a/dovetail/testcase/ipv6.tc010.yml b/dovetail/testcase/ipv6.tc010.yml
index 35d8ee91..eb055ec6 100644
--- a/dovetail/testcase/ipv6.tc010.yml
+++ b/dovetail/testcase/ipv6.tc010.yml
@@ -1,8 +1,9 @@
 dovetail.ipv6.tc010:
   name: dovetail.ipv6.tc010
   objective: VIM ipv6 operations, to show information of an IPv6 port
-  scripts:
+  validate:
     type: functest
     testcase: tempest_smoke_serial
+  report:
     sub_testcase_list:
       - tempest.api.network.test_ports.PortsIpV6TestJSON.test_show_port
diff --git a/dovetail/testcase/ipv6.tc011.yml b/dovetail/testcase/ipv6.tc011.yml
index db3d155e..caf44cf0 100644
--- a/dovetail/testcase/ipv6.tc011.yml
+++ b/dovetail/testcase/ipv6.tc011.yml
@@ -1,8 +1,9 @@
 dovetail.ipv6.tc011:
   name: dovetail.ipv6.tc011
   objective: VIM ipv6 operations, to add multiple interfaces for an IPv6 router
-  scripts:
+  validate:
     type: functest
     testcase: tempest_smoke_serial
+  report:
     sub_testcase_list:
       - tempest.api.network.test_routers.RoutersIpV6Test.test_add_multiple_router_interfaces
diff --git a/dovetail/testcase/ipv6.tc012.yml b/dovetail/testcase/ipv6.tc012.yml
index 2b471342..ab8e7c48 100644
--- a/dovetail/testcase/ipv6.tc012.yml
+++ b/dovetail/testcase/ipv6.tc012.yml
@@ -1,8 +1,9 @@
 dovetail.ipv6.tc012:
   name: dovetail.ipv6.tc012
   objective: VIM ipv6 operations, to add and remove an IPv6 router interface with port_id
-  scripts:
+  validate:
     type: functest
     testcase: tempest_smoke_serial
+  report:
     sub_testcase_list:
       - tempest.api.network.test_routers.RoutersIpV6Test.test_add_remove_router_interface_with_port_id
diff --git a/dovetail/testcase/ipv6.tc013.yml b/dovetail/testcase/ipv6.tc013.yml
index ca52a434..58732624 100644
--- a/dovetail/testcase/ipv6.tc013.yml
+++ b/dovetail/testcase/ipv6.tc013.yml
@@ -1,8 +1,9 @@
 dovetail.ipv6.tc013:
   name: dovetail.ipv6.tc013
   objective: VIM ipv6 operations, to add and remove an IPv6 router interface with subnet_id
-  scripts:
+  validate:
     type: functest
     testcase: tempest_smoke_serial
+  report:
     sub_testcase_list:
       - tempest.api.network.test_routers.RoutersIpV6Test.test_add_remove_router_interface_with_subnet_id
diff --git a/dovetail/testcase/ipv6.tc014.yml b/dovetail/testcase/ipv6.tc014.yml
index 0982ad09..c8c6de1c 100644
--- a/dovetail/testcase/ipv6.tc014.yml
+++ b/dovetail/testcase/ipv6.tc014.yml
@@ -1,8 +1,9 @@
 dovetail.ipv6.tc014:
   name: dovetail.ipv6.tc014
   objective: VIM ipv6 operations, to create, update, delete, list and show an IPv6 router
-  scripts:
+  validate:
     type: functest
     testcase: tempest_smoke_serial
+  report:
     sub_testcase_list:
       - tempest.api.network.test_routers.RoutersIpV6Test.test_create_show_list_update_delete_router
diff --git a/dovetail/testcase/ipv6.tc015.yml b/dovetail/testcase/ipv6.tc015.yml
index f4c38ac4..e3a47261 100644
--- a/dovetail/testcase/ipv6.tc015.yml
+++ b/dovetail/testcase/ipv6.tc015.yml
@@ -1,8 +1,9 @@
 dovetail.ipv6.tc015:
   name: dovetail.ipv6.tc015
   objective: VIM ipv6 operations, to create, update, delete, list and show an IPv6 security group
-  scripts:
+  validate:
     type: functest
     testcase: tempest_smoke_serial
+  report:
     sub_testcase_list:
       - tempest.api.network.test_security_groups.SecGroupIPv6Test.test_create_list_update_show_delete_security_group
diff --git a/dovetail/testcase/ipv6.tc016.yml b/dovetail/testcase/ipv6.tc016.yml
index 0bc17c1b..8195e59c 100644
--- a/dovetail/testcase/ipv6.tc016.yml
+++ b/dovetail/testcase/ipv6.tc016.yml
@@ -1,8 +1,9 @@
 dovetail.ipv6.tc016:
   name: dovetail.ipv6.tc016
   objective: VIM ipv6 operations, to create, delete and show security group rules
-  scripts:
+  validate:
     type: functest
     testcase: tempest_smoke_serial
+  report:
     sub_testcase_list:
       - tempest.api.network.test_security_groups.SecGroupIPv6Test.test_create_show_delete_security_group_rule
diff --git a/dovetail/testcase/ipv6.tc017.yml b/dovetail/testcase/ipv6.tc017.yml
index 1df7caf4..8b7ae5fc 100644
--- a/dovetail/testcase/ipv6.tc017.yml
+++ b/dovetail/testcase/ipv6.tc017.yml
@@ -1,8 +1,9 @@
 dovetail.ipv6.tc017:
   name: dovetail.ipv6.tc017
   objective: VIM ipv6 operations, to list all security groups
-  scripts:
+  validate:
     type: functest
     testcase: tempest_smoke_serial
+  report:
     sub_testcase_list:
       - tempest.api.network.test_security_groups.SecGroupIPv6Test.test_list_security_groups
diff --git a/dovetail/testcase/ipv6.tc018.yml b/dovetail/testcase/ipv6.tc018.yml
index 01c4d3f7..be888b4f 100644
--- a/dovetail/testcase/ipv6.tc018.yml
+++ b/dovetail/testcase/ipv6.tc018.yml
@@ -1,8 +1,9 @@
 dovetail.ipv6.tc018:
   name: dovetail.ipv6.tc018
   objective: VIM ipv6 operations, to show information of an IPv6 port
-  scripts:
+  validate:
     type: functest
     testcase: tempest_full_parallel
+  report:
     sub_testcase_list:
       - tempest.scenario.test_network_v6.TestGettingAddress.test_dhcp6_stateless_from_os
diff --git a/dovetail/testcase/ipv6.tc019.yml b/dovetail/testcase/ipv6.tc019.yml
index d44b9309..524d0a4c 100644
--- a/dovetail/testcase/ipv6.tc019.yml
+++ b/dovetail/testcase/ipv6.tc019.yml
@@ -1,8 +1,9 @@
 dovetail.ipv6.tc019:
   name: dovetail.ipv6.tc019
   objective: VIM ipv6 operations, to do IPv6 address assignment - dual stack, DHCPv6 stateless
-  scripts:
+  validate:
     type: functest
     testcase: tempest_full_parallel
+  report:
     sub_testcase_list:
       - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_dhcp6_stateless_from_os
diff --git a/dovetail/testcase/ipv6.tc020.yml b/dovetail/testcase/ipv6.tc020.yml
index e974e083..4cc65e1a 100644
--- a/dovetail/testcase/ipv6.tc020.yml
+++ b/dovetail/testcase/ipv6.tc020.yml
@@ -1,8 +1,9 @@
 dovetail.ipv6.tc020:
   name: dovetail.ipv6.tc020
   objective: VIM ipv6 operations, to do IPv6 Address Assignment - Multiple Prefixes, DHCPv6 Stateless
-  scripts:
+  validate:
     type: functest
     testcase: tempest_full_parallel
+  report:
     sub_testcase_list:
       - tempest.scenario.test_network_v6.TestGettingAddress.test_multi_prefix_dhcpv6_stateless
diff --git a/dovetail/testcase/ipv6.tc021.yml b/dovetail/testcase/ipv6.tc021.yml
index 20544530..199336aa 100644
--- a/dovetail/testcase/ipv6.tc021.yml
+++ b/dovetail/testcase/ipv6.tc021.yml
@@ -1,8 +1,9 @@
 dovetail.ipv6.tc021:
   name: dovetail.ipv6.tc021
   objective: VIM ipv6 operations, to do IPv6 Address Assignment - Dual Stack, Multiple Prefixes, DHCPv6 Stateless
-  scripts:
+  validate:
     type: functest
     testcase: tempest_full_parallel
+  report:
     sub_testcase_list:
       - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_multi_prefix_dhcpv6_stateless
diff --git a/dovetail/testcase/ipv6.tc022.yml b/dovetail/testcase/ipv6.tc022.yml
index e01c5b6f..1e6cf0bd 100644
--- a/dovetail/testcase/ipv6.tc022.yml
+++ b/dovetail/testcase/ipv6.tc022.yml
@@ -1,8 +1,9 @@
 dovetail.ipv6.tc022:
   name: dovetail.ipv6.tc022
   objective: VIM ipv6 operations, to do IPv6 Address Assignment - SLAAC
-  scripts:
+  validate:
     type: functest
     testcase: tempest_full_parallel
+  report:
     sub_testcase_list:
       - tempest.scenario.test_network_v6.TestGettingAddress.test_slaac_from_os
diff --git a/dovetail/testcase/ipv6.tc023.yml b/dovetail/testcase/ipv6.tc023.yml
index cd17501d..1c735f0a 100644
--- a/dovetail/testcase/ipv6.tc023.yml
+++ b/dovetail/testcase/ipv6.tc023.yml
@@ -1,8 +1,9 @@
 dovetail.ipv6.tc023:
   name: dovetail.ipv6.tc023
   objective: VIM ipv6 operations, to do IPv6 Address Assignment - Dual Stack, SLAAC
-  scripts:
+  validate:
     type: functest
     testcase: tempest_full_parallel
+  report:
     sub_testcase_list:
       - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_dhcp6_stateless_from_os
diff --git a/dovetail/testcase/ipv6.tc024.yml b/dovetail/testcase/ipv6.tc024.yml
index 1c8a93f8..010008db 100644
--- a/dovetail/testcase/ipv6.tc024.yml
+++ b/dovetail/testcase/ipv6.tc024.yml
@@ -1,8 +1,9 @@
 dovetail.ipv6.tc024:
   name: dovetail.ipv6.tc024
   objective: VIM ipv6 operations, to do IPv6 address assignment - multiple prefixes, SLAAC
-  scripts:
+  validate:
     type: functest
     testcase: tempest_full_parallel
+  report:
     sub_testcase_list:
       - tempest.scenario.test_network_v6.TestGettingAddress.test_multi_prefix_slaac
diff --git a/dovetail/testcase/ipv6.tc025.yml b/dovetail/testcase/ipv6.tc025.yml
index 3f9d97b8..d735a60f 100644
--- a/dovetail/testcase/ipv6.tc025.yml
+++ b/dovetail/testcase/ipv6.tc025.yml
@@ -1,8 +1,9 @@
 dovetail.ipv6.tc025:
   name: dovetail.ipv6.tc025
   objective: VIM ipv6 operations, to do IPv6 address assignment - dual stack, multiple prefixes, SLAAC
-  scripts:
+  validate:
     type: functest
     testcase: tempest_full_parallel
+  report:
     sub_testcase_list:
       - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_multi_prefix_slaac
diff --git a/dovetail/testcase/nfvi.tc001.yml b/dovetail/testcase/nfvi.tc001.yml
index 136fd9d1..b796e803 100644
--- a/dovetail/testcase/nfvi.tc001.yml
+++ b/dovetail/testcase/nfvi.tc001.yml
@@ -1,7 +1,8 @@
 dovetail.nfvi.tc001:
   name: dovetail.nfvi.tc001
   objective: testing for vping using ssh
-  scripts:
+  validate:
     type: functest
     testcase: vping_ssh
+  report:
     sub_testcase_list:
diff --git a/dovetail/testcase/nfvi.tc002.yml b/dovetail/testcase/nfvi.tc002.yml
index f5724c56..d9413477 100644
--- a/dovetail/testcase/nfvi.tc002.yml
+++ b/dovetail/testcase/nfvi.tc002.yml
@@ -1,7 +1,8 @@
 dovetail.nfvi.tc002:
   name: dovetail.nfvi.tc002
   objective: testing for vping using userdata
-  scripts:
+  validate:
     type: functest
     testcase: vping_userdata
+  report:
     sub_testcase_list:
diff --git a/dovetail/testcase/vimops.tc001.yml b/dovetail/testcase/vimops.tc001.yml
index 3d2ba0c0..5f8da6a1 100644
--- a/dovetail/testcase/vimops.tc001.yml
+++ b/dovetail/testcase/vimops.tc001.yml
@@ -1,8 +1,9 @@
 dovetail.vimops.tc001:
   name: dovetail.vimops.tc001
   objective: Glance images v2 index
-  scripts:
+  validate:
     type: functest
     testcase: tempest_full_parallel
+  report:
     sub_testcase_list:
       - tempest.api.image.v2.test_images.ListImagesTest.test_list_no_params
diff --git a/dovetail/testcase/vimops.tc002.yml b/dovetail/testcase/vimops.tc002.yml
index 15f5bf08..90201f56 100644
--- a/dovetail/testcase/vimops.tc002.yml
+++ b/dovetail/testcase/vimops.tc002.yml
@@ -1,9 +1,10 @@
 dovetail.vimops.tc002:
   name: dovetail.vimops.tc002
   objective: Glance Images v2 Delete
-  scripts:
+  validate:
     type: functest
     testcase: tempest_full_parallel
+  report:
     sub_testcase_list:
       - tempest.api.image.v2.test_images.BasicOperationsImagesTest.test_delete_image
       - tempest.api.image.v2.test_images_negative.ImagesNegativeTest.test_delete_image_null_id
diff --git a/dovetail/testcase/vimops.tc003.yml b/dovetail/testcase/vimops.tc003.yml
index 418c041c..d63a17c4 100644
--- a/dovetail/testcase/vimops.tc003.yml
+++ b/dovetail/testcase/vimops.tc003.yml
@@ -1,9 +1,10 @@
 dovetail.vimops.tc003:
   name: dovetail.vimops.tc003
   objective: Glance images v2 list
-  scripts:
+  validate:
     type: functest
     testcase: tempest_full_parallel
+  report:
     sub_testcase_list:
       - tempest.api.image.v2.test_images.ListImagesTest.test_get_image_schema
       - tempest.api.image.v2.test_images.ListImagesTest.test_get_images_schema
diff --git a/dovetail/testcase/vimops.tc004.yml b/dovetail/testcase/vimops.tc004.yml
index 3d205a38..3f924a4c 100644
--- a/dovetail/testcase/vimops.tc004.yml
+++ b/dovetail/testcase/vimops.tc004.yml
@@ -1,9 +1,10 @@
 dovetail.vimops.tc004:
   name: dovetail.vimops.tc004
   objective: Glance images v2 list
-  scripts:
+  validate:
     type: functest
     testcase: tempest_full_parallel
+  report:
     sub_testcase_list:
       - tempest.api.image.v2.test_images.ListImagesTest.test_list_images_param_container_format
       - tempest.api.image.v2.test_images.ListImagesTest.test_list_images_param_disk_format
diff --git a/dovetail/testcase/vimops.tc005.yml b/dovetail/testcase/vimops.tc005.yml
index d9413849..acaad685 100644
--- a/dovetail/testcase/vimops.tc005.yml
+++ b/dovetail/testcase/vimops.tc005.yml
@@ -1,9 +1,10 @@
 dovetail.vimops.tc005:
   name: dovetail.vimops.tc005
   objective: Glance images v2 import
-  scripts:
+  validate:
     type: functest
     testcase: tempest_full_parallel
+  report:
     sub_testcase_list:
       - tempest.api.image.v2.test_images.BasicOperationsImagesTest.test_register_upload_get_image_file
       - tempest.api.image.v2.test_images_negative.ImagesNegativeTest.test_register_with_invalid_container_format
diff --git a/dovetail/testcase/vimops.tc006.yml b/dovetail/testcase/vimops.tc006.yml
index 0676c317..68e2ca05 100644
--- a/dovetail/testcase/vimops.tc006.yml
+++ b/dovetail/testcase/vimops.tc006.yml
@@ -1,9 +1,10 @@
 dovetail.vimops.tc006:
   name: dovetail.vimops.tc006
   objective: Glance images v2 update
-  scripts:
+  validate:
     type: functest
     testcase: tempest_full_parallel
+  report:
     sub_testcase_list:
       - tempest.api.image.v2.test_images.BasicOperationsImagesTest.test_update_image
       - tempest.api.image.v2.test_images_tags.ImagesTagsTest.test_update_delete_tags_for_image