file/dir renaming for consistency

JIRA: FUNCTEST-579

Change-Id: Iaa545db70bfb76770df0a3d17871e29ce518ff2d
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>

31 files changed, 0 insertions, 2793 deletions

diff --git a/functest/opnfv_tests/OpenStack/rally/blacklist.txt b/functest/opnfv_tests/OpenStack/rally/blacklist.txt
deleted file mode 100644
index 3a17fa61..00000000
--- a/functest/opnfv_tests/OpenStack/rally/blacklist.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-scenario:
-    -
-        scenarios:
-            - os-nosdn-lxd-ha
-            - os-nosdn-lxd-noha
-        installers:
-            - joid
-        tests:
-            - NovaServers.boot_server_from_volume_and_delete
-
-functionality:
-    -
-        functions:
-            - no_live_migration
-        tests:
-            - NovaServers.boot_and_live_migrate_server
-            - NovaServers.boot_server_attach_created_volume_and_live_migrate
-            - NovaServers.boot_server_from_volume_and_live_migrate
diff --git a/functest/opnfv_tests/OpenStack/rally/macro/macro.yaml b/functest/opnfv_tests/OpenStack/rally/macro/macro.yaml
deleted file mode 100644
index 48c0333e..00000000
--- a/functest/opnfv_tests/OpenStack/rally/macro/macro.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-{%- macro user_context(tenants,users_per_tenant, use_existing_users) -%}
-{%- if use_existing_users and caller is not defined -%} {}
-{%- else %}
-  {%- if not use_existing_users %}
-        users:
-          tenants: {{ tenants }}
-          users_per_tenant: {{ users_per_tenant }}
-  {%- endif %}
-  {%- if caller is defined %}
-    {{ caller() }}
-  {%- endif %}
-{%- endif %}
-{%- endmacro %}
-
-{%- macro vm_params(image=none, flavor=none, size=none) %}
-{%- if flavor is not none %}
-        flavor:
-          name: {{ flavor }}
-{%- endif %}
-{%- if image is not none %}
-        image:
-          name: {{ image }}
-{%- endif %}
-{%- if size is not none %}
-        size: {{ size }}
-{%- endif %}
-{%- endmacro %}
-
-{%- macro unlimited_volumes() %}
-          cinder:
-            gigabytes: -1
-            snapshots: -1
-            volumes: -1
-{%- endmacro %}
-
-{%- macro constant_runner(concurrency=1, times=1, is_smoke=True) %}
-        type: "constant"
-  {%- if is_smoke %}
-        concurrency: 1
-        times: 1
-  {%- else %}
-        concurrency: {{ concurrency }}
-        times: {{ times }}
-  {%- endif %}
-{%- endmacro %}
-
-{%- macro rps_runner(rps=1, times=1, is_smoke=True) %}
-        type: rps
-  {%- if is_smoke %}
-        rps: 1
-        times: 1
-  {%- else %}
-        rps: {{ rps }}
-        times: {{ times }}
-  {%- endif %}
-{%- endmacro %}
-
-{%- macro no_failures_sla() %}
-        failure_rate:
-          max: 0
-{%- endmacro %}
-
-{%- macro volumes(size=1, volumes_per_tenant=1) %}
-        volumes:
-          size: {{ size }}
-          volumes_per_tenant: {{ volumes_per_tenant }}
-{%- endmacro %}
-
-{%- macro unlimited_nova(keypairs=false) %}
-          nova:
-            cores: -1
-            floating_ips: -1
-            instances: -1
-            {%- if keypairs %}
-            key_pairs: -1
-            {%- endif %}
-            ram: -1
-            security_group_rules: -1
-            security_groups: -1
-{%- endmacro %}
-
-{%- macro unlimited_neutron(secgroups=false) %}
-          neutron:
-            network: -1
-            port: -1
-            subnet: -1
-            {%- if secgroups %}
-            security_group: -1
-            security_group_rule: -1
-            {%- endif %}
-{%- endmacro %}
-
-{%- macro glance_args(location, container="bare", type="qcow2") %}
-        container_format: {{ container }}
-        disk_format: {{ type }}
-        image_location: {{ location }}
-{%- endmacro %}
diff --git a/functest/opnfv_tests/OpenStack/rally/run_rally-cert.py b/functest/opnfv_tests/OpenStack/rally/run_rally-cert.py
deleted file mode 100755
index 6d8f0160..00000000
--- a/functest/opnfv_tests/OpenStack/rally/run_rally-cert.py
+++ /dev/null
@@ -1,619 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (c) 2015 Orange
-# guyrodrigue.koffi@orange.com
-# morgan.richomme@orange.com
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# 0.1 (05/2015) initial commit
-# 0.2 (28/09/2015) extract Tempest, format json result, add ceilometer suite
-# 0.3 (19/10/2015) remove Tempest from run_rally
-# and push result into test DB
-#
-""" tests configuration """
-
-import json
-import os
-import re
-import subprocess
-import time
-
-import argparse
-import iniparse
-import yaml
-
-import functest.utils.functest_logger as ft_logger
-import functest.utils.functest_utils as ft_utils
-import functest.utils.openstack_utils as os_utils
-import functest.utils.functest_constants as ft_constants
-
-tests = ['authenticate', 'glance', 'cinder', 'heat', 'keystone',
-         'neutron', 'nova', 'quotas', 'requests', 'vm', 'all']
-parser = argparse.ArgumentParser()
-parser.add_argument("test_name",
-                    help="Module name to be tested. "
-                         "Possible values are : "
-                         "[ {d[0]} | {d[1]} | {d[2]} | {d[3]} | {d[4]} | "
-                         "{d[5]} | {d[6]} | {d[7]} | {d[8]} | {d[9]} | "
-                         "{d[10]} ] "
-                         "The 'all' value "
-                         "performs all possible test scenarios"
-                         .format(d=tests))
-
-parser.add_argument("-d", "--debug", help="Debug mode", action="store_true")
-parser.add_argument("-r", "--report",
-                    help="Create json result file",
-                    action="store_true")
-parser.add_argument("-s", "--smoke",
-                    help="Smoke test mode",
-                    action="store_true")
-parser.add_argument("-v", "--verbose",
-                    help="Print verbose info about the progress",
-                    action="store_true")
-parser.add_argument("-n", "--noclean",
-                    help="Don't clean the created resources for this test.",
-                    action="store_true")
-parser.add_argument("-z", "--sanity",
-                    help="Sanity test mode, execute only a subset of tests",
-                    action="store_true")
-
-args = parser.parse_args()
-
-
-if args.verbose:
-    RALLY_STDERR = subprocess.STDOUT
-else:
-    RALLY_STDERR = open(os.devnull, 'w')
-
-""" logging configuration """
-logger = ft_logger.Logger("run_rally-cert").getLogger()
-
-RALLY_DIR = os.path.join(ft_constants.FUNCTEST_REPO_DIR,
-                         ft_constants.RALLY_RELATIVE_PATH)
-RALLY_SCENARIO_DIR = os.path.join(RALLY_DIR, "scenario")
-SANITY_MODE_DIR = os.path.join(RALLY_SCENARIO_DIR, "sanity")
-FULL_MODE_DIR = os.path.join(RALLY_SCENARIO_DIR, "full")
-TEMPLATE_DIR = os.path.join(RALLY_SCENARIO_DIR, "templates")
-SUPPORT_DIR = os.path.join(RALLY_SCENARIO_DIR, "support")
-TEMP_DIR = os.path.join(RALLY_DIR, "var")
-BLACKLIST_FILE = os.path.join(RALLY_DIR, "blacklist.txt")
-
-FLAVOR_NAME = "m1.tiny"
-USERS_AMOUNT = 2
-TENANTS_AMOUNT = 3
-ITERATIONS_AMOUNT = 10
-CONCURRENCY = 4
-
-RESULTS_DIR = os.path.join(ft_constants.FUNCTEST_RESULTS_DIR, 'rally')
-TEMPEST_CONF_FILE = os.path.join(ft_constants.FUNCTEST_RESULTS_DIR,
-                                 'tempest/tempest.conf')
-
-RALLY_PRIVATE_NET_NAME = ft_constants.RALLY_PRIVATE_NET_NAME
-RALLY_PRIVATE_SUBNET_NAME = ft_constants.RALLY_PRIVATE_SUBNET_NAME
-RALLY_PRIVATE_SUBNET_CIDR = ft_constants.RALLY_PRIVATE_SUBNET_CIDR
-RALLY_ROUTER_NAME = ft_constants.RALLY_ROUTER_NAME
-
-GLANCE_IMAGE_NAME = ft_constants.GLANCE_IMAGE_NAME
-GLANCE_IMAGE_FILENAME = ft_constants.GLANCE_IMAGE_FILENAME
-GLANCE_IMAGE_FORMAT = ft_constants.GLANCE_IMAGE_FORMAT
-GLANCE_IMAGE_PATH = os.path.join(ft_constants.FUNCTEST_DATA_DIR,
-                                 GLANCE_IMAGE_FILENAME)
-CINDER_VOLUME_TYPE_NAME = "volume_test"
-
-
-class GlobalVariables:
-    SUMMARY = []
-    neutron_client = None
-    network_dict = {}
-
-
-def get_task_id(cmd_raw):
-    """
-    get task id from command rally result
-    :param cmd_raw:
-    :return: task_id as string
-    """
-    taskid_re = re.compile('^Task +(.*): started$')
-    for line in cmd_raw.splitlines(True):
-        line = line.strip()
-        match = taskid_re.match(line)
-        if match:
-            return match.group(1)
-    return None
-
-
-def task_succeed(json_raw):
-    """
-    Parse JSON from rally JSON results
-    :param json_raw:
-    :return: Bool
-    """
-    rally_report = json.loads(json_raw)
-    for report in rally_report:
-        if report is None or report.get('result') is None:
-            return False
-
-        for result in report.get('result'):
-            if result is None or len(result.get('error')) > 0:
-                return False
-
-    return True
-
-
-def live_migration_supported():
-    config = iniparse.ConfigParser()
-    if (config.read(TEMPEST_CONF_FILE) and
-            config.has_section('compute-feature-enabled') and
-            config.has_option('compute-feature-enabled', 'live_migration')):
-        return config.getboolean('compute-feature-enabled', 'live_migration')
-
-    return False
-
-
-def build_task_args(test_file_name):
-    task_args = {'service_list': [test_file_name]}
-    task_args['image_name'] = GLANCE_IMAGE_NAME
-    task_args['flavor_name'] = FLAVOR_NAME
-    task_args['glance_image_location'] = GLANCE_IMAGE_PATH
-    task_args['glance_image_format'] = GLANCE_IMAGE_FORMAT
-    task_args['tmpl_dir'] = TEMPLATE_DIR
-    task_args['sup_dir'] = SUPPORT_DIR
-    task_args['users_amount'] = USERS_AMOUNT
-    task_args['tenants_amount'] = TENANTS_AMOUNT
-    task_args['use_existing_users'] = False
-    task_args['iterations'] = ITERATIONS_AMOUNT
-    task_args['concurrency'] = CONCURRENCY
-
-    if args.sanity:
-        task_args['smoke'] = True
-    else:
-        task_args['smoke'] = args.smoke
-
-    ext_net = os_utils.get_external_net(GlobalVariables.neutron_client)
-    if ext_net:
-        task_args['floating_network'] = str(ext_net)
-    else:
-        task_args['floating_network'] = ''
-
-    net_id = GlobalVariables.network_dict['net_id']
-    task_args['netid'] = str(net_id)
-
-    auth_url = ft_constants.OS_AUTH_URL
-    if auth_url is not None:
-        task_args['request_url'] = auth_url.rsplit(":", 1)[0]
-    else:
-        task_args['request_url'] = ''
-
-    return task_args
-
-
-def get_output(proc, test_name):
-    result = ""
-    nb_tests = 0
-    overall_duration = 0.0
-    success = 0.0
-    nb_totals = 0
-
-    while proc.poll() is None:
-        line = proc.stdout.readline()
-        if args.verbose:
-            result += line
-        else:
-            if ("Load duration" in line or
-                    "started" in line or
-                    "finished" in line or
-                    " Preparing" in line or
-                    "+-" in line or
-                    "|" in line):
-                result += line
-            elif "test scenario" in line:
-                result += "\n" + line
-            elif "Full duration" in line:
-                result += line + "\n\n"
-
-        # parse output for summary report
-        if ("| " in line and
-                "| action" not in line and
-                "| Starting" not in line and
-                "| Completed" not in line and
-                "| ITER" not in line and
-                "|   " not in line and
-                "| total" not in line):
-            nb_tests += 1
-        elif "| total" in line:
-            percentage = ((line.split('|')[8]).strip(' ')).strip('%')
-            try:
-                success += float(percentage)
-            except ValueError:
-                logger.info('Percentage error: %s, %s' % (percentage, line))
-            nb_totals += 1
-        elif "Full duration" in line:
-            duration = line.split(': ')[1]
-            try:
-                overall_duration += float(duration)
-            except ValueError:
-                logger.info('Duration error: %s, %s' % (duration, line))
-
-    overall_duration = "{:10.2f}".format(overall_duration)
-    if nb_totals == 0:
-        success_avg = 0
-    else:
-        success_avg = "{:0.2f}".format(success / nb_totals)
-
-    scenario_summary = {'test_name': test_name,
-                        'overall_duration': overall_duration,
-                        'nb_tests': nb_tests,
-                        'success': success_avg}
-    GlobalVariables.SUMMARY.append(scenario_summary)
-
-    logger.debug("\n" + result)
-
-    return result
-
-
-def get_cmd_output(proc):
-    result = ""
-
-    while proc.poll() is None:
-        line = proc.stdout.readline()
-        result += line
-
-    return result
-
-
-def excl_scenario():
-    black_tests = []
-
-    try:
-        with open(BLACKLIST_FILE, 'r') as black_list_file:
-            black_list_yaml = yaml.safe_load(black_list_file)
-
-        installer_type = ft_constants.CI_INSTALLER_TYPE
-        deploy_scenario = ft_constants.CI_SCENARIO
-        if (bool(installer_type) * bool(deploy_scenario)):
-            if 'scenario' in black_list_yaml.keys():
-                for item in black_list_yaml['scenario']:
-                    scenarios = item['scenarios']
-                    installers = item['installers']
-                    if (deploy_scenario in scenarios and
-                            installer_type in installers):
-                        tests = item['tests']
-                        black_tests.extend(tests)
-    except:
-        logger.debug("Scenario exclusion not applied.")
-
-    return black_tests
-
-
-def excl_func():
-    black_tests = []
-    func_list = []
-
-    try:
-        with open(BLACKLIST_FILE, 'r') as black_list_file:
-            black_list_yaml = yaml.safe_load(black_list_file)
-
-        if not live_migration_supported():
-            func_list.append("no_live_migration")
-
-        if 'functionality' in black_list_yaml.keys():
-            for item in black_list_yaml['functionality']:
-                functions = item['functions']
-                for func in func_list:
-                    if func in functions:
-                        tests = item['tests']
-                        black_tests.extend(tests)
-    except:
-        logger.debug("Functionality exclusion not applied.")
-
-    return black_tests
-
-
-def apply_blacklist(case_file_name, result_file_name):
-    logger.debug("Applying blacklist...")
-    cases_file = open(case_file_name, 'r')
-    result_file = open(result_file_name, 'w')
-
-    black_tests = list(set(excl_func() + excl_scenario()))
-
-    include = True
-    for cases_line in cases_file:
-        if include:
-            for black_tests_line in black_tests:
-                if re.search(black_tests_line, cases_line.strip().rstrip(':')):
-                    include = False
-                    break
-            else:
-                result_file.write(str(cases_line))
-        else:
-            if cases_line.isspace():
-                include = True
-
-    cases_file.close()
-    result_file.close()
-
-
-def prepare_test_list(test_name):
-    test_yaml_file_name = 'opnfv-{}.yaml'.format(test_name)
-    scenario_file_name = os.path.join(RALLY_SCENARIO_DIR, test_yaml_file_name)
-
-    if not os.path.exists(scenario_file_name):
-        if args.sanity:
-            scenario_file_name = os.path.join(SANITY_MODE_DIR,
-                                              test_yaml_file_name)
-        else:
-            scenario_file_name = os.path.join(FULL_MODE_DIR,
-                                              test_yaml_file_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 = os.path.join(TEMP_DIR, test_yaml_file_name)
-
-    if not os.path.exists(TEMP_DIR):
-        os.makedirs(TEMP_DIR)
-
-    apply_blacklist(scenario_file_name, test_file_name)
-    return test_file_name
-
-
-def file_is_empty(file_name):
-    try:
-        if os.stat(file_name).st_size > 0:
-            return False
-    except:
-        pass
-
-    return True
-
-
-def run_task(test_name):
-    #
-    # the "main" function of the script who launch rally for a task
-    # :param test_name: name for the rally test
-    # :return: void
-    #
-    logger.info('Starting test scenario "{}" ...'.format(test_name))
-    start_time = time.time()
-
-    task_file = os.path.join(RALLY_DIR, 'task.yaml')
-    if not os.path.exists(task_file):
-        logger.error("Task file '%s' does not exist." % task_file)
-        exit(-1)
-
-    file_name = prepare_test_list(test_name)
-    if file_is_empty(file_name):
-        logger.info('No tests for scenario "{}"'.format(test_name))
-        return
-
-    cmd_line = ("rally task start --abort-on-sla-failure " +
-                "--task {} ".format(task_file) +
-                "--task-args \"{}\" ".format(build_task_args(test_name)))
-    logger.debug('running command line : {}'.format(cmd_line))
-
-    p = subprocess.Popen(cmd_line, stdout=subprocess.PIPE,
-                         stderr=RALLY_STDERR, shell=True)
-    output = get_output(p, test_name)
-    task_id = get_task_id(output)
-    logger.debug('task_id : {}'.format(task_id))
-
-    if task_id is None:
-        logger.error('Failed to retrieve task_id, validating task...')
-        cmd_line = ("rally task validate " +
-                    "--task {} ".format(task_file) +
-                    "--task-args \"{}\" ".format(build_task_args(test_name)))
-        logger.debug('running command line : {}'.format(cmd_line))
-        p = subprocess.Popen(cmd_line, stdout=subprocess.PIPE,
-                             stderr=subprocess.STDOUT, shell=True)
-        output = get_cmd_output(p)
-        logger.error("Task validation result:" + "\n" + output)
-        return
-
-    # check for result directory and create it otherwise
-    if not os.path.exists(RESULTS_DIR):
-        logger.debug('{} does not exist, we create it.'.format(RESULTS_DIR))
-        os.makedirs(RESULTS_DIR)
-
-    # write html report file
-    report_html_name = 'opnfv-{}.html'.format(test_name)
-    report_html_dir = os.path.join(RESULTS_DIR, report_html_name)
-    cmd_line = "rally task report {} --out {}".format(task_id,
-                                                      report_html_dir)
-
-    logger.debug('running command line : {}'.format(cmd_line))
-    os.popen(cmd_line)
-
-    # get and save rally operation JSON result
-    cmd_line = "rally task results %s" % task_id
-    logger.debug('running command line : {}'.format(cmd_line))
-    cmd = os.popen(cmd_line)
-    json_results = cmd.read()
-    report_json_name = 'opnfv-{}.json'.format(test_name)
-    report_json_dir = os.path.join(RESULTS_DIR, report_json_name)
-    with open(report_json_dir, 'w') as f:
-        logger.debug('saving json file')
-        f.write(json_results)
-
-    with open(report_json_dir) as json_file:
-        json_data = json.load(json_file)
-
-    """ parse JSON operation result """
-    status = "FAIL"
-    if task_succeed(json_results):
-        logger.info('Test scenario: "{}" OK.'.format(test_name) + "\n")
-        status = "PASS"
-    else:
-        logger.info('Test scenario: "{}" Failed.'.format(test_name) + "\n")
-
-    # Push results in payload of testcase
-    if args.report:
-        stop_time = time.time()
-        logger.debug("Push Rally detailed results into DB")
-        ft_utils.push_results_to_db("functest",
-                                    "Rally_details",
-                                    start_time,
-                                    stop_time,
-                                    status,
-                                    json_data)
-
-
-def main():
-
-    GlobalVariables.nova_client = os_utils.get_nova_client()
-    GlobalVariables.neutron_client = os_utils.get_neutron_client()
-    cinder_client = os_utils.get_cinder_client()
-
-    start_time = time.time()
-
-    # configure script
-    if not (args.test_name in tests):
-        logger.error('argument not valid')
-        exit(-1)
-
-    GlobalVariables.SUMMARY = []
-
-    volume_types = os_utils.list_volume_types(cinder_client,
-                                              private=False)
-    if not volume_types:
-        volume_type = os_utils.create_volume_type(
-            cinder_client, CINDER_VOLUME_TYPE_NAME)
-        if not volume_type:
-            logger.error("Failed to create volume type...")
-            exit(-1)
-        else:
-            logger.debug("Volume type '%s' created succesfully..."
-                         % CINDER_VOLUME_TYPE_NAME)
-    else:
-        logger.debug("Using existing volume type(s)...")
-
-    image_exists, image_id = os_utils.get_or_create_image(GLANCE_IMAGE_NAME,
-                                                          GLANCE_IMAGE_PATH,
-                                                          GLANCE_IMAGE_FORMAT)
-    if not image_id:
-        exit(-1)
-
-    logger.debug("Creating network '%s'..." % RALLY_PRIVATE_NET_NAME)
-    GlobalVariables.network_dict = \
-        os_utils.create_shared_network_full(RALLY_PRIVATE_NET_NAME,
-                                            RALLY_PRIVATE_SUBNET_NAME,
-                                            RALLY_ROUTER_NAME,
-                                            RALLY_PRIVATE_SUBNET_CIDR)
-    if not GlobalVariables.network_dict:
-        exit(1)
-
-    if args.test_name == "all":
-        for test_name in tests:
-            if not (test_name == 'all' or
-                    test_name == 'vm'):
-                run_task(test_name)
-    else:
-        logger.debug("Test name: " + args.test_name)
-        run_task(args.test_name)
-
-    report = ("\n"
-              "                                                              "
-              "\n"
-              "                     Rally Summary Report\n"
-              "\n"
-              "+===================+============+===============+===========+"
-              "\n"
-              "| Module            | Duration   | nb. Test Run  | Success   |"
-              "\n"
-              "+===================+============+===============+===========+"
-              "\n")
-    payload = []
-    stop_time = time.time()
-
-    # for each scenario we draw a row for the table
-    total_duration = 0.0
-    total_nb_tests = 0
-    total_success = 0.0
-    for s in GlobalVariables.SUMMARY:
-        name = "{0:<17}".format(s['test_name'])
-        duration = float(s['overall_duration'])
-        total_duration += duration
-        duration = time.strftime("%M:%S", time.gmtime(duration))
-        duration = "{0:<10}".format(duration)
-        nb_tests = "{0:<13}".format(s['nb_tests'])
-        total_nb_tests += int(s['nb_tests'])
-        success = "{0:<10}".format(str(s['success']) + '%')
-        total_success += float(s['success'])
-        report += ("" +
-                   "| " + name + " | " + duration + " | " +
-                   nb_tests + " | " + success + "|\n" +
-                   "+-------------------+------------"
-                   "+---------------+-----------+\n")
-        payload.append({'module': name,
-                        'details': {'duration': s['overall_duration'],
-                                    'nb tests': s['nb_tests'],
-                                    'success': s['success']}})
-
-    total_duration_str = time.strftime("%H:%M:%S", time.gmtime(total_duration))
-    total_duration_str2 = "{0:<10}".format(total_duration_str)
-    total_nb_tests_str = "{0:<13}".format(total_nb_tests)
-
-    if len(GlobalVariables.SUMMARY):
-        success_rate = total_success / len(GlobalVariables.SUMMARY)
-    else:
-        success_rate = 100
-    success_rate = "{:0.2f}".format(success_rate)
-    success_rate_str = "{0:<10}".format(str(success_rate) + '%')
-    report += "+===================+============+===============+===========+"
-    report += "\n"
-    report += ("| TOTAL:            | " + total_duration_str2 + " | " +
-               total_nb_tests_str + " | " + success_rate_str + "|\n")
-    report += "+===================+============+===============+===========+"
-    report += "\n"
-
-    logger.info("\n" + report)
-    payload.append({'summary': {'duration': total_duration,
-                                'nb tests': total_nb_tests,
-                                'nb success': success_rate}})
-
-    if args.sanity:
-        case_name = "rally_sanity"
-    else:
-        case_name = "rally_full"
-
-    # Evaluation of the success criteria
-    status = ft_utils.check_success_rate(case_name, success_rate)
-
-    exit_code = -1
-    if status == "PASS":
-        exit_code = 0
-
-    if args.report:
-        logger.debug("Pushing Rally summary into DB...")
-        ft_utils.push_results_to_db("functest",
-                                    case_name,
-                                    start_time,
-                                    stop_time,
-                                    status,
-                                    payload)
-    if args.noclean:
-        exit(exit_code)
-
-    if not image_exists:
-        logger.debug("Deleting image '%s' with ID '%s'..."
-                     % (GLANCE_IMAGE_NAME, image_id))
-        if not os_utils.delete_glance_image(GlobalVariables.nova_client,
-                                            image_id):
-            logger.error("Error deleting the glance image")
-
-    if not volume_types:
-        logger.debug("Deleting volume type '%s'..."
-                     % CINDER_VOLUME_TYPE_NAME)
-        if not os_utils.delete_volume_type(cinder_client, volume_type):
-            logger.error("Error in deleting volume type...")
-
-    exit(exit_code)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-cinder.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-cinder.yaml
deleted file mode 100644
index e844e33f..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-cinder.yaml
+++ /dev/null
@@ -1,266 +0,0 @@
-  CinderVolumes.create_and_attach_volume:
-    -
-      args:
-        {{ vm_params(image_name,flavor_name,1) }}
-        nics:
-          - net-id: {{ netid }}
-      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_list_snapshots:
-    -
-      args:
-        detailed: true
-        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_list_volume:
-    -
-      args:
-        detailed: true
-        {{ 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:
-        detailed: true
-        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_upload_volume_to_image:
-    -
-      args:
-        container_format: "bare"
-        disk_format: "raw"
-        do_delete: true
-        force: false
-        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_nested_snapshots_and_attach_volume:
-    -
-      args:
-        nested_level: 1
-        size:
-          max: 1
-          min: 1
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_volumes() }}
-        servers:
-          {{ vm_params(image_name,flavor_name,none)|indent(2,true) }}
-          servers_per_tenant: 1
-          auto_assign_nic: true
-        network: {}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderVolumes.create_snapshot_and_attach_volume:
-    -
-      args:
-        volume_type: false
-        size:
-          min: 1
-          max: 5
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_volumes() }}
-        servers:
-          {{ vm_params(image_name,flavor_name,none)|indent(2,true) }}
-          servers_per_tenant: 2
-          auto_assign_nic: true
-        network: {}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-    -
-      args:
-          volume_type: true
-          size:
-              min: 1
-              max: 5
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_volumes() }}
-        servers:
-          {{ vm_params(image_name,flavor_name,none)|indent(2,true) }}
-          servers_per_tenant: 2
-          auto_assign_nic: true
-        network: {}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderVolumes.create_volume:
-    -
-      args:
-        size: 1
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-    -
-      args:
-        size:
-          min: 1
-          max: 5
-      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.list_volumes:
-    -
-      args:
-        detailed: True
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_volumes() }}
-        volumes:
-          size: 1
-          volumes_per_tenant: 4
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  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/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-heat.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-heat.yaml
deleted file mode 100644
index 6f3a5c16..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-heat.yaml
+++ /dev/null
@@ -1,140 +0,0 @@
-  HeatStacks.create_and_delete_stack:
-    -
-      args:
-        template_path: "{{ tmpl_dir }}/default.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() }}
-    -
-      args:
-        template_path: "{{ tmpl_dir }}/server_with_ports.yaml.template"
-        parameters:
-          public_net: {{ floating_network }}
-          image: {{ image_name }}
-          flavor: {{ flavor_name }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-    -
-      args:
-        template_path: "{{ tmpl_dir }}/server_with_volume.yaml.template"
-        parameters:
-          image: {{ image_name }}
-          flavor: {{ flavor_name }}
-          network_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() }}
-
-  HeatStacks.create_and_list_stack:
-    -
-      args:
-        template_path: "{{ tmpl_dir }}/default.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_update_delete_stack:
-    -
-      args:
-        template_path: "{{ tmpl_dir }}/random_strings.yaml.template"
-        updated_template_path: "{{ tmpl_dir }}/updated_random_strings_add.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() }}
-    -
-      args:
-        template_path: "{{ tmpl_dir }}/random_strings.yaml.template"
-        updated_template_path: "{{ tmpl_dir }}/updated_random_strings_delete.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() }}
-    -
-      args:
-        template_path: "{{ tmpl_dir }}/resource_group.yaml.template"
-        updated_template_path: "{{ tmpl_dir }}/updated_resource_group_increase.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() }}
-    -
-      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() }}
-    -
-      args:
-        template_path: "{{ tmpl_dir }}/resource_group.yaml.template"
-        updated_template_path: "{{ tmpl_dir }}/updated_resource_group_reduce.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() }}
-    -
-      args:
-        template_path: "{{ tmpl_dir }}/random_strings.yaml.template"
-        updated_template_path: "{{ tmpl_dir }}/updated_random_strings_replace.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/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-neutron.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-neutron.yaml
deleted file mode 100644
index 0a773533..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-neutron.yaml
+++ /dev/null
@@ -1,239 +0,0 @@
-  NeutronNetworks.create_and_update_networks:
-    -
-      args:
-        network_create_args: {}
-        network_update_args:
-          admin_state_up: false
-      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_update_ports:
-    -
-      args:
-        network_create_args: {}
-        port_create_args: {}
-        port_update_args:
-          admin_state_up: false
-          device_id: "dummy_id"
-          device_owner: "dummy_owner"
-        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_update_routers:
-    -
-      args:
-        network_create_args: {}
-        router_create_args: {}
-        router_update_args:
-          admin_state_up: false
-        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_update_subnets:
-    -
-      args:
-        network_create_args: {}
-        subnet_cidr_start: "1.4.0.0/16"
-        subnet_create_args: {}
-        subnet_update_args:
-          enable_dhcp: false
-        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_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/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-nova.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-nova.yaml
deleted file mode 100644
index d7622093..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-nova.yaml
+++ /dev/null
@@ -1,369 +0,0 @@
-  NovaKeypair.create_and_delete_keypair:
-    -
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_nova(keypairs=true) }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NovaKeypair.create_and_list_keypairs:
-    -
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_nova(keypairs=true) }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NovaServers.boot_and_bounce_server:
-    -
-      args:
-        actions:
-          -
-            hard_reboot: 1
-          -
-            soft_reboot: 1
-          -
-            stop_start: 1
-          -
-            rescue_unrescue: 1
-        {{ vm_params(image_name, flavor_name) }}
-        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() }}
-
-  NovaServers.boot_and_delete_server:
-    -
-      args:
-        {{ vm_params(image_name, flavor_name) }}
-        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() }}
-
-  NovaServers.boot_and_list_server:
-    -
-      args:
-        detailed: true
-        {{ vm_params(image_name, flavor_name) }}
-        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() }}
-
-  NovaServers.boot_and_rebuild_server:
-    -
-      args:
-        {{ vm_params(flavor=flavor_name) }}
-        from_image:
-          name: {{ image_name }}
-        to_image:
-          name: {{ image_name }}
-        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() }}
-
-  NovaServers.snapshot_server:
-    -
-      args:
-        {{ vm_params(image_name, flavor_name) }}
-        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() }}
-
-  NovaServers.boot_server_from_volume:
-    -
-      args:
-        {{ vm_params(image_name, flavor_name) }}
-        volume_size: 10
-        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:
-    -
-      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() }}
-
-  NovaSecGroup.create_and_delete_secgroups:
-    -
-      args:
-        security_group_count: 10
-        rules_per_security_group: 10
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_neutron(secgroups=true) }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NovaSecGroup.create_and_list_secgroups:
-    -
-      args:
-        security_group_count: 10
-        rules_per_security_group: 10
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_neutron(secgroups=true) }}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NovaServers.list_servers:
-    -
-      args:
-        detailed: True
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        servers:
-          {{ vm_params(image_name,flavor_name,none)|indent(2,true) }}
-          servers_per_tenant: 2
-          auto_assign_nic: true
-        network: {}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  NovaServers.resize_server:
-    -
-      args:
-        {{ vm_params(image_name, flavor_name) }}
-        to_flavor:
-          name: "m1.small"
-        confirm: true
-        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() }}
-
-  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() }}
-
-  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() }}
diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-authenticate.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-authenticate.yaml
deleted file mode 100644
index a04e4c1c..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-authenticate.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-  Authenticate.keystone:
-    -
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  Authenticate.validate_cinder:
-    -
-      args:
-        repetitions: 2
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  Authenticate.validate_glance:
-    -
-      args:
-        repetitions: 2
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  Authenticate.validate_heat:
-    -
-      args:
-        repetitions: 2
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  Authenticate.validate_neutron:
-    -
-      args:
-        repetitions: 2
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  Authenticate.validate_nova:
-    -
-      args:
-        repetitions: 2
-      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/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-glance.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-glance.yaml
deleted file mode 100644
index 3a67e745..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-glance.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-  GlanceImages.create_and_delete_image:
-    -
-      args:
-        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  GlanceImages.create_and_list_image:
-    -
-      args:
-        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  GlanceImages.list_images:
-    -
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  GlanceImages.create_image_and_boot_instances:
-    -
-      args:
-        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
-        flavor:
-            name: {{ flavor_name }}
-        number_instances: 2
-        nics:
-          - net-id: {{ netid }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-        quotas:
-          {{ unlimited_nova() }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-keystone.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-keystone.yaml
deleted file mode 100644
index bfc9948b..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-keystone.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-  KeystoneBasic.add_and_remove_user_role:
-    -
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  KeystoneBasic.create_add_and_list_user_roles:
-    -
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  KeystoneBasic.create_and_list_tenants:
-    -
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  KeystoneBasic.create_and_delete_role:
-    -
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  KeystoneBasic.create_and_delete_service:
-    -
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  KeystoneBasic.get_entities:
-    -
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  KeystoneBasic.create_update_and_delete_tenant:
-    -
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  KeystoneBasic.create_user:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  KeystoneBasic.create_tenant:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  KeystoneBasic.create_and_list_users:
-    -
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  KeystoneBasic.create_tenant_with_users:
-    -
-      args:
-        users_per_tenant: 10
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-quotas.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-quotas.yaml
deleted file mode 100644
index a0682acc..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-quotas.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-  Quotas.cinder_update_and_delete:
-    -
-      args:
-        max_quota: 1024
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  Quotas.cinder_update:
-    -
-      args:
-        max_quota: 1024
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  Quotas.neutron_update:
-    -
-      args:
-        max_quota: 1024
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  Quotas.nova_update_and_delete:
-    -
-      args:
-        max_quota: 1024
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  Quotas.nova_update:
-    -
-      args:
-        max_quota: 1024
-      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/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-requests.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-requests.yaml
deleted file mode 100644
index 16136978..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-requests.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-  HttpRequests.check_request:
-    -
-      args:
-        url: "{{ request_url }}"
-        method: "GET"
-        status_code: 200
-        allow_redirects: True
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-vm.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-vm.yaml
deleted file mode 100644
index 74f50992..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-vm.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-  VMTasks.boot_runcommand_delete:
-    -
-      args:
-        {{ vm_params(image_name, flavor_name) }}
-        floating_network: {{ floating_network }}
-        force_delete: false
-        command:
-          interpreter: /bin/sh
-          script_file: {{ sup_dir }}/instance_dd_test.sh
-        username: cirros
-        nics:
-          - net-id: {{ netid }}
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-    -
-      args:
-        {{ vm_params(image_name, flavor_name) }}
-        fixed_network: private
-        floating_network: {{ floating_network }}
-        force_delete: false
-        command:
-          interpreter: /bin/sh
-          script_file: {{ sup_dir }}/instance_dd_test.sh
-        use_floatingip: true
-        username: cirros
-        nics:
-          - net-id: {{ netid }}
-        volume_args:
-          size: 2
-      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/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-cinder.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-cinder.yaml
deleted file mode 100644
index 5962b1db..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-cinder.yaml
+++ /dev/null
@@ -1,84 +0,0 @@
-  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/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-heat.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-heat.yaml
deleted file mode 100644
index dc34cc3f..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-heat.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-  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/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-neutron.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-neutron.yaml
deleted file mode 100644
index 159f2b63..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-neutron.yaml
+++ /dev/null
@@ -1,152 +0,0 @@
-  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/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-nova.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-nova.yaml
deleted file mode 100644
index e2795cf7..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-nova.yaml
+++ /dev/null
@@ -1,140 +0,0 @@
-  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() }}
-
-  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() }}
diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/support/instance_dd_test.sh b/functest/opnfv_tests/OpenStack/rally/scenario/support/instance_dd_test.sh
deleted file mode 100755
index e3bf2340..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/support/instance_dd_test.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-time_seconds(){ (time -p $1 ) 2>&1 |awk '/real/{print $2}'; }
-file=/tmp/test.img
-c=${1:-$SIZE}
-c=${c:-1000} #default is 1GB
-write_seq=$(time_seconds "dd if=/dev/zero of=$file bs=1M count=$c")
-read_seq=$(time_seconds "dd if=$file of=/dev/null bs=1M count=$c")
-[ -f $file ] && rm $file
-
-echo "{
-    \"write_seq_${c}m\": $write_seq,
-    \"read_seq_${c}m\": $read_seq
-    }"
diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/templates/autoscaling_policy.yaml.template b/functest/opnfv_tests/OpenStack/rally/scenario/templates/autoscaling_policy.yaml.template
deleted file mode 100644
index a22487e3..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/templates/autoscaling_policy.yaml.template
+++ /dev/null
@@ -1,17 +0,0 @@
-heat_template_version: 2013-05-23
-
-resources:
-  test_group:
-    type: OS::Heat::AutoScalingGroup
-    properties:
-      desired_capacity: 0
-      max_size: 0
-      min_size: 0
-      resource:
-        type: OS::Heat::RandomString
-  test_policy:
-    type: OS::Heat::ScalingPolicy
-    properties:
-      adjustment_type: change_in_capacity
-      auto_scaling_group_id: { get_resource: test_group }
-      scaling_adjustment: 1
\ No newline at end of file
diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/templates/default.yaml.template b/functest/opnfv_tests/OpenStack/rally/scenario/templates/default.yaml.template
deleted file mode 100644
index eb4f2f2d..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/templates/default.yaml.template
+++ /dev/null
@@ -1 +0,0 @@
-heat_template_version: 2014-10-16
\ No newline at end of file
diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/templates/random_strings.yaml.template b/functest/opnfv_tests/OpenStack/rally/scenario/templates/random_strings.yaml.template
deleted file mode 100644
index 2dd676c1..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/templates/random_strings.yaml.template
+++ /dev/null
@@ -1,13 +0,0 @@
-heat_template_version: 2014-10-16
-
-description: Test template for rally create-update-delete scenario
-
-resources:
-  test_string_one:
-    type: OS::Heat::RandomString
-    properties:
-      length: 20
-  test_string_two:
-    type: OS::Heat::RandomString
-    properties:
-      length: 20
\ No newline at end of file
diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/templates/resource_group.yaml.template b/functest/opnfv_tests/OpenStack/rally/scenario/templates/resource_group.yaml.template
deleted file mode 100644
index b3f505fa..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/templates/resource_group.yaml.template
+++ /dev/null
@@ -1,13 +0,0 @@
-heat_template_version: 2014-10-16
-
-description: Test template for rally create-update-delete scenario
-
-resources:
-  test_group:
-    type: OS::Heat::ResourceGroup
-    properties:
-      count: 2
-      resource_def:
-        type: OS::Heat::RandomString
-        properties:
-          length: 20
\ No newline at end of file
diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/templates/server_with_ports.yaml.template b/functest/opnfv_tests/OpenStack/rally/scenario/templates/server_with_ports.yaml.template
deleted file mode 100644
index 909f45d2..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/templates/server_with_ports.yaml.template
+++ /dev/null
@@ -1,64 +0,0 @@
-heat_template_version: 2013-05-23
-
-parameters:
-  # set all correct defaults for parameters before launch test
-  public_net:
-    type: string
-    default: public
-  image:
-    type: string
-    default: cirros-0.3.4-x86_64-uec
-  flavor:
-    type: string
-    default: m1.tiny
-  cidr:
-    type: string
-    default: 11.11.11.0/24
-
-resources:
-  server:
-    type: OS::Nova::Server
-    properties:
-      image: {get_param: image}
-      flavor: {get_param: flavor}
-      networks:
-        - port: { get_resource: server_port }
-
-  router:
-    type: OS::Neutron::Router
-    properties:
-      external_gateway_info:
-        network: {get_param: public_net}
-
-  router_interface:
-    type: OS::Neutron::RouterInterface
-    properties:
-      router_id: { get_resource: router }
-      subnet_id: { get_resource: private_subnet }
-
-  private_net:
-    type: OS::Neutron::Net
-
-  private_subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      network: { get_resource: private_net }
-      cidr: {get_param: cidr}
-
-  port_security_group:
-    type: OS::Neutron::SecurityGroup
-    properties:
-      name: default_port_security_group
-      description: >
-        Default security group assigned to port. The neutron default group is not
-        used because neutron creates several groups with the same name=default and
-        nova cannot chooses which one should it use.
-
-  server_port:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_resource: private_net}
-      fixed_ips:
-        - subnet: { get_resource: private_subnet }
-      security_groups:
-        - { get_resource: port_security_group }
diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/templates/server_with_volume.yaml.template b/functest/opnfv_tests/OpenStack/rally/scenario/templates/server_with_volume.yaml.template
deleted file mode 100644
index 826ca9da..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/templates/server_with_volume.yaml.template
+++ /dev/null
@@ -1,43 +0,0 @@
-heat_template_version: 2013-05-23
-
-parameters:
-  # set all correct defaults for parameters before launch test
-  image:
-    type: string
-    default: cirros-0.3.4-x86_64-uec
-  flavor:
-    type: string
-    default: m1.tiny
-  availability_zone:
-    type: string
-    description: The Availability Zone to launch the instance.
-    default: nova
-  volume_size:
-    type: number
-    description: Size of the volume to be created.
-    default: 1
-    constraints:
-      - range: { min: 1, max: 1024 }
-        description: must be between 1 and 1024 Gb.
-  network_id:
-    type: string
-
-resources:
-  server:
-    type: OS::Nova::Server
-    properties:
-      image: {get_param: image}
-      flavor: {get_param: flavor}
-      networks:
-        - network: { get_param: network_id }
-  cinder_volume:
-    type: OS::Cinder::Volume
-    properties:
-      size: { get_param: volume_size }
-      availability_zone: { get_param: availability_zone }
-  volume_attachment:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      volume_id: { get_resource: cinder_volume }
-      instance_uuid: { get_resource: server}
-      mountpoint: /dev/vdc
diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_autoscaling_policy_inplace.yaml.template b/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_autoscaling_policy_inplace.yaml.template
deleted file mode 100644
index cf34879c..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_autoscaling_policy_inplace.yaml.template
+++ /dev/null
@@ -1,23 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  Test template for create-update-delete-stack scenario in rally.
-  The template updates resource parameters without resource re-creation(replacement)
-  in the stack defined by autoscaling_policy.yaml.template. It allows to measure
-  performance of "pure" resource update operation only.
-
-resources:
-  test_group:
-    type: OS::Heat::AutoScalingGroup
-    properties:
-      desired_capacity: 0
-      max_size: 0
-      min_size: 0
-      resource:
-        type: OS::Heat::RandomString
-  test_policy:
-    type: OS::Heat::ScalingPolicy
-    properties:
-      adjustment_type: change_in_capacity
-      auto_scaling_group_id: { get_resource: test_group }
-      scaling_adjustment: -1
\ No newline at end of file
diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_add.yaml.template b/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_add.yaml.template
deleted file mode 100644
index e06d42e0..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_add.yaml.template
+++ /dev/null
@@ -1,19 +0,0 @@
-heat_template_version: 2014-10-16
-
-description: >
-  Test template for create-update-delete-stack scenario in rally.
-  The template updates the stack defined by random_strings.yaml.template with additional resource.
-
-resources:
-  test_string_one:
-    type: OS::Heat::RandomString
-    properties:
-      length: 20
-  test_string_two:
-    type: OS::Heat::RandomString
-    properties:
-      length: 20
-  test_string_three:
-    type: OS::Heat::RandomString
-    properties:
-      length: 20
\ No newline at end of file
diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_delete.yaml.template b/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_delete.yaml.template
deleted file mode 100644
index d02593e3..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_delete.yaml.template
+++ /dev/null
@@ -1,11 +0,0 @@
-heat_template_version: 2014-10-16
-
-description: >
-  Test template for create-update-delete-stack scenario in rally.
-  The template deletes one resource from the stack defined by random_strings.yaml.template.
-
-resources:
-  test_string_one:
-    type: OS::Heat::RandomString
-    properties:
-      length: 20
\ No newline at end of file
diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_replace.yaml.template b/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_replace.yaml.template
deleted file mode 100644
index 46d8bff4..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_replace.yaml.template
+++ /dev/null
@@ -1,19 +0,0 @@
-heat_template_version: 2014-10-16
-
-description: >
-  Test template for create-update-delete-stack scenario in rally.
-  The template deletes one resource from the stack defined by
-  random_strings.yaml.template and re-creates it with the updated parameters
-  (so-called update-replace). That happens because some parameters cannot be
-  changed without resource re-creation. The template allows to measure performance
-  of update-replace operation.
-
-resources:
-  test_string_one:
-    type: OS::Heat::RandomString
-    properties:
-      length: 20
-  test_string_two:
-    type: OS::Heat::RandomString
-    properties:
-      length: 40
\ No newline at end of file
diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_resource_group_increase.yaml.template b/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_resource_group_increase.yaml.template
deleted file mode 100644
index 891074eb..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_resource_group_increase.yaml.template
+++ /dev/null
@@ -1,16 +0,0 @@
-heat_template_version: 2014-10-16
-
-description: >
-  Test template for create-update-delete-stack scenario in rally.
-  The template updates one resource from the stack defined by resource_group.yaml.template
-  and adds children resources to that resource.
-
-resources:
-  test_group:
-    type: OS::Heat::ResourceGroup
-    properties:
-      count: 3
-      resource_def:
-        type: OS::Heat::RandomString
-        properties:
-          length: 20
\ No newline at end of file
diff --git a/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_resource_group_reduce.yaml.template b/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_resource_group_reduce.yaml.template
deleted file mode 100644
index b4d1d173..00000000
--- a/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_resource_group_reduce.yaml.template
+++ /dev/null
@@ -1,16 +0,0 @@
-heat_template_version: 2014-10-16
-
-description: >
-  Test template for create-update-delete-stack scenario in rally.
-  The template updates one resource from the stack defined by resource_group.yaml.template
-  and deletes children resources from that resource.
-
-resources:
-  test_group:
-    type: OS::Heat::ResourceGroup
-    properties:
-      count: 1
-      resource_def:
-        type: OS::Heat::RandomString
-        properties:
-          length: 20
\ No newline at end of file
diff --git a/functest/opnfv_tests/OpenStack/rally/task.yaml b/functest/opnfv_tests/OpenStack/rally/task.yaml
deleted file mode 100644
index c482f120..00000000
--- a/functest/opnfv_tests/OpenStack/rally/task.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-{%- if smoke %}
-{%- set users_amount = 1 %}
-{%- set tenants_amount = 1 %}
-{%- endif %}
-
-{%- from "macro/macro.yaml" import user_context, vm_params, unlimited_volumes, constant_runner, rps_runner, no_failures_sla -%}
-{%- from "macro/macro.yaml" import volumes, unlimited_nova, unlimited_neutron, glance_args -%}
-
----
-{% if "authenticate" in service_list %}
-{%- include "var/opnfv-authenticate.yaml"-%}
-{% endif %}
-
-{% if "cinder" in service_list %}
-{%- include "var/opnfv-cinder.yaml"-%}
-{% endif %}
-
-{% if "keystone" in service_list %}
-{%- include "var/opnfv-keystone.yaml"-%}
-{% endif %}
-
-{% if "nova" in service_list %}
-{%- include "var/opnfv-nova.yaml"-%}
-{% endif %}
-
-{% if "glance" in service_list %}
-{%- include "var/opnfv-glance.yaml"-%}
-{% endif %}
-
-{% if "neutron" in service_list %}
-{%- include "var/opnfv-neutron.yaml"-%}
-{% endif %}
-
-{% if "quotas" in service_list %}
-{%- include "var/opnfv-quotas.yaml"-%}
-{% endif %}
-
-{% if "requests" in service_list %}
-{%- include "var/opnfv-requests.yaml"-%}
-{% endif %}
-
-{% if "heat" in service_list %}
-{%- include "var/opnfv-heat.yaml"-%}
-{% endif %}
-
-{% if "vm" in service_list %}
-{%- include "var/opnfv-vm.yaml"-%}
-{% endif %}