Refactor rally task scenario files

Use a dedicated scenario file for each scenario (full, sanity) instead
of a shared one.

JIRA: FUNCTEST-501

Change-Id: Icd45d6bf11b605f073c2667e9948589ee0a3b75c
Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>

10 files changed, 434 insertions, 309 deletions

diff --git a/testcases/OpenStack/rally/run_rally-cert.py b/testcases/OpenStack/rally/run_rally-cert.py
index 29fd0a334..d35639cc8 100755
--- a/testcases/OpenStack/rally/run_rally-cert.py
+++ b/testcases/OpenStack/rally/run_rally-cert.py
@@ -75,6 +75,8 @@ logger = ft_logger.Logger("run_rally").getLogger()
 HOME = os.environ['HOME'] + "/"
 RALLY_DIR = ft_utils.FUNCTEST_REPO + '/' + \
             ft_utils.get_functest_config('general.directories.dir_rally')
+SANITY_MODE_DIR = RALLY_DIR + "scenario/sanity"
+FULL_MODE_DIR = RALLY_DIR + "scenario/full"
 TEMPLATE_DIR = RALLY_DIR + "scenario/templates"
 SUPPORT_DIR = RALLY_DIR + "scenario/support"
 TEMP_DIR = RALLY_DIR + "var"
@@ -173,10 +175,8 @@ def build_task_args(test_file_name):
     task_args['concurrency'] = CONCURRENCY
 
     if args.sanity:
-        task_args['full_mode'] = False
         task_args['smoke'] = True
     else:
-        task_args['full_mode'] = True
         task_args['smoke'] = args.smoke
 
     ext_net = os_utils.get_external_net(neutron_client)
@@ -319,8 +319,16 @@ def prepare_test_list(test_name):
     scenario_file_name = '{}opnfv-{}.yaml'.format(RALLY_DIR + "scenario/",
                                                   test_name)
     if not os.path.exists(scenario_file_name):
-        logger.info("The scenario '%s' does not exist." % scenario_file_name)
-        exit(-1)
+        if args.sanity:
+            scenario_file_name = '{}opnfv-{}.yaml'.format(SANITY_MODE_DIR +
+                                                          "/", test_name)
+        else:
+            scenario_file_name = '{}opnfv-{}.yaml'.format(FULL_MODE_DIR +
+                                                          "/", test_name)
+        if not os.path.exists(scenario_file_name):
+            logger.info("The scenario '%s' does not exist."
+                        % scenario_file_name)
+            exit(-1)
 
     logger.debug('Scenario fetched from : {}'.format(scenario_file_name))
     test_file_name = '{}opnfv-{}.yaml'.format(TEMP_DIR + "/", test_name)
diff --git a/testcases/OpenStack/rally/scenario/opnfv-cinder.yaml b/testcases/OpenStack/rally/scenario/full/opnfv-cinder.yaml
index cb28ee84e..e844e33f6 100644
--- a/testcases/OpenStack/rally/scenario/opnfv-cinder.yaml
+++ b/testcases/OpenStack/rally/scenario/full/opnfv-cinder.yaml
@@ -1,7 +1,3 @@
-{# all scenarios included only in full mode #}
-
-{% if full_mode %}
-
   CinderVolumes.create_and_attach_volume:
     -
       args:
@@ -184,8 +180,6 @@
       sla:
         {{ no_failures_sla() }}
 
-{% endif %}
-
   CinderVolumes.create_and_delete_snapshot:
     -
       args:
diff --git a/testcases/OpenStack/rally/scenario/opnfv-heat.yaml b/testcases/OpenStack/rally/scenario/full/opnfv-heat.yaml
index 534d796ea..6f3a5c163 100644
--- a/testcases/OpenStack/rally/scenario/opnfv-heat.yaml
+++ b/testcases/OpenStack/rally/scenario/full/opnfv-heat.yaml
@@ -1,7 +1,3 @@
-{# all scenarios included only in full mode #}
-
-{% if full_mode %}
-
   HeatStacks.create_and_delete_stack:
     -
       args:
@@ -112,22 +108,6 @@
       sla:
         {{ no_failures_sla() }}
 
-{% else %}
-
-  HeatStacks.create_update_delete_stack:
-    -
-      args:
-        template_path: "{{ tmpl_dir }}/autoscaling_policy.yaml.template"
-        updated_template_path: "{{ tmpl_dir }}/updated_autoscaling_policy_inplace.yaml.template"
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-{% endif %}
-
   HeatStacks.create_check_delete_stack:
     -
       args:
diff --git a/testcases/OpenStack/rally/scenario/opnfv-neutron.yaml b/testcases/OpenStack/rally/scenario/full/opnfv-neutron.yaml
index 3804d2589..0a773533a 100644
--- a/testcases/OpenStack/rally/scenario/opnfv-neutron.yaml
+++ b/testcases/OpenStack/rally/scenario/full/opnfv-neutron.yaml
@@ -1,7 +1,3 @@
-{# all scenarios included only in full mode #}
-
-{% if full_mode %}
-
   NeutronNetworks.create_and_update_networks:
     -
       args:
@@ -89,8 +85,6 @@
       sla:
         {{ no_failures_sla() }}
 
-{% endif %}
-
   NeutronNetworks.create_and_delete_networks:
     -
       args:
diff --git a/testcases/OpenStack/rally/scenario/opnfv-nova.yaml b/testcases/OpenStack/rally/scenario/full/opnfv-nova.yaml
index f0fed8ef4..077850f53 100644
--- a/testcases/OpenStack/rally/scenario/opnfv-nova.yaml
+++ b/testcases/OpenStack/rally/scenario/full/opnfv-nova.yaml
@@ -1,7 +1,3 @@
-{# all scenarios included only in full mode #}
-
-{% if full_mode %}
-
   NovaKeypair.create_and_delete_keypair:
     -
       context:
@@ -278,7 +274,6 @@
         {{ no_failures_sla() }}
 
 {% endif %}
-{% endif %}
 
   NovaKeypair.boot_and_delete_server_with_keypair:
     -
diff --git a/testcases/OpenStack/rally/scenario/opnfv-smoke.yaml b/testcases/OpenStack/rally/scenario/opnfv-smoke.yaml
deleted file mode 100644
index f102edb2b..000000000
--- a/testcases/OpenStack/rally/scenario/opnfv-smoke.yaml
+++ /dev/null
@@ -1,268 +0,0 @@
-  TempestScenario.list_of_tests:
-  -
-    args:
-        tempest_conf: /etc/tempest/tempest.conf
-        test_names:
-        - tempest.api.compute.flavors.test_flavors.FlavorsV2TestJSON.test_get_flavor
-	- tempest.api.compute.flavors.test_flavors.FlavorsV2TestJSON.test_list_flavors
-	- tempest.api.compute.flavors.test_flavors.FlavorsV2TestJSON.test_list_flavors_with_detail
-	- tempest.api.compute.images.test_images_oneserver.ImagesOneServerTestJSON.test_create_delete_image
-	- tempest.api.compute.images.test_list_images.ListImagesTestJSON.test_get_image
-	- tempest.api.compute.images.test_list_images.ListImagesTestJSON.test_list_images
-	- tempest.api.compute.images.test_list_images.ListImagesTestJSON.test_list_images_with_detail
-	- tempest.api.compute.security_groups.test_security_group_rules.SecurityGroupRulesTestJSON.test_security_group_rules_create
-	- tempest.api.compute.security_groups.test_security_group_rules.SecurityGroupRulesTestJSON.test_security_group_rules_create_with_optional_cidr
-	- tempest.api.compute.security_groups.test_security_group_rules.SecurityGroupRulesTestJSON.test_security_group_rules_create_with_optional_group_id
-	- tempest.api.compute.security_groups.test_security_group_rules.SecurityGroupRulesTestJSON.test_security_group_rules_delete_when_peer_group_deleted
-	- tempest.api.compute.security_groups.test_security_group_rules.SecurityGroupRulesTestJSON.test_security_group_rules_list
-	- tempest.api.compute.security_groups.test_security_groups.SecurityGroupsTestJSON.test_security_group_create_get_delete
-	- tempest.api.compute.security_groups.test_security_groups.SecurityGroupsTestJSON.test_security_groups_create_list_delete
-	- tempest.api.compute.security_groups.test_security_groups.SecurityGroupsTestJSON.test_server_security_groups
-	- tempest.api.compute.security_groups.test_security_groups.SecurityGroupsTestJSON.test_update_security_groups
-	- tempest.api.compute.servers.test_attach_interfaces.AttachInterfacesTestJSON.test_add_remove_fixed_ip
-	- tempest.api.compute.servers.test_attach_interfaces.AttachInterfacesTestJSON.test_create_list_show_delete_interfaces
-	- tempest.api.compute.servers.test_create_server.ServersTestJSON.test_list_servers
-	- tempest.api.compute.servers.test_create_server.ServersTestJSON.test_list_servers_with_detail
-	- tempest.api.compute.servers.test_create_server.ServersTestJSON.test_verify_server_details
-	- tempest.api.compute.servers.test_create_server.ServersTestManualDisk.test_list_servers
-	- tempest.api.compute.servers.test_create_server.ServersTestManualDisk.test_list_servers_with_detail
-	- tempest.api.compute.servers.test_create_server.ServersTestManualDisk.test_verify_server_details
-	- tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_reboot_server_hard
-	- tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_reboot_server_soft
-	- tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_rebuild_server
-	- tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_resize_server_confirm
-	- tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_resize_server_confirm_from_stopped
-	- tempest.api.compute.servers.test_server_addresses.ServerAddressesTestJSON.test_list_server_addresses
-	- tempest.api.compute.servers.test_server_addresses.ServerAddressesTestJSON.test_list_server_addresses_by_network
-	- tempest.api.compute.servers.test_server_rescue.ServerRescueTestJSON.test_rescue_unrescue_instance
-	- tempest.api.compute.test_quotas.QuotasTestJSON.test_compare_tenant_quotas_with_default_quotas
-	- tempest.api.compute.test_quotas.QuotasTestJSON.test_get_default_quotas
-	- tempest.api.compute.test_quotas.QuotasTestJSON.test_get_quotas
-	- tempest.api.compute.volumes.test_volumes_get.VolumesGetTestJSON.test_volume_create_get_delete
-	- tempest.api.data_processing.test_cluster_templates.ClusterTemplateTest.test_cluster_template_create
-	- tempest.api.data_processing.test_cluster_templates.ClusterTemplateTest.test_cluster_template_delete
-	- tempest.api.data_processing.test_cluster_templates.ClusterTemplateTest.test_cluster_template_get
-	- tempest.api.data_processing.test_cluster_templates.ClusterTemplateTest.test_cluster_template_list
-	- tempest.api.data_processing.test_data_sources.DataSourceTest.test_external_hdfs_data_source_create
-	- tempest.api.data_processing.test_data_sources.DataSourceTest.test_external_hdfs_data_source_delete
-	- tempest.api.data_processing.test_data_sources.DataSourceTest.test_external_hdfs_data_source_get
-	- tempest.api.data_processing.test_data_sources.DataSourceTest.test_external_hdfs_data_source_list
-	- tempest.api.data_processing.test_data_sources.DataSourceTest.test_local_hdfs_data_source_create
-	- tempest.api.data_processing.test_data_sources.DataSourceTest.test_local_hdfs_data_source_delete
-	- tempest.api.data_processing.test_data_sources.DataSourceTest.test_local_hdfs_data_source_get
-	- tempest.api.data_processing.test_data_sources.DataSourceTest.test_local_hdfs_data_source_list
-	- tempest.api.data_processing.test_data_sources.DataSourceTest.test_swift_data_source_create
-	- tempest.api.data_processing.test_data_sources.DataSourceTest.test_swift_data_source_delete
-	- tempest.api.data_processing.test_data_sources.DataSourceTest.test_swift_data_source_get
-	- tempest.api.data_processing.test_data_sources.DataSourceTest.test_swift_data_source_list
-	- tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_internal_db_job_binary_create
-	- tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_internal_db_job_binary_delete
-	- tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_internal_db_job_binary_get
-	- tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_internal_db_job_binary_list
-	- tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_job_binary_get_data
-	- tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_swift_job_binary_create
-	- tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_swift_job_binary_delete
-	- tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_swift_job_binary_get
-	- tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_swift_job_binary_list
-	- tempest.api.data_processing.test_job_binary_internals.JobBinaryInternalTest.test_job_binary_internal_create
-	- tempest.api.data_processing.test_job_binary_internals.JobBinaryInternalTest.test_job_binary_internal_delete
-	- tempest.api.data_processing.test_job_binary_internals.JobBinaryInternalTest.test_job_binary_internal_get
-	- tempest.api.data_processing.test_job_binary_internals.JobBinaryInternalTest.test_job_binary_internal_get_data
-	- tempest.api.data_processing.test_job_binary_internals.JobBinaryInternalTest.test_job_binary_internal_list
-	- tempest.api.data_processing.test_jobs.JobTest.test_job_create
-	- tempest.api.data_processing.test_jobs.JobTest.test_job_delete
-	- tempest.api.data_processing.test_jobs.JobTest.test_job_get
-	- tempest.api.data_processing.test_jobs.JobTest.test_job_list
-	- tempest.api.data_processing.test_node_group_templates.NodeGroupTemplateTest.test_node_group_template_create
-	- tempest.api.data_processing.test_node_group_templates.NodeGroupTemplateTest.test_node_group_template_delete
-	- tempest.api.data_processing.test_node_group_templates.NodeGroupTemplateTest.test_node_group_template_get
-	- tempest.api.data_processing.test_node_group_templates.NodeGroupTemplateTest.test_node_group_template_list
-	- tempest.api.data_processing.test_plugins.PluginsTest.test_plugin_get
-	- tempest.api.data_processing.test_plugins.PluginsTest.test_plugin_list
-	- tempest.api.database.flavors.test_flavors.DatabaseFlavorsTest.test_compare_db_flavors_with_os
-	- tempest.api.database.flavors.test_flavors.DatabaseFlavorsTest.test_get_db_flavor
-	- tempest.api.database.flavors.test_flavors.DatabaseFlavorsTest.test_list_db_flavors
-	- tempest.api.database.limits.test_limits.DatabaseLimitsTest.test_absolute_limits
-	- tempest.api.database.versions.test_versions.DatabaseVersionsTest.test_list_db_versions
-	- tempest.api.identity.admin.v2.test_services.ServicesTestJSON.test_list_services
-	- tempest.api.identity.admin.v2.test_users.UsersTestJSON.test_create_user
-	- tempest.api.identity.admin.v3.test_credentials.CredentialsTestJSON.test_credentials_create_get_update_delete
-	- tempest.api.identity.admin.v3.test_domains.DomainsTestJSON.test_create_update_delete_domain
-	- tempest.api.identity.admin.v3.test_endpoints.EndPointsTestJSON.test_update_endpoint
-	- tempest.api.identity.admin.v3.test_groups.GroupsV3TestJSON.test_group_users_add_list_delete
-	- tempest.api.identity.admin.v3.test_policies.PoliciesTestJSON.test_create_update_delete_policy
-	- tempest.api.identity.admin.v3.test_regions.RegionsTestJSON.test_create_region_with_specific_id
-	- tempest.api.identity.admin.v3.test_roles.RolesV3TestJSON.test_role_create_update_get_list
-	- tempest.api.identity.admin.v3.test_services.ServicesTestJSON.test_create_update_get_service
-	- tempest.api.identity.admin.v3.test_trusts.TrustsV3TestJSON.test_get_trusts_all
-	- tempest.api.messaging.test_claims.TestClaims.test_post_claim
-	- tempest.api.messaging.test_claims.TestClaims.test_query_claim
-	- tempest.api.messaging.test_claims.TestClaims.test_release_claim
-	- tempest.api.messaging.test_claims.TestClaims.test_update_claim
-	- tempest.api.messaging.test_messages.TestMessages.test_delete_multiple_messages
-	- tempest.api.messaging.test_messages.TestMessages.test_delete_single_message
-	- tempest.api.messaging.test_messages.TestMessages.test_get_message
-	- tempest.api.messaging.test_messages.TestMessages.test_get_multiple_messages
-	- tempest.api.messaging.test_messages.TestMessages.test_list_messages
-	- tempest.api.messaging.test_messages.TestMessages.test_post_messages
-	- tempest.api.messaging.test_queues.TestManageQueue.test_check_queue_existence
-	- tempest.api.messaging.test_queues.TestManageQueue.test_check_queue_head
-	- tempest.api.messaging.test_queues.TestManageQueue.test_get_queue_stats
-	- tempest.api.messaging.test_queues.TestManageQueue.test_list_queues
-	- tempest.api.messaging.test_queues.TestManageQueue.test_set_and_get_queue_metadata
-	- tempest.api.messaging.test_queues.TestQueues.test_create_delete_queue
-	- tempest.api.network.test_extensions.ExtensionsTestJSON.test_list_show_extensions
-	- tempest.api.network.test_floating_ips.FloatingIPTestJSON.test_create_floating_ip_specifying_a_fixed_ip_address
-	- tempest.api.network.test_floating_ips.FloatingIPTestJSON.test_create_list_show_update_delete_floating_ip
-	- tempest.api.network.test_networks.BulkNetworkOpsIpV6TestJSON.test_bulk_create_delete_network
-	- tempest.api.network.test_networks.BulkNetworkOpsIpV6TestJSON.test_bulk_create_delete_port
-	- tempest.api.network.test_networks.BulkNetworkOpsIpV6TestJSON.test_bulk_create_delete_subnet
-	- tempest.api.network.test_networks.BulkNetworkOpsTestJSON.test_bulk_create_delete_network
-	- tempest.api.network.test_networks.BulkNetworkOpsTestJSON.test_bulk_create_delete_port
-	- tempest.api.network.test_networks.BulkNetworkOpsTestJSON.test_bulk_create_delete_subnet
-	- tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_create_update_delete_network_subnet
-	- tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_external_network_visibility
-	- tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_list_networks
-	- tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_list_subnets
-	- tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_show_network
-	- tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_show_subnet
-	- tempest.api.network.test_networks.NetworksIpV6TestJSON.test_create_update_delete_network_subnet
-	- tempest.api.network.test_networks.NetworksIpV6TestJSON.test_external_network_visibility
-	- tempest.api.network.test_networks.NetworksIpV6TestJSON.test_list_networks
-	- tempest.api.network.test_networks.NetworksIpV6TestJSON.test_list_subnets
-	- tempest.api.network.test_networks.NetworksIpV6TestJSON.test_show_network
-	- tempest.api.network.test_networks.NetworksIpV6TestJSON.test_show_subnet
-	- tempest.api.network.test_networks.NetworksTestJSON.test_create_update_delete_network_subnet
-	- tempest.api.network.test_networks.NetworksTestJSON.test_external_network_visibility
-	- tempest.api.network.test_networks.NetworksTestJSON.test_list_networks
-	- tempest.api.network.test_networks.NetworksTestJSON.test_list_subnets
-	- tempest.api.network.test_networks.NetworksTestJSON.test_show_network
-	- tempest.api.network.test_networks.NetworksTestJSON.test_show_subnet
-	- tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_port_in_allowed_allocation_pools
-	- tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_port_with_no_securitygroups
-	- tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_update_delete_port
-	- tempest.api.network.test_ports.PortsIpV6TestJSON.test_list_ports
-	- tempest.api.network.test_ports.PortsIpV6TestJSON.test_show_port
-	- tempest.api.network.test_ports.PortsTestJSON.test_create_port_in_allowed_allocation_pools
-	- tempest.api.network.test_ports.PortsTestJSON.test_create_port_with_no_securitygroups
-	- tempest.api.network.test_ports.PortsTestJSON.test_create_update_delete_port
-	- tempest.api.network.test_ports.PortsTestJSON.test_list_ports
-	- tempest.api.network.test_ports.PortsTestJSON.test_show_port
-	- tempest.api.network.test_routers.RoutersIpV6Test.test_add_multiple_router_interfaces
-	- tempest.api.network.test_routers.RoutersIpV6Test.test_add_remove_router_interface_with_port_id
-	- tempest.api.network.test_routers.RoutersIpV6Test.test_add_remove_router_interface_with_subnet_id
-	- tempest.api.network.test_routers.RoutersIpV6Test.test_create_show_list_update_delete_router
-	- tempest.api.network.test_routers.RoutersTest.test_add_multiple_router_interfaces
-	- tempest.api.network.test_routers.RoutersTest.test_add_remove_router_interface_with_port_id
-	- tempest.api.network.test_routers.RoutersTest.test_add_remove_router_interface_with_subnet_id
-	- tempest.api.network.test_routers.RoutersTest.test_create_show_list_update_delete_router
-	- tempest.api.network.test_security_groups.SecGroupIPv6Test.test_create_list_update_show_delete_security_group
-	- tempest.api.network.test_security_groups.SecGroupIPv6Test.test_create_show_delete_security_group_rule
-	- tempest.api.network.test_security_groups.SecGroupIPv6Test.test_list_security_groups
-	- tempest.api.network.test_security_groups.SecGroupTest.test_create_list_update_show_delete_security_group
-	- tempest.api.network.test_security_groups.SecGroupTest.test_create_show_delete_security_group_rule
-	- tempest.api.network.test_security_groups.SecGroupTest.test_list_security_groups
-	- tempest.api.object_storage.test_account_quotas.AccountQuotasTest.test_admin_modify_quota
-	- tempest.api.object_storage.test_account_quotas.AccountQuotasTest.test_upload_valid_object
-	- tempest.api.object_storage.test_account_services.AccountTest.test_list_account_metadata
-	- tempest.api.object_storage.test_account_services.AccountTest.test_list_containers
-	- tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_end_marker
-	- tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_format_json
-	- tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_format_xml
-	- tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_limit
-	- tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_limit_and_end_marker
-	- tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_limit_and_marker
-	- tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_limit_and_marker_and_end_marker
-	- tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_marker
-	- tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_marker_and_end_marker
-	- tempest.api.object_storage.test_account_services.AccountTest.test_list_extensions
-	- tempest.api.object_storage.test_account_services.AccountTest.test_list_no_account_metadata
-	- tempest.api.object_storage.test_account_services.AccountTest.test_list_no_containers
-	- tempest.api.object_storage.test_account_services.AccountTest.test_update_account_metadata_with_create_and_delete_metadata
-	- tempest.api.object_storage.test_account_services.AccountTest.test_update_account_metadata_with_create_matadata_key
-	- tempest.api.object_storage.test_account_services.AccountTest.test_update_account_metadata_with_create_metadata
-	- tempest.api.object_storage.test_account_services.AccountTest.test_update_account_metadata_with_delete_matadata
-	- tempest.api.object_storage.test_account_services.AccountTest.test_update_account_metadata_with_delete_matadata_key
-	- tempest.api.object_storage.test_container_acl.ObjectTestACLs.test_read_object_with_rights
-	- tempest.api.object_storage.test_container_acl.ObjectTestACLs.test_write_object_with_rights
-	- tempest.api.object_storage.test_container_quotas.ContainerQuotasTest.test_upload_large_object
-	- tempest.api.object_storage.test_container_quotas.ContainerQuotasTest.test_upload_too_many_objects
-	- tempest.api.object_storage.test_container_quotas.ContainerQuotasTest.test_upload_valid_object
-	- tempest.api.object_storage.test_container_services.ContainerTest.test_create_container
-	- tempest.api.object_storage.test_container_services.ContainerTest.test_create_container_overwrite
-	- tempest.api.object_storage.test_container_services.ContainerTest.test_create_container_with_metadata_key
-	- tempest.api.object_storage.test_container_services.ContainerTest.test_create_container_with_metadata_value
-	- tempest.api.object_storage.test_container_services.ContainerTest.test_create_container_with_remove_metadata_key
-	- tempest.api.object_storage.test_container_services.ContainerTest.test_create_container_with_remove_metadata_value
-	- tempest.api.object_storage.test_container_services.ContainerTest.test_delete_container
-	- tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents
-	- tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_delimiter
-	- tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_end_marker
-	- tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_format_json
-	- tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_format_xml
-	- tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_limit
-	- tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_marker
-	- tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_no_object
-	- tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_path
-	- tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_prefix
-	- tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_metadata
-	- tempest.api.object_storage.test_container_services.ContainerTest.test_list_no_container_metadata
-	- tempest.api.object_storage.test_container_services.ContainerTest.test_update_container_metadata_with_create_and_delete_matadata
-	- tempest.api.object_storage.test_container_services.ContainerTest.test_update_container_metadata_with_create_matadata_key
-	- tempest.api.object_storage.test_container_services.ContainerTest.test_update_container_metadata_with_create_metadata
-	- tempest.api.object_storage.test_container_services.ContainerTest.test_update_container_metadata_with_delete_metadata
-	- tempest.api.object_storage.test_container_services.ContainerTest.test_update_container_metadata_with_delete_metadata_key
-	- tempest.api.object_storage.test_object_services.ObjectTest.test_copy_object_2d_way
-	- tempest.api.object_storage.test_object_services.ObjectTest.test_copy_object_across_containers
-	- tempest.api.object_storage.test_object_services.ObjectTest.test_copy_object_in_same_container
-	- tempest.api.object_storage.test_object_services.ObjectTest.test_copy_object_to_itself
-	- tempest.api.object_storage.test_object_services.ObjectTest.test_copy_object_with_x_fresh_metadata
-	- tempest.api.object_storage.test_object_services.ObjectTest.test_copy_object_with_x_object_meta
-	- tempest.api.object_storage.test_object_services.ObjectTest.test_copy_object_with_x_object_metakey
-	- tempest.api.object_storage.test_object_services.ObjectTest.test_get_object
-	- tempest.api.object_storage.test_object_services.ObjectTest.test_get_object_with_if_match
-	- tempest.api.object_storage.test_object_services.ObjectTest.test_get_object_with_if_modified_since
-	- tempest.api.object_storage.test_object_services.ObjectTest.test_get_object_with_if_unmodified_since
-	- tempest.api.object_storage.test_object_services.ObjectTest.test_get_object_with_metadata
-	- tempest.api.object_storage.test_object_services.ObjectTest.test_get_object_with_range
-	- tempest.api.object_storage.test_object_services.ObjectTest.test_get_object_with_x_newest
-	- tempest.api.object_storage.test_object_services.ObjectTest.test_get_object_with_x_object_manifest
-	- tempest.api.object_storage.test_object_services.ObjectTest.test_list_no_object_metadata
-	- tempest.api.object_storage.test_object_services.ObjectTest.test_list_object_metadata
-	- tempest.api.object_storage.test_object_services.ObjectTest.test_list_object_metadata_with_x_object_manifest
-	- tempest.api.object_storage.test_object_services.ObjectTest.test_update_object_metadata
-	- tempest.api.object_storage.test_object_services.ObjectTest.test_update_object_metadata_with_create_and_remove_metadata
-	- tempest.api.object_storage.test_object_services.ObjectTest.test_update_object_metadata_with_x_object_manifest
-	- tempest.api.object_storage.test_object_services.ObjectTest.test_update_object_metadata_with_x_remove_object_metakey
-	- tempest.api.object_storage.test_object_services.PublicObjectTest.test_access_public_container_object_without_using_creds
-	- tempest.api.object_storage.test_object_services.PublicObjectTest.test_access_public_object_with_another_user_creds
-	- tempest.api.object_storage.test_object_version.ContainerTest.test_versioned_container
-	- tempest.api.orchestration.stacks.test_resource_types.ResourceTypesTest.test_resource_type_list
-	- tempest.api.orchestration.stacks.test_resource_types.ResourceTypesTest.test_resource_type_show
-	- tempest.api.orchestration.stacks.test_resource_types.ResourceTypesTest.test_resource_type_template
-	- tempest.api.orchestration.stacks.test_soft_conf.TestSoftwareConfig.test_get_deployment_list
-	- tempest.api.orchestration.stacks.test_soft_conf.TestSoftwareConfig.test_get_deployment_metadata
-	- tempest.api.orchestration.stacks.test_soft_conf.TestSoftwareConfig.test_get_software_config
-	- tempest.api.orchestration.stacks.test_soft_conf.TestSoftwareConfig.test_software_deployment_create_validate
-	- tempest.api.orchestration.stacks.test_soft_conf.TestSoftwareConfig.test_software_deployment_update_no_metadata_change
-	- tempest.api.orchestration.stacks.test_soft_conf.TestSoftwareConfig.test_software_deployment_update_with_metadata_change
-	- tempest.api.orchestration.stacks.test_stacks.StacksTestJSON.test_stack_crud_no_resources
-	- tempest.api.orchestration.stacks.test_stacks.StacksTestJSON.test_stack_list_responds
-	- tempest.api.telemetry.test_telemetry_notification_api.TelemetryNotificationAPITestJSON.test_check_glance_v1_notifications
-	- tempest.api.telemetry.test_telemetry_notification_api.TelemetryNotificationAPITestJSON.test_check_glance_v2_notifications
-	- tempest.api.volume.test_volumes_actions.VolumesV1ActionsTest.test_attach_detach_volume_to_instance
-	- tempest.api.volume.test_volumes_actions.VolumesV2ActionsTest.test_attach_detach_volume_to_instance
-	- tempest.api.volume.test_volumes_get.VolumesV1GetTest.test_volume_create_get_update_delete
-	- tempest.api.volume.test_volumes_get.VolumesV1GetTest.test_volume_create_get_update_delete_from_image
-	- tempest.api.volume.test_volumes_get.VolumesV2GetTest.test_volume_create_get_update_delete
-	- tempest.api.volume.test_volumes_get.VolumesV2GetTest.test_volume_create_get_update_delete_from_image
-	- tempest.api.volume.test_volumes_list.VolumesV1ListTestJSON.test_volume_list
-	- tempest.api.volume.test_volumes_list.VolumesV2ListTestJSON.test_volume_list
-    runner:
-      concurrency: 1
-      times: 1
-      type: serial
-    sla:
-      failure_rate:
-        max: 0
-
diff --git a/testcases/OpenStack/rally/scenario/sanity/opnfv-cinder.yaml b/testcases/OpenStack/rally/scenario/sanity/opnfv-cinder.yaml
new file mode 100644
index 000000000..5962b1db5
--- /dev/null
+++ b/testcases/OpenStack/rally/scenario/sanity/opnfv-cinder.yaml
@@ -0,0 +1,84 @@
+  CinderVolumes.create_and_delete_snapshot:
+    -
+      args:
+        force: false
+      context:
+        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
+        quotas:
+          {{ unlimited_volumes() }}
+        {{ volumes() }}
+        {% endcall %}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  CinderVolumes.create_and_delete_volume:
+    -
+      args:
+        size:
+          max: 1
+          min: 1
+      context:
+        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
+        quotas:
+          {{ unlimited_volumes() }}
+        {% endcall %}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+    -
+      args:
+        {{ vm_params(image_name,none,1) }}
+      context:
+        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
+        quotas:
+          {{ unlimited_volumes() }}
+        {% endcall %}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+    -
+      args:
+        size: 1
+      context:
+        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
+        quotas:
+          {{ unlimited_volumes() }}
+        {% endcall %}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  CinderVolumes.create_and_extend_volume:
+    -
+      args:
+        new_size: 2
+        size: 1
+      context:
+        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
+        quotas:
+          {{ unlimited_volumes() }}
+        {% endcall %}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  CinderVolumes.create_from_volume_and_delete_volume:
+    -
+      args:
+        size: 1
+      context:
+        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
+        quotas:
+          {{ unlimited_volumes() }}
+        {{ volumes() }}
+        {% endcall %}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
diff --git a/testcases/OpenStack/rally/scenario/sanity/opnfv-heat.yaml b/testcases/OpenStack/rally/scenario/sanity/opnfv-heat.yaml
new file mode 100644
index 000000000..dc34cc3f2
--- /dev/null
+++ b/testcases/OpenStack/rally/scenario/sanity/opnfv-heat.yaml
@@ -0,0 +1,42 @@
+  HeatStacks.create_update_delete_stack:
+    -
+      args:
+        template_path: "{{ tmpl_dir }}/autoscaling_policy.yaml.template"
+        updated_template_path: "{{ tmpl_dir }}/updated_autoscaling_policy_inplace.yaml.template"
+      context:
+        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  HeatStacks.create_check_delete_stack:
+    -
+      args:
+        template_path: "{{ tmpl_dir }}/random_strings.yaml.template"
+      context:
+        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  HeatStacks.create_suspend_resume_delete_stack:
+    -
+      args:
+        template_path: "{{ tmpl_dir }}/random_strings.yaml.template"
+      context:
+        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  HeatStacks.list_stacks_and_resources:
+    -
+      context:
+        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
diff --git a/testcases/OpenStack/rally/scenario/sanity/opnfv-neutron.yaml b/testcases/OpenStack/rally/scenario/sanity/opnfv-neutron.yaml
new file mode 100644
index 000000000..159f2b633
--- /dev/null
+++ b/testcases/OpenStack/rally/scenario/sanity/opnfv-neutron.yaml
@@ -0,0 +1,152 @@
+  NeutronNetworks.create_and_delete_networks:
+    -
+      args:
+        network_create_args: {}
+      context:
+        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
+        quotas:
+          neutron:
+            network: -1
+        {% endcall %}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  NeutronNetworks.create_and_delete_ports:
+    -
+      args:
+        network_create_args: {}
+        port_create_args: {}
+        ports_per_network: 1
+      context:
+        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
+        network: {}
+        quotas:
+          neutron:
+            network: -1
+            port: -1
+        {% endcall %}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  NeutronNetworks.create_and_delete_routers:
+    -
+      args:
+        network_create_args: {}
+        router_create_args: {}
+        subnet_cidr_start: "1.1.0.0/30"
+        subnet_create_args: {}
+        subnets_per_network: 1
+      context:
+        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
+        network: {}
+        quotas:
+          neutron:
+            network: -1
+            subnet: -1
+            port: -1
+            router: -1
+        {% endcall %}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  NeutronNetworks.create_and_delete_subnets:
+    -
+      args:
+        network_create_args: {}
+        subnet_cidr_start: "1.1.0.0/30"
+        subnet_create_args: {}
+        subnets_per_network: 1
+      context:
+        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
+        network: {}
+        quotas:
+          neutron:
+            network: -1
+            subnet: -1
+        {% endcall %}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  NeutronNetworks.create_and_list_networks:
+    -
+      args:
+        network_create_args: {}
+      context:
+        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
+        quotas:
+          neutron:
+            network: -1
+        {% endcall %}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  NeutronNetworks.create_and_list_ports:
+    -
+      args:
+        network_create_args: {}
+        port_create_args: {}
+        ports_per_network: 1
+      context:
+        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
+        network: {}
+        quotas:
+          neutron:
+            network: -1
+            port: -1
+        {% endcall %}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  NeutronNetworks.create_and_list_routers:
+    -
+      args:
+        network_create_args: {}
+        router_create_args: {}
+        subnet_cidr_start: "1.1.0.0/30"
+        subnet_create_args: {}
+        subnets_per_network: 1
+      context:
+        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
+        network: {}
+        quotas:
+          neutron:
+            network: -1
+            subnet: -1
+            router: -1
+        {% endcall %}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  NeutronNetworks.create_and_list_subnets:
+    -
+      args:
+        network_create_args: {}
+        subnet_cidr_start: "1.1.0.0/30"
+        subnet_create_args: {}
+        subnets_per_network: 1
+      context:
+        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
+        network: {}
+        quotas:
+          neutron:
+            network: -1
+            subnet: -1
+        {% endcall %}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
diff --git a/testcases/OpenStack/rally/scenario/sanity/opnfv-nova.yaml b/testcases/OpenStack/rally/scenario/sanity/opnfv-nova.yaml
new file mode 100644
index 000000000..947819dc7
--- /dev/null
+++ b/testcases/OpenStack/rally/scenario/sanity/opnfv-nova.yaml
@@ -0,0 +1,144 @@
+{% if live_migration %}
+
+  NovaServers.boot_and_live_migrate_server:
+    - args:
+        {{ vm_params(image_name, flavor_name) }}
+        block_migration: false
+        nics:
+          - net-id: {{ netid }}
+      context:
+        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  NovaServers.boot_server_attach_created_volume_and_live_migrate:
+    -
+      args:
+        {{ vm_params(image_name, flavor_name) }}
+        size: 10
+        block_migration: false
+        boot_server_kwargs:
+            nics:
+              - net-id: {{ netid }}
+      context:
+        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  NovaServers.boot_server_from_volume_and_live_migrate:
+    - args:
+        {{ vm_params(image_name, flavor_name) }}
+        block_migration: false
+        volume_size: 10
+        force_delete: false
+        nics:
+          - net-id: {{ netid }}
+      context:
+        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+{% endif %}
+
+  NovaKeypair.boot_and_delete_server_with_keypair:
+    -
+      args:
+        {{ vm_params(image_name, flavor_name) }}
+        server_kwargs:
+            nics:
+              - net-id: {{ netid }}
+      context:
+        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
+        network:
+          networks_per_tenant: 1
+          start_cidr: "100.1.0.0/25"
+        quotas:
+          {{ unlimited_neutron() }}
+          {{ unlimited_nova(keypairs=true) }}
+        {% endcall %}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  NovaServers.boot_server_from_volume_and_delete:
+    -
+      args:
+        {{ vm_params(image_name, flavor_name) }}
+        volume_size: 5
+        nics:
+          - net-id: {{ netid }}
+      context:
+        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
+        network:
+          networks_per_tenant: 1
+          start_cidr: "100.1.0.0/25"
+        quotas:
+          {{ unlimited_volumes() }}
+          {{ unlimited_neutron() }}
+          {{ unlimited_nova() }}
+        {% endcall %}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  NovaServers.pause_and_unpause_server:
+    -
+      args:
+        {{ vm_params(image_name, flavor_name) }}
+        force_delete: false
+        nics:
+          - net-id: {{ netid }}
+      context:
+        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
+        network:
+          networks_per_tenant: 1
+          start_cidr: "100.1.0.0/25"
+        quotas:
+          {{ unlimited_neutron() }}
+          {{ unlimited_nova() }}
+        {% endcall %}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  NovaSecGroup.boot_and_delete_server_with_secgroups:
+    -
+      args:
+        {{ vm_params(image_name, flavor_name) }}
+        security_group_count: 10
+        rules_per_security_group: 10
+        nics:
+          - net-id: {{ netid }}
+      context:
+        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
+        network:
+          start_cidr: "100.1.0.0/25"
+        quotas:
+          {{ unlimited_nova() }}
+          {{ unlimited_neutron(secgroups=true) }}
+        {% endcall %}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  NovaServers.boot_and_migrate_server:
+    - args:
+        {{ vm_params(image_name, flavor_name) }}
+        nics:
+          - net-id: {{ netid }}
+      context:
+        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}