Remove unused Rally scenarios and run script

run_rally.py is longer in use, it has been replaced with
run_rally-cert.py already earlier.

JIRA: FUNCTEST-191

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

16 files changed, 3 insertions, 2851 deletions

diff --git a/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py b/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py
index c62a65032..078e5eaa1 100755
--- a/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py
+++ b/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py
@@ -96,11 +96,8 @@ with open("/home/opnfv/functest/conf/config_functest.yaml") as f:
 f.close()
 
 HOME = os.environ['HOME']+"/"
-### todo:
-# SCENARIOS_DIR = REPO_PATH + functest_yaml.get("general"). \
-#    get("directories").get("dir_rally_scn")
-SCENARIOS_DIR = REPO_PATH + "testcases/VIM/OpenStack/CI/rally_cert/"
-###
+SCENARIOS_DIR = REPO_PATH + functest_yaml.get("general"). \
+    get("directories").get("dir_rally_scn")
 TEMPLATE_DIR = SCENARIOS_DIR + "scenario/templates"
 SUPPORT_DIR = SCENARIOS_DIR + "scenario/support"
 ###todo:
diff --git a/testcases/VIM/OpenStack/CI/libraries/run_rally.py b/testcases/VIM/OpenStack/CI/libraries/run_rally.py
deleted file mode 100755
index a33963986..000000000
--- a/testcases/VIM/OpenStack/CI/libraries/run_rally.py
+++ /dev/null
@@ -1,289 +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
-#
-
-import re
-import json
-import os
-import argparse
-import logging
-import yaml
-import requests
-import subprocess
-import sys
-from novaclient import client as novaclient
-from keystoneclient.v2_0 import client as keystoneclient
-from glanceclient import client as glanceclient
-
-""" tests configuration """
-tests = ['authenticate', 'glance', 'cinder', 'ceilometer', '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]} | {d[11]}]. The 'all' value "
-                         "performs all the  possible tests 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("-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")
-
-args = parser.parse_args()
-
-if args.verbose:
-    RALLY_STDERR = subprocess.STDOUT
-else:
-    RALLY_STDERR = open(os.devnull, 'w')
-
-""" logging configuration """
-logger = logging.getLogger("run_rally")
-logger.setLevel(logging.DEBUG)
-
-ch = logging.StreamHandler()
-if args.debug:
-    ch.setLevel(logging.DEBUG)
-else:
-    ch.setLevel(logging.INFO)
-
-formatter = logging.Formatter("%(asctime)s - %(name)s - "
-                              "%(levelname)s - %(message)s")
-ch.setFormatter(formatter)
-logger.addHandler(ch)
-
-REPO_PATH = os.environ['repos_dir']+'/functest/'
-if not os.path.exists(REPO_PATH):
-    logger.error("Functest repository directory not found '%s'" % REPO_PATH)
-    exit(-1)
-sys.path.append(REPO_PATH + "testcases/")
-import functest_utils
-import openstack_utils
-
-with open("/home/opnfv/functest/conf/config_functest.yaml") as f:
-    functest_yaml = yaml.safe_load(f)
-f.close()
-
-HOME = os.environ['HOME']+"/"
-SCENARIOS_DIR = REPO_PATH + functest_yaml.get("general"). \
-    get("directories").get("dir_rally_scn")
-RESULTS_DIR = functest_yaml.get("general").get("directories"). \
-    get("dir_rally_res")
-TEST_DB = functest_yaml.get("results").get("test_db_url")
-
-GLANCE_IMAGE_NAME = "functest-img-rally"
-GLANCE_IMAGE_FILENAME = functest_yaml.get("general"). \
-    get("openstack").get("image_file_name")
-GLANCE_IMAGE_FORMAT = functest_yaml.get("general"). \
-    get("openstack").get("image_disk_format")
-GLANCE_IMAGE_PATH = functest_yaml.get("general"). \
-    get("directories").get("dir_functest_data") + "/" + GLANCE_IMAGE_FILENAME
-
-
-def push_results_to_db(case, payload):
-
-    url = TEST_DB + "/results"
-    installer = functest_utils.get_installer_type(logger)
-    scenario = functest_utils.get_scenario(logger)
-    pod_name = functest_utils.get_pod_name(logger)
-    build_tag = functest_utils.get_build_tag(logger)
-    # TODO pod_name hardcoded, info shall come from Jenkins
-    params = {"project_name": "functest", "case_name": case,
-              "pod_name": pod_name, "installer": installer,
-              "version": scenario, "build_tag": build_tag,
-              "details": payload}
-
-    headers = {'Content-Type': 'application/json'}
-    r = requests.post(url, data=json.dumps(params), headers=headers)
-    logger.debug(r)
-
-
-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)
-    rally_report = rally_report[0]
-    if rally_report is None:
-        return False
-    if rally_report.get('result') is None:
-        return False
-
-    for result in rally_report.get('result'):
-        if len(result.get('error')) > 0:
-            return False
-
-    return True
-
-
-def run_task(test_name):
-    #
-    # the "main" function of the script who lunch rally for a task
-    # :param test_name: name for the rally test
-    # :return: void
-    #
-
-    logger.info('starting {} test ...'.format(test_name))
-
-    # check directory for scenarios test files or retrieve from git otherwise
-    proceed_test = True
-    test_file_name = '{}opnfv-{}.json'.format(SCENARIOS_DIR, test_name)
-
-    if not os.path.exists(test_file_name):
-        logger.error("The scenario '%s' does not exist." % test_file_name)
-        exit(-1)
-
-    # we do the test only if we have a scenario test file
-    if proceed_test:
-        logger.debug('Scenario fetched from : {}'.format(test_file_name))
-        cmd_line = "rally task start --abort-on-sla-failure {}".format(test_file_name)
-        logger.debug('running command line : {}'.format(cmd_line))
-        p = subprocess.Popen(cmd_line, stdout=subprocess.PIPE, stderr=RALLY_STDERR, shell=True)
-        result = ""
-        while p.poll() is None:
-            l = p.stdout.readline()
-            print l.replace('\n', '')
-            result += l
-
-        task_id = get_task_id(result)
-        logger.debug('task_id : {}'.format(task_id))
-
-        if task_id is None:
-            logger.error("failed to retrieve task_id")
-            exit(-1)
-
-        # check for result directory and create it otherwise
-        if not os.path.exists(RESULTS_DIR):
-            logger.debug('does not exists, we create it'.format(RESULTS_DIR))
-            os.makedirs(RESULTS_DIR)
-
-        # write html report file
-        report_file_name = '{}opnfv-{}.html'.format(RESULTS_DIR, test_name)
-        cmd_line = "rally task report {} --out {}".format(task_id,
-                                                          report_file_name)
-
-        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()
-        with open('{}opnfv-{}.json'.format(RESULTS_DIR, test_name), 'w') as f:
-            logger.debug('saving json file')
-            f.write(json_results)
-
-        with open('{}opnfv-{}.json'
-                  .format(RESULTS_DIR, test_name)) as json_file:
-            json_data = json.load(json_file)
-
-        # Push results in payload of testcase
-        if args.report:
-            logger.debug("Push result into DB")
-            push_results_to_db("Rally_details", json_data)
-
-        """ parse JSON operation result """
-        if task_succeed(json_results):
-            print 'Test OK'
-        else:
-            print 'Test KO'
-    else:
-        logger.error('{} test failed, unable to fetch a scenario test file'
-                     .format(test_name))
-
-
-def main():
-    # configure script
-    if not (args.test_name in tests):
-        logger.error('argument not valid')
-        exit(-1)
-
-    creds_nova = openstack_utils.get_credentials("nova")
-    nova_client = novaclient.Client('2', **creds_nova)
-    creds_keystone = openstack_utils.get_credentials("keystone")
-    keystone_client = keystoneclient.Client(**creds_keystone)
-    glance_endpoint = keystone_client.service_catalog.url_for(service_type='image',
-                                                              endpoint_type='publicURL')
-    glance_client = glanceclient.Client(1, glance_endpoint,
-                                        token=keystone_client.auth_token)
-
-    image_id = openstack_utils.get_image_id(glance_client, GLANCE_IMAGE_NAME)
-
-    if image_id == '':
-        logger.debug("Creating image '%s' from '%s'..." % (GLANCE_IMAGE_NAME,
-                                                           GLANCE_IMAGE_PATH))
-        image_id = openstack_utils.create_glance_image(glance_client,
-                                                GLANCE_IMAGE_NAME,
-                                                GLANCE_IMAGE_PATH)
-        if not image_id:
-            logger.error("Failed to create the Glance image...")
-            exit(-1)
-        else:
-            logger.debug("Image '%s' with ID '%s' created succesfully ." \
-                         % (GLANCE_IMAGE_NAME, image_id))
-    else:
-        logger.debug("Using existing image '%s' with ID '%s'..." \
-                     % (GLANCE_IMAGE_NAME, image_id))
-
-    if args.test_name == "all":
-        for test_name in tests:
-            if not (test_name == 'all' or
-                    test_name == 'heat' or
-                    test_name == 'ceilometer' or
-                    test_name == 'smoke' or
-                    test_name == 'vm'):
-                print(test_name)
-                run_task(test_name)
-    else:
-        print(args.test_name)
-        run_task(args.test_name)
-
-    if args.noclean:
-        exit(0)
-
-    logger.debug("Deleting image '%s' with ID '%s'..." \
-                         % (GLANCE_IMAGE_NAME, image_id))
-    if not openstack_utils.delete_glance_image(nova_client, image_id):
-        logger.error("Error deleting the glance image")
-
-if __name__ == '__main__':
-    main()
diff --git a/testcases/VIM/OpenStack/CI/suites/opnfv-authenticate.json b/testcases/VIM/OpenStack/CI/suites/opnfv-authenticate.json
deleted file mode 100644
index 8bb589524..000000000
--- a/testcases/VIM/OpenStack/CI/suites/opnfv-authenticate.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-    "Authenticate.keystone": [
-        {
-            "runner": {
-                "type": "constant",
-                "times": 100,
-                "concurrency": 5
-            },
-            "context": {
-                "users": {
-                    "tenants": 3,
-                    "users_per_tenant": 50
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "Authenticate.validate_cinder": [
-        {
-            "args": {
-                "repetitions": 2
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 5
-            },
-            "context": {
-                "users": {
-                    "tenants": 3,
-                    "users_per_tenant": 5
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "Authenticate.validate_glance": [
-        {
-            "args": {
-                "repetitions": 2
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 5
-            },
-            "context": {
-                "users": {
-                    "tenants": 3,
-                    "users_per_tenant": 5
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "Authenticate.validate_heat": [
-        {
-            "args": {
-                "repetitions": 2
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 5
-            },
-            "context": {
-                "users": {
-                    "tenants": 3,
-                    "users_per_tenant": 5
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "Authenticate.validate_neutron": [
-        {
-            "args": {
-                "repetitions": 2
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 5
-            },
-            "context": {
-                "users": {
-                    "tenants": 3,
-                    "users_per_tenant": 5
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "Authenticate.validate_nova": [
-        {
-            "args": {
-                "repetitions": 2
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 5
-            },
-            "context": {
-                "users": {
-                    "tenants": 3,
-                    "users_per_tenant": 5
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ]
-}
diff --git a/testcases/VIM/OpenStack/CI/suites/opnfv-cinder.json b/testcases/VIM/OpenStack/CI/suites/opnfv-cinder.json
deleted file mode 100644
index bada44733..000000000
--- a/testcases/VIM/OpenStack/CI/suites/opnfv-cinder.json
+++ /dev/null
@@ -1,333 +0,0 @@
-{
-    "CinderVolumes.create_and_attach_volume": [
-        {
-            "args": {
-                "size": 10,
-                "image": {
-                    "name": "^functest-img*"
-                },
-                "flavor": {
-                    "name": "m1.tiny"
-                }
-            },
-            "runner": {
-                "type": "constant",
-                "times": 5,
-                "concurrency": 1
-            },
-            "context": {
-                "users": {
-                    "tenants": 2,
-                    "users_per_tenant": 2
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "CinderVolumes.create_and_delete_snapshot": [
-        {
-            "args": {
-                "force": false
-            },
-            "runner": {
-                "type": "constant",
-                "times": 3,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 2,
-                    "users_per_tenant": 2
-                },
-                "volumes": {
-                    "size": 1
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "CinderVolumes.create_and_delete_volume": [
-        {
-            "args": {
-                "size": 1
-            },
-            "runner": {
-                "type": "constant",
-                "times": 3,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 2,
-                    "users_per_tenant": 2
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "CinderVolumes.create_and_extend_volume": [
-        {
-            "args": {
-                "size": 1,
-                "new_size": 2
-            },
-            "runner": {
-                "type": "constant",
-                "times": 2,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 1,
-                    "users_per_tenant": 1
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "CinderVolumes.create_and_list_snapshots": [
-        {
-            "args": {
-                "force": false,
-                "detailed": true
-            },
-            "runner": {
-                "type": "constant",
-                "times": 2,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 1,
-                    "users_per_tenant": 1
-                },
-                "volumes": {
-                    "size": 1
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "CinderVolumes.create_and_list_volume": [
-        {
-            "args": {
-                "size": 1,
-                "detailed": true
-            },
-            "runner": {
-                "type": "constant",
-                "times": 3,
-                "concurrency": 1
-            },
-            "context": {
-                "users": {
-                    "tenants": 1,
-                    "users_per_tenant": 1
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "CinderVolumes.create_and_upload_volume_to_image": [
-        {
-            "args": {
-                "size": 1,
-                "force": false,
-                "container_format": "bare",
-                "disk_format": "raw",
-                "do_delete": true
-            },
-            "runner": {
-                "type": "constant",
-                "times": 3,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 2,
-                    "users_per_tenant": 2
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "CinderVolumes.create_and_delete_volume": [
-        {
-            "args": {
-                "size": 1,
-                "image": {
-                    "name": "^functest-img*"
-                }
-            },
-            "runner": {
-                "type": "constant",
-                "times": 2,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 2,
-                    "users_per_tenant": 2
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "CinderVolumes.create_from_volume_and_delete_volume": [
-        {
-            "args": {
-                "size": 1
-            },
-            "runner": {
-                "type": "constant",
-                "times": 2,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 1,
-                    "users_per_tenant": 1
-                },
-                "volumes": {
-                    "size": 1
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "CinderVolumes.create_nested_snapshots_and_attach_volume": [
-        {
-            "args": {
-                "size": {
-                    "min": 1,
-                    "max": 5
-                },
-                "nested_level": {
-                    "min": 5,
-                    "max": 10
-                }
-            },
-            "runner": {
-                "type": "constant",
-                "times": 1,
-                "concurrency": 1
-            },
-            "context": {
-                "users": {
-                    "tenants": 2,
-                    "users_per_tenant": 1
-                },
-                "servers": {
-                    "image": {
-                        "name": "^functest-img*"
-                    },
-                    "flavor": {
-                        "name": "m1.tiny"
-                    },
-                    "servers_per_tenant": 2
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "CinderVolumes.create_snapshot_and_attach_volume": [
-        {
-            "args": {
-                "volume_type": false,
-                "size": {
-                    "min": 1,
-                    "max": 5
-                }
-            },
-            "runner": {
-                "type": "constant",
-                "times": 4,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 2,
-                    "users_per_tenant": 1
-                },
-                "servers": {
-                    "image": {
-                        "name": "^functest-img*"
-                    },
-                    "flavor": {
-                        "name": "m1.tiny"
-                    },
-                    "servers_per_tenant": 2
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "CinderVolumes.create_volume": [
-        {
-            "args": {
-                "size": 1
-            },
-            "runner": {
-                "type": "constant",
-                "times": 3,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 2,
-                    "users_per_tenant": 2
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "CinderVolumes.list_volumes": [
-        {
-            "args": {
-                "detailed": true
-            },
-            "runner": {
-                "type": "constant",
-                "times": 100,
-                "concurrency": 1
-            },
-            "context": {
-                "users": {
-                    "tenants": 1,
-                    "users_per_tenant": 1
-                },
-                "volumes": {
-                    "size": 1,
-                    "volumes_per_tenant": 4
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ]
-}
diff --git a/testcases/VIM/OpenStack/CI/suites/opnfv-glance.json b/testcases/VIM/OpenStack/CI/suites/opnfv-glance.json
deleted file mode 100644
index e905ccaba..000000000
--- a/testcases/VIM/OpenStack/CI/suites/opnfv-glance.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-    "GlanceImages.list_images": [
-        {
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 1
-            },
-            "context": {
-                "users": {
-                    "tenants": 2,
-                    "users_per_tenant": 2
-                },
-                "images": {
-                    "image_url": "http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img",
-                    "image_type": "qcow2",
-                    "image_container": "bare",
-                    "images_per_tenant": 4
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "GlanceImages.create_and_delete_image": [
-        {
-            "args": {
-                "image_location": "http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img",
-                "container_format": "bare",
-                "disk_format": "qcow2"
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 2,
-                    "users_per_tenant": 3
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "GlanceImages.create_and_list_image": [
-        {
-            "args": {
-                "image_location": "http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img",
-                "container_format": "bare",
-                "disk_format": "qcow2"
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 1
-            },
-            "context": {
-                "users": {
-                    "tenants": 1,
-                    "users_per_tenant": 1
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "GlanceImages.create_image_and_boot_instances": [
-        {
-            "args": {
-                "image_location": "http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img",
-                "container_format": "bare",
-                "disk_format": "qcow2",
-                "flavor": {
-                    "name": "m1.small"
-                },
-                "number_instances": 2
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 3,
-                    "users_per_tenant": 5
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ]
-}
diff --git a/testcases/VIM/OpenStack/CI/suites/opnfv-heat.json b/testcases/VIM/OpenStack/CI/suites/opnfv-heat.json
deleted file mode 100644
index a712afefe..000000000
--- a/testcases/VIM/OpenStack/CI/suites/opnfv-heat.json
+++ /dev/null
@@ -1,277 +0,0 @@
-{
-    "HeatStacks.create_and_delete_stack": [
-        {
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 2,
-                    "users_per_tenant": 3
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "HeatStacks.create_and_delete_stack": [
-        {
-            "args": {
-               "template_path": "templates/server_with_ports.yaml.template"
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 2,
-                    "users_per_tenant": 3
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "HeatStacks.create_and_delete_stack": [
-        {
-            "args": {
-               "template_path": "templates/server_with_volume.yaml.template"
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 2,
-                    "users_per_tenant": 3
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "HeatStacks.create_and_list_stack": [
-        {
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 1
-            },
-            "context": {
-                "users": {
-                    "tenants": 1,
-                    "users_per_tenant": 1
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "HeatStacks.create_check_delete_stack": [
-        {
-            "args": {
-              "template_path": "templates/random_strings.yaml.template"
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 2,
-                    "users_per_tenant": 3
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "HeatStacks.create_suspend_resume_delete_stack": [
-        {
-            "args": {
-               "template_path": "templates/random_strings.yaml.template"
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 3,
-                    "users_per_tenant": 2
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "HeatStacks.create_update_delete_stack": [
-        {
-            "args": {
-               "template_path": "templates/random_strings.yaml.template",
-               "updated_template_path": "templates/updated_random_strings_add.yaml.template"
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 2,
-                    "users_per_tenant": 3
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "HeatStacks.create_update_delete_stack": [
-        {
-            "args": {
-               "template_path": "templates/random_strings.yaml.template",
-               "updated_template_path": "templates/updated_random_strings_delete.yaml.template"
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 2,
-                    "users_per_tenant": 3
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "HeatStacks.create_update_delete_stack": [
-        {
-            "args": {
-               "template_path": "templates/resource_group.yaml.template",
-               "updated_template_path": "templates/updated_resource_group_increase.yaml.template"
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 2,
-                    "users_per_tenant": 3
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "HeatStacks.create_update_delete_stack": [
-        {
-            "args": {
-               "template_path": "templates/autoscaling_policy.yaml.template",
-               "updated_template_path": "templates/updated_autoscaling_policy_inplace.yaml.template"
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 2,
-                    "users_per_tenant": 3
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "HeatStacks.create_update_delete_stack": [
-        {
-            "args": {
-               "template_path": "templates/resource_group.yaml.template",
-               "updated_template_path": "templates/updated_resource_group_reduce.yaml.template"
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 2,
-                    "users_per_tenant": 3
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "HeatStacks.create_update_delete_stack": [
-        {
-            "args": {
-               "template_path": "templates/random_strings.yaml.template",
-               "updated_template_path": "templates/updated_random_strings_replace.yaml.template"
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 2,
-                    "users_per_tenant": 3
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "HeatStacks.list_stacks_and_resources": [
-        {
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 1
-            },
-            "context": {
-                "users": {
-                    "tenants": 1,
-                    "users_per_tenant": 1
-                },
-                "stacks": {
-                    "stacks_per_tenant": 2,
-                    "resources_per_stack": 10
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ]
-}
-
diff --git a/testcases/VIM/OpenStack/CI/suites/opnfv-keystone.json b/testcases/VIM/OpenStack/CI/suites/opnfv-keystone.json
deleted file mode 100644
index f7291ed59..000000000
--- a/testcases/VIM/OpenStack/CI/suites/opnfv-keystone.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-    "KeystoneBasic.create_delete_user": [
-        {
-            "args": {
-                "name_length": 10
-            },
-            "runner": {
-                "type": "constant",
-                "times": 100,
-                "concurrency": 10
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "KeystoneBasic.create_and_list_tenants": [
-        {
-            "args": {
-                "name_length": 10
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 1
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "KeystoneBasic.create_and_list_users": [
-        {
-            "args": {
-                "name_length": 10
-            },
-            "runner": {
-                "type": "constant",
-                "times": 100,
-                "concurrency": 10
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "KeystoneBasic.create_tenant": [
-        {
-            "args": {
-                "name_length": 10
-            },
-            "runner": {
-                "type": "constant",
-                "times": 100,
-                "concurrency": 10
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "KeystoneBasic.create_user": [
-        {
-            "args": {
-                "name_length": 10
-            },
-            "runner": {
-                "type": "constant",
-                "times": 100,
-                "concurrency": 10
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "KeystoneBasic.create_tenant_with_users": [
-        {
-            "args": {
-                "name_length": 10,
-                "users_per_tenant": 10
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 10
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ]
-}
-
diff --git a/testcases/VIM/OpenStack/CI/suites/opnfv-neutron.json b/testcases/VIM/OpenStack/CI/suites/opnfv-neutron.json
deleted file mode 100644
index 9fcdf583d..000000000
--- a/testcases/VIM/OpenStack/CI/suites/opnfv-neutron.json
+++ /dev/null
@@ -1,372 +0,0 @@
-{
-    "NeutronNetworks.create_and_delete_networks": [
-        {
-            "args": {
-                "network_create_args": {}
-            },
-            "runner": {
-                "type": "constant",
-                "times": 100,
-                "concurrency": 10
-            },
-            "context": {
-                "users": {
-                    "tenants": 1,
-                    "users_per_tenant": 1
-                },
-                "quotas": {
-                    "neutron": {
-                        "network": -1
-                    }
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "NeutronNetworks.create_and_delete_ports": [
-        {
-            "args": {
-                "network_create_args": {},
-                "port_create_args": {},
-                "ports_per_network": 10
-            },
-            "runner": {
-                "type": "constant",
-                "times": 100,
-                "concurrency": 10
-            },
-            "context": {
-                "users": {
-                    "tenants": 1,
-                    "users_per_tenant": 1
-                },
-                "quotas": {
-                    "neutron": {
-                        "network": -1,
-                        "port": -1
-                    }
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "NeutronNetworks.create_and_delete_routers": [
-        {
-            "args": {
-                "network_create_args": {},
-                "subnet_create_args": {},
-                "subnet_cidr_start": "1.1.0.0/30",
-                "subnets_per_network": 2,
-                "router_create_args": {}
-            },
-            "runner": {
-                "type": "constant",
-                "times": 30,
-                "concurrency": 10
-            },
-            "context": {
-                "users": {
-                    "tenants": 1,
-                    "users_per_tenant": 1
-                },
-                "quotas": {
-                    "neutron": {
-                        "network": -1,
-                        "subnet": -1,
-                        "router": -1
-                    }
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "NeutronNetworks.create_and_delete_subnets": [
-        {
-            "args": {
-                "network_create_args": {},
-                "subnet_create_args": {},
-                "subnet_cidr_start": "1.1.0.0/30",
-                "subnets_per_network": 2
-            },
-            "runner": {
-                "type": "constant",
-                "times": 100,
-                "concurrency": 10
-            },
-            "context": {
-                "users": {
-                    "tenants": 1,
-                    "users_per_tenant": 1
-                },
-                "quotas": {
-                    "neutron": {
-                        "network": -1,
-                        "subnet": -1
-                    }
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "NeutronNetworks.create_and_list_networks": [
-        {
-            "args": {
-                "network_create_args": {}
-            },
-            "runner": {
-                "type": "constant",
-                "times": 100,
-                "concurrency": 10
-            },
-            "context": {
-                "users": {
-                    "tenants": 1,
-                    "users_per_tenant": 1
-                },
-                "quotas": {
-                    "neutron": {
-                        "network": -1
-                    }
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "NeutronNetworks.create_and_list_ports": [
-        {
-            "args": {
-                "network_create_args": {},
-                "port_create_args": {},
-                "ports_per_network": 10
-            },
-            "runner": {
-                "type": "constant",
-                "times": 100,
-                "concurrency": 10
-            },
-            "context": {
-                "users": {
-                    "tenants": 1,
-                    "users_per_tenant": 1
-                },
-                "quotas": {
-                    "neutron": {
-                        "network": -1,
-                        "port": -1
-                    }
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "NeutronNetworks.create_and_list_routers": [
-        {
-            "args": {
-                "network_create_args": {},
-                "subnet_create_args": {},
-                "subnet_cidr_start": "1.1.0.0/30",
-                "subnets_per_network": 2,
-                "router_create_args": {}
-            },
-            "runner": {
-                "type": "constant",
-                "times": 100,
-                "concurrency": 10
-            },
-            "context": {
-                "users": {
-                    "tenants": 1,
-                    "users_per_tenant": 1
-                },
-                "quotas": {
-                    "neutron": {
-                        "network": -1,
-                        "subnet": -1,
-                        "router": -1
-                    }
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "NeutronNetworks.create_and_list_subnets": [
-        {
-            "args": {
-                "network_create_args": {},
-                "subnet_create_args": {},
-                "subnet_cidr_start": "1.1.0.0/30",
-                "subnets_per_network": 2
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 5
-            },
-            "context": {
-                "users": {
-                    "tenants": 5,
-                    "users_per_tenant": 5
-                },
-                "quotas": {
-                    "neutron": {
-                        "network": -1,
-                        "subnet": -1
-                    }
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "NeutronNetworks.create_and_update_networks": [
-        {
-            "args": {
-                "network_update_args": {
-                    "admin_state_up": false,
-                    "name": "_updated"
-                 },
-                "network_create_args": {}
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 5
-            },
-            "context": {
-                "users": {
-                    "tenants": 1,
-                    "users_per_tenant": 1
-                },
-                "quotas": {
-                    "neutron": {
-                        "network": -1
-                    }
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "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",
-                    "name": "_port_updated"
-                },
-                "ports_per_network": 5
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 5
-            },
-            "context": {
-                "users": {
-                    "tenants": 1,
-                    "users_per_tenant": 1
-                },
-                "quotas": {
-                    "neutron": {
-                        "network": -1,
-                        "port": -1
-                    }
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "NeutronNetworks.create_and_update_routers": [
-        {
-            "args": {
-                "network_create_args": {},
-                "subnet_create_args": {},
-                "subnet_cidr_start": "1.1.0.0/30",
-                "subnets_per_network": 2,
-                "router_create_args": {},
-                "router_update_args": {
-                    "admin_state_up": false,
-                    "name": "_router_updated"
-                }
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 5
-            },
-            "context": {
-                "users": {
-                    "tenants": 1,
-                    "users_per_tenant": 1
-                },
-                "quotas": {
-                    "neutron": {
-                        "network": -1,
-                        "subnet": -1,
-                        "router": -1
-                    }
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "NeutronNetworks.create_and_update_subnets": [
-        {
-            "args": {
-                "subnet_update_args": {
-                    "enable_dhcp": false,
-                    "name": "_subnet_updated"
-                },
-                "network_create_args": {},
-                "subnet_create_args": {},
-                "subnet_cidr_start": "1.4.0.0/16",
-                "subnets_per_network": 2
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 5
-            },
-            "context": {
-                "users": {
-                    "tenants": 5,
-                    "users_per_tenant": 5
-                },
-                "quotas": {
-                    "neutron": {
-                        "network": -1,
-                        "subnet": -1
-                    }
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ]
-}
-
diff --git a/testcases/VIM/OpenStack/CI/suites/opnfv-nova.json b/testcases/VIM/OpenStack/CI/suites/opnfv-nova.json
deleted file mode 100644
index e32fd57ec..000000000
--- a/testcases/VIM/OpenStack/CI/suites/opnfv-nova.json
+++ /dev/null
@@ -1,509 +0,0 @@
-{
-    "NovaServers.boot_and_delete_server": [
-        {
-            "args": {
-                "flavor": {
-                    "name": "m1.small"
-                },
-                "image": {
-                    "name": "^functest-img*"
-                },
-                "force_delete": false
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 3,
-                    "users_per_tenant": 2
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "NovaKeypair.boot_and_delete_server_with_keypair": [
-        {
-            "args": {
-                "flavor": {
-                    "name": "m1.small"
-                },
-                "image": {
-                    "name": "^functest-img*"
-                }
-            },
-            "runner": {
-                "type": "constant",
-                "times": 5,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 2,
-                    "users_per_tenant": 1
-                },
-                "network": {
-                    "start_cidr": "100.1.0.0/26"
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "NovaSecGroup.boot_and_delete_server_with_secgroups": [
-        {
-            "args": {
-                "flavor": {
-                    "name": "m1.small"
-                },
-                "image": {
-                    "name": "^functest-img*"
-                },
-                "security_group_count": 10,
-                "rules_per_security_group": 10
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 3,
-                    "users_per_tenant": 2
-                },
-                "network": {
-                    "start_cidr": "100.1.0.0/26"
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "NovaServers.boot_and_list_server": [
-        {
-            "args": {
-                "flavor": {
-                    "name": "m1.small"
-                },
-                "image": {
-                    "name": "^functest-img*"
-                },
-                "detailed": true
-            },
-            "runner": {
-                "type": "constant",
-                "times": 1,
-                "concurrency": 1
-            },
-            "context": {
-                "users": {
-                    "tenants": 1,
-                    "users_per_tenant": 1
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-   "NovaServers.boot_and_live_migrate_server": [
-        {
-            "args": {
-                "flavor": {
-                    "name": "m1.small"
-                },
-                "image": {
-                    "name": "^functest-img*"
-                },
-                "block_migration": false
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 1,
-                    "users_per_tenant": 1
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-   "NovaServers.boot_and_migrate_server": [
-        {
-            "args": {
-                "flavor": {
-                    "name": "m1.small"
-                },
-                "image": {
-                    "name": "^functest-img*"
-                }
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 1,
-                    "users_per_tenant": 1
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "NovaServers.boot_and_bounce_server": [
-        {
-            "args": {
-                "flavor": {
-                    "name": "m1.small"
-                },
-                "image": {
-                    "name": "^functest-img*"
-                },
-                "force_delete": false,
-                "actions": [
-                    {"hard_reboot": 1},
-                    {"soft_reboot": 1},
-                    {"stop_start": 1},
-                    {"rescue_unrescue": 1}
-                ]
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 3,
-                    "users_per_tenant": 2
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "NovaServers.boot_server_from_volume_and_delete": [
-        {
-            "args": {
-                "flavor": {
-                    "name": "m1.small"
-                },
-                "image": {
-                    "name": "^functest-img*"
-                },
-                "volume_size": 10,
-                "force_delete": false
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 3,
-                    "users_per_tenant": 2
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "NovaServers.boot_server_from_volume": [
-        {
-            "args": {
-                "flavor": {
-                    "name": "m1.small"
-                },
-                "image": {
-                    "name": "^functest-img*"
-                },
-                "volume_size": 10
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 3,
-                    "users_per_tenant": 2
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "NovaServers.boot_server": [
-        {
-            "args": {
-                "flavor": {
-                    "name": "m1.small"
-                },
-                "image": {
-                    "name": "^functest-img*"
-                }
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 3,
-                    "users_per_tenant": 2
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "NovaServers.boot_server_attach_created_volume_and_live_migrate": [
-        {
-            "args": {
-                "size": 10,
-                "block_migration": false,
-                "image": {
-                    "name": "^functest-img*"
-                },
-                "flavor": {
-                    "name": "m1.small"
-                }
-            },
-            "runner": {
-                "type": "constant",
-                "times": 5,
-                "concurrency": 1
-            },
-            "context": {
-                "users": {
-                    "tenants": 2,
-                    "users_per_tenant": 2
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-   "NovaServers.boot_server_from_volume_and_live_migrate": [
-        {
-            "args": {
-                "flavor": {
-                    "name": "m1.small"
-                },
-                "image": {
-                    "name": "^functest-img*"
-                },
-                "block_migration": false,
-                "volume_size": 10,
-                "force_delete": false
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 1,
-                    "users_per_tenant": 1
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "NovaServers.snapshot_server": [
-        {
-            "args": {
-                "flavor": {
-                    "name": "m1.small"
-                },
-                "image": {
-                    "name": "^functest-img*"
-                },
-                "force_delete": false
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 3,
-                    "users_per_tenant": 2
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "NovaKeypair.create_and_delete_keypair": [
-        {
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 3,
-                    "users_per_tenant": 2
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "NovaSecGroup.create_and_delete_secgroups": [
-        {
-            "args": {
-                "security_group_count": 10,
-                "rules_per_security_group": 10
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 3,
-                    "users_per_tenant": 2
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "NovaKeypair.create_and_list_keypairs": [
-        {
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 3,
-                    "users_per_tenant": 2
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "NovaSecGroup.create_and_list_secgroups": [
-        {
-            "args": {
-                "security_group_count": 10,
-                "rules_per_security_group": 10
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 3,
-                    "users_per_tenant": 2
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "NovaServers.list_servers": [
-        {
-            "args": {
-                "detailed": true
-            },
-            "runner": {
-                "type": "constant",
-                "times": 1,
-                "concurrency": 1
-            },
-            "context": {
-                "users": {
-                    "tenants": 1,
-                    "users_per_tenant": 1
-                },
-                "servers": {
-                    "flavor": {
-                        "name": "m1.small"
-                    },
-                    "image": {
-                        "name": "^functest-img*"
-                    },
-                    "servers_per_tenant": 2
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "NovaServers.resize_server": [
-        {
-            "args": {
-                "flavor": {
-                    "name": "m1.small"
-                },
-                "image": {
-                    "name": "^functest-img*"
-                },
-                "to_flavor": {
-                    "name": "m1.small"
-                },
-                "confirm": true,
-                "force_delete": false
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 5
-            },
-            "context": {
-                "users": {
-                    "tenants": 1,
-                    "users_per_tenant": 1
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ]
-}
-
diff --git a/testcases/VIM/OpenStack/CI/suites/opnfv-quotas.json b/testcases/VIM/OpenStack/CI/suites/opnfv-quotas.json
deleted file mode 100644
index 1cc1855e7..000000000
--- a/testcases/VIM/OpenStack/CI/suites/opnfv-quotas.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-    "Quotas.cinder_update_and_delete": [
-        {
-            "args": {
-                "max_quota": 1024
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 3,
-                    "users_per_tenant": 2
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "Quotas.cinder_update": [
-        {
-            "args": {
-                "max_quota": 1024
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 3,
-                    "users_per_tenant": 2
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "Quotas.neutron_update": [
-        {
-            "args": {
-                "max_quota": 1024
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 3,
-                    "users_per_tenant": 2
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "Quotas.nova_update_and_delete": [
-        {
-            "args": {
-                "max_quota": 1024
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 3,
-                    "users_per_tenant": 2
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "Quotas.nova_update": [
-        {
-            "args": {
-                "max_quota": 1024
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 3,
-                    "users_per_tenant": 2
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ]
-}
-
diff --git a/testcases/VIM/OpenStack/CI/suites/opnfv-requests.json b/testcases/VIM/OpenStack/CI/suites/opnfv-requests.json
deleted file mode 100644
index 4468d60a3..000000000
--- a/testcases/VIM/OpenStack/CI/suites/opnfv-requests.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "HttpRequests.check_random_request": [
-        {
-            "args": {
-                "requests": [{"url": "http://www.example.com", "method": "GET",
-                    "status_code": 200},
-                    {"url": "http://www.openstack.org", "method": "GET"}],
-                "status_code": 200
-            },
-            "runner": {
-                "type": "constant",
-                "times": 20,
-                "concurrency": 5
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "HttpRequests.check_request": [
-        {
-            "args": {
-                "url": "http://www.example.com",
-                "method": "GET",
-                "status_code": 200,
-                "allow_redirects": false
-            },
-            "runner": {
-                "type": "constant",
-                "times": 20,
-                "concurrency": 5
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ]
-}
diff --git a/testcases/VIM/OpenStack/CI/suites/opnfv-smoke-green.json b/testcases/VIM/OpenStack/CI/suites/opnfv-smoke-green.json
deleted file mode 100644
index b327b53e5..000000000
--- a/testcases/VIM/OpenStack/CI/suites/opnfv-smoke-green.json
+++ /dev/null
@@ -1,239 +0,0 @@
-{
-    "TempestScenario.list_of_tests": [
-        {
-            "args": {
-                "tempest_conf": "/etc/tempest/tempest.conf",
-                "test_names": [
-"tempest.api.compute.images.test_list_images.ListImagesTestJSON.test_get_image",
-"tempest.api.compute.images.test_list_images.ListImagesTestJSON.test_list_images_with_detail",
-"tempest.api.compute.security_groups.test_security_groups.SecurityGroupsTestJSON.test_security_group_create_get_delete",
-"tempest.api.compute.security_groups.test_security_groups.SecurityGroupsTestJSON.test_security_groups_create_list_delete",
-"tempest.api.data_processing.test_cluster_templates.ClusterTemplateTest.test_cluster_template_create",
-"tempest.api.data_processing.test_cluster_templates.ClusterTemplateTest.test_cluster_template_delete",
-"tempest.api.data_processing.test_cluster_templates.ClusterTemplateTest.test_cluster_template_get",
-"tempest.api.data_processing.test_cluster_templates.ClusterTemplateTest.test_cluster_template_list",
-"tempest.api.data_processing.test_data_sources.DataSourceTest.test_external_hdfs_data_source_create",
-"tempest.api.data_processing.test_data_sources.DataSourceTest.test_external_hdfs_data_source_delete",
-"tempest.api.data_processing.test_data_sources.DataSourceTest.test_external_hdfs_data_source_get",
-"tempest.api.data_processing.test_data_sources.DataSourceTest.test_external_hdfs_data_source_list",
-"tempest.api.data_processing.test_data_sources.DataSourceTest.test_local_hdfs_data_source_create",
-"tempest.api.data_processing.test_data_sources.DataSourceTest.test_local_hdfs_data_source_delete",
-"tempest.api.data_processing.test_data_sources.DataSourceTest.test_local_hdfs_data_source_get",
-"tempest.api.data_processing.test_data_sources.DataSourceTest.test_local_hdfs_data_source_list",
-"tempest.api.data_processing.test_data_sources.DataSourceTest.test_swift_data_source_create",
-"tempest.api.data_processing.test_data_sources.DataSourceTest.test_swift_data_source_delete",
-"tempest.api.data_processing.test_data_sources.DataSourceTest.test_swift_data_source_get",
-"tempest.api.data_processing.test_data_sources.DataSourceTest.test_swift_data_source_list",
-"tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_internal_db_job_binary_create",
-"tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_internal_db_job_binary_delete",
-"tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_internal_db_job_binary_get",
-"tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_internal_db_job_binary_list",
-"tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_job_binary_get_data",
-"tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_swift_job_binary_create",
-"tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_swift_job_binary_delete",
-"tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_swift_job_binary_get",
-"tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_swift_job_binary_list",
-"tempest.api.data_processing.test_job_binary_internals.JobBinaryInternalTest.test_job_binary_internal_create",
-"tempest.api.data_processing.test_job_binary_internals.JobBinaryInternalTest.test_job_binary_internal_delete",
-"tempest.api.data_processing.test_job_binary_internals.JobBinaryInternalTest.test_job_binary_internal_get",
-"tempest.api.data_processing.test_job_binary_internals.JobBinaryInternalTest.test_job_binary_internal_get_data",
-"tempest.api.data_processing.test_job_binary_internals.JobBinaryInternalTest.test_job_binary_internal_list",
-"tempest.api.data_processing.test_jobs.JobTest.test_job_create",
-"tempest.api.data_processing.test_jobs.JobTest.test_job_delete",
-"tempest.api.data_processing.test_jobs.JobTest.test_job_get",
-"tempest.api.data_processing.test_jobs.JobTest.test_job_list",
-"tempest.api.data_processing.test_node_group_templates.NodeGroupTemplateTest.test_node_group_template_create",
-"tempest.api.data_processing.test_node_group_templates.NodeGroupTemplateTest.test_node_group_template_delete",
-"tempest.api.data_processing.test_node_group_templates.NodeGroupTemplateTest.test_node_group_template_get",
-"tempest.api.data_processing.test_node_group_templates.NodeGroupTemplateTest.test_node_group_template_list",
-"tempest.api.data_processing.test_plugins.PluginsTest.test_plugin_get",
-"tempest.api.data_processing.test_plugins.PluginsTest.test_plugin_list",
-"tempest.api.database.flavors.test_flavors.DatabaseFlavorsTest.test_compare_db_flavors_with_os",
-"tempest.api.database.flavors.test_flavors.DatabaseFlavorsTest.test_get_db_flavor",
-"tempest.api.database.flavors.test_flavors.DatabaseFlavorsTest.test_list_db_flavors",
-"tempest.api.database.limits.test_limits.DatabaseLimitsTest.test_absolute_limits",
-"tempest.api.database.versions.test_versions.DatabaseVersionsTest.test_list_db_versions",
-"tempest.api.identity.admin.v2.test_services.ServicesTestJSON.test_list_services",
-"tempest.api.identity.admin.v2.test_users.UsersTestJSON.test_create_user",
-"tempest.api.identity.admin.v3.test_credentials.CredentialsTestJSON.test_credentials_create_get_update_delete",
-"tempest.api.identity.admin.v3.test_domains.DomainsTestJSON.test_create_update_delete_domain",
-"tempest.api.identity.admin.v3.test_endpoints.EndPointsTestJSON.test_update_endpoint",
-"tempest.api.identity.admin.v3.test_groups.GroupsV3TestJSON.test_group_users_add_list_delete",
-"tempest.api.identity.admin.v3.test_policies.PoliciesTestJSON.test_create_update_delete_policy",
-"tempest.api.identity.admin.v3.test_regions.RegionsTestJSON.test_create_region_with_specific_id",
-"tempest.api.identity.admin.v3.test_roles.RolesV3TestJSON.test_role_create_update_get_list",
-"tempest.api.identity.admin.v3.test_trusts.TrustsV3TestJSON.test_get_trusts_all",
-"tempest.api.messaging.test_claims.TestClaims.test_post_claim",
-"tempest.api.messaging.test_claims.TestClaims.test_query_claim",
-"tempest.api.messaging.test_claims.TestClaims.test_release_claim",
-"tempest.api.messaging.test_claims.TestClaims.test_update_claim",
-"tempest.api.messaging.test_messages.TestMessages.test_delete_multiple_messages",
-"tempest.api.messaging.test_messages.TestMessages.test_delete_single_message",
-"tempest.api.messaging.test_messages.TestMessages.test_get_message",
-"tempest.api.messaging.test_messages.TestMessages.test_get_multiple_messages",
-"tempest.api.messaging.test_messages.TestMessages.test_list_messages",
-"tempest.api.messaging.test_messages.TestMessages.test_post_messages",
-"tempest.api.messaging.test_queues.TestManageQueue.test_check_queue_existence",
-"tempest.api.messaging.test_queues.TestManageQueue.test_check_queue_head",
-"tempest.api.messaging.test_queues.TestManageQueue.test_get_queue_stats",
-"tempest.api.messaging.test_queues.TestManageQueue.test_list_queues",
-"tempest.api.messaging.test_queues.TestManageQueue.test_set_and_get_queue_metadata",
-"tempest.api.messaging.test_queues.TestQueues.test_create_delete_queue",
-"tempest.api.network.test_extensions.ExtensionsTestJSON.test_list_show_extensions",
-"tempest.api.network.test_floating_ips.FloatingIPTestJSON.test_create_floating_ip_specifying_a_fixed_ip_address",
-"tempest.api.network.test_floating_ips.FloatingIPTestJSON.test_create_list_show_update_delete_floating_ip",
-"tempest.api.network.test_networks.BulkNetworkOpsIpV6TestJSON.test_bulk_create_delete_network",
-"tempest.api.network.test_networks.BulkNetworkOpsIpV6TestJSON.test_bulk_create_delete_port",
-"tempest.api.network.test_networks.BulkNetworkOpsIpV6TestJSON.test_bulk_create_delete_subnet",
-"tempest.api.network.test_networks.BulkNetworkOpsTestJSON.test_bulk_create_delete_network",
-"tempest.api.network.test_networks.BulkNetworkOpsTestJSON.test_bulk_create_delete_port",
-"tempest.api.network.test_networks.BulkNetworkOpsTestJSON.test_bulk_create_delete_subnet",
-"tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_create_update_delete_network_subnet",
-"tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_external_network_visibility",
-"tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_list_networks",
-"tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_list_subnets",
-"tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_show_network",
-"tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_show_subnet",
-"tempest.api.network.test_networks.NetworksIpV6TestJSON.test_create_update_delete_network_subnet",
-"tempest.api.network.test_networks.NetworksIpV6TestJSON.test_external_network_visibility",
-"tempest.api.network.test_networks.NetworksIpV6TestJSON.test_list_networks",
-"tempest.api.network.test_networks.NetworksIpV6TestJSON.test_list_subnets",
-"tempest.api.network.test_networks.NetworksIpV6TestJSON.test_show_network",
-"tempest.api.network.test_networks.NetworksIpV6TestJSON.test_show_subnet",
-"tempest.api.network.test_networks.NetworksTestJSON.test_create_update_delete_network_subnet",
-"tempest.api.network.test_networks.NetworksTestJSON.test_external_network_visibility",
-"tempest.api.network.test_networks.NetworksTestJSON.test_list_networks",
-"tempest.api.network.test_networks.NetworksTestJSON.test_list_subnets",
-"tempest.api.network.test_networks.NetworksTestJSON.test_show_network",
-"tempest.api.network.test_networks.NetworksTestJSON.test_show_subnet",
-"tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_port_in_allowed_allocation_pools",
-"tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_port_with_no_securitygroups",
-"tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_update_delete_port",
-"tempest.api.network.test_ports.PortsIpV6TestJSON.test_list_ports",
-"tempest.api.network.test_ports.PortsIpV6TestJSON.test_show_port",
-"tempest.api.network.test_ports.PortsTestJSON.test_create_port_in_allowed_allocation_pools",
-"tempest.api.network.test_ports.PortsTestJSON.test_create_port_with_no_securitygroups",
-"tempest.api.network.test_ports.PortsTestJSON.test_create_update_delete_port",
-"tempest.api.network.test_ports.PortsTestJSON.test_list_ports",
-"tempest.api.network.test_ports.PortsTestJSON.test_show_port",
-"tempest.api.network.test_routers.RoutersIpV6Test.test_add_multiple_router_interfaces",
-"tempest.api.network.test_routers.RoutersIpV6Test.test_add_remove_router_interface_with_port_id",
-"tempest.api.network.test_routers.RoutersIpV6Test.test_add_remove_router_interface_with_subnet_id",
-"tempest.api.network.test_routers.RoutersIpV6Test.test_create_show_list_update_delete_router",
-"tempest.api.network.test_routers.RoutersTest.test_add_multiple_router_interfaces",
-"tempest.api.network.test_routers.RoutersTest.test_add_remove_router_interface_with_port_id",
-"tempest.api.network.test_routers.RoutersTest.test_add_remove_router_interface_with_subnet_id",
-"tempest.api.network.test_routers.RoutersTest.test_create_show_list_update_delete_router",
-"tempest.api.network.test_security_groups.SecGroupIPv6Test.test_create_list_update_show_delete_security_group",
-"tempest.api.network.test_security_groups.SecGroupIPv6Test.test_create_show_delete_security_group_rule",
-"tempest.api.network.test_security_groups.SecGroupIPv6Test.test_list_security_groups",
-"tempest.api.network.test_security_groups.SecGroupTest.test_create_list_update_show_delete_security_group",
-"tempest.api.network.test_security_groups.SecGroupTest.test_create_show_delete_security_group_rule",
-"tempest.api.network.test_security_groups.SecGroupTest.test_list_security_groups",
-"tempest.api.object_storage.test_account_quotas.AccountQuotasTest.test_admin_modify_quota",
-"tempest.api.object_storage.test_account_quotas.AccountQuotasTest.test_upload_valid_object",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_account_metadata",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_containers",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_end_marker",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_format_json",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_format_xml",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_limit",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_limit_and_end_marker",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_limit_and_marker",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_limit_and_marker_and_end_marker",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_marker",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_marker_and_end_marker",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_extensions",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_no_account_metadata",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_no_containers",
-"tempest.api.object_storage.test_account_services.AccountTest.test_update_account_metadata_with_create_and_delete_metadata",
-"tempest.api.object_storage.test_account_services.AccountTest.test_update_account_metadata_with_create_matadata_key",
-"tempest.api.object_storage.test_account_services.AccountTest.test_update_account_metadata_with_create_metadata",
-"tempest.api.object_storage.test_account_services.AccountTest.test_update_account_metadata_with_delete_matadata",
-"tempest.api.object_storage.test_account_services.AccountTest.test_update_account_metadata_with_delete_matadata_key",
-"tempest.api.object_storage.test_container_acl.ObjectTestACLs.test_read_object_with_rights",
-"tempest.api.object_storage.test_container_acl.ObjectTestACLs.test_write_object_with_rights",
-"tempest.api.object_storage.test_container_quotas.ContainerQuotasTest.test_upload_large_object",
-"tempest.api.object_storage.test_container_quotas.ContainerQuotasTest.test_upload_too_many_objects",
-"tempest.api.object_storage.test_container_quotas.ContainerQuotasTest.test_upload_valid_object",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_create_container",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_create_container_overwrite",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_create_container_with_metadata_key",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_create_container_with_metadata_value",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_create_container_with_remove_metadata_key",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_create_container_with_remove_metadata_value",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_delete_container",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_delimiter",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_end_marker",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_format_json",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_format_xml",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_limit",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_marker",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_no_object",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_path",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_prefix",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_metadata",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_list_no_container_metadata",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_update_container_metadata_with_create_and_delete_matadata",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_update_container_metadata_with_create_matadata_key",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_update_container_metadata_with_create_metadata",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_update_container_metadata_with_delete_metadata",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_update_container_metadata_with_delete_metadata_key",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_copy_object_2d_way",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_copy_object_across_containers",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_copy_object_in_same_container",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_copy_object_to_itself",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_copy_object_with_x_fresh_metadata",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_copy_object_with_x_object_meta",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_copy_object_with_x_object_metakey",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_get_object",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_get_object_with_if_match",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_get_object_with_if_modified_since",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_get_object_with_if_unmodified_since",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_get_object_with_metadata",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_get_object_with_range",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_get_object_with_x_newest",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_get_object_with_x_object_manifest",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_list_no_object_metadata",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_list_object_metadata",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_list_object_metadata_with_x_object_manifest",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_update_object_metadata",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_update_object_metadata_with_create_and_remove_metadata",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_update_object_metadata_with_x_object_manifest",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_update_object_metadata_with_x_remove_object_metakey",
-"tempest.api.object_storage.test_object_services.PublicObjectTest.test_access_public_container_object_without_using_creds",
-"tempest.api.object_storage.test_object_services.PublicObjectTest.test_access_public_object_with_another_user_creds",
-"tempest.api.object_storage.test_object_version.ContainerTest.test_versioned_container",
-"tempest.api.orchestration.stacks.test_resource_types.ResourceTypesTest.test_resource_type_list",
-"tempest.api.orchestration.stacks.test_resource_types.ResourceTypesTest.test_resource_type_show",
-"tempest.api.orchestration.stacks.test_resource_types.ResourceTypesTest.test_resource_type_template",
-"tempest.api.orchestration.stacks.test_soft_conf.TestSoftwareConfig.test_get_deployment_list",
-"tempest.api.orchestration.stacks.test_soft_conf.TestSoftwareConfig.test_get_deployment_metadata",
-"tempest.api.orchestration.stacks.test_soft_conf.TestSoftwareConfig.test_get_software_config",
-"tempest.api.orchestration.stacks.test_soft_conf.TestSoftwareConfig.test_software_deployment_create_validate",
-"tempest.api.orchestration.stacks.test_soft_conf.TestSoftwareConfig.test_software_deployment_update_no_metadata_change",
-"tempest.api.orchestration.stacks.test_soft_conf.TestSoftwareConfig.test_software_deployment_update_with_metadata_change",
-"tempest.api.orchestration.stacks.test_stacks.StacksTestJSON.test_stack_crud_no_resources",
-"tempest.api.orchestration.stacks.test_stacks.StacksTestJSON.test_stack_list_responds",
-"tempest.api.telemetry.test_telemetry_notification_api.TelemetryNotificationAPITestJSON.test_check_glance_v1_notifications",
-"tempest.api.telemetry.test_telemetry_notification_api.TelemetryNotificationAPITestJSON.test_check_glance_v2_notifications",
-"tempest.api.volume.test_volumes_get.VolumesV1GetTest.test_volume_create_get_update_delete",
-"tempest.api.volume.test_volumes_get.VolumesV1GetTest.test_volume_create_get_update_delete_from_image",
-"tempest.api.volume.test_volumes_get.VolumesV2GetTest.test_volume_create_get_update_delete",
-"tempest.api.volume.test_volumes_get.VolumesV2GetTest.test_volume_create_get_update_delete_from_image",
-"tempest.api.volume.test_volumes_list.VolumesV1ListTestJSON.test_volume_list",
-"tempest.api.volume.test_volumes_list.VolumesV2ListTestJSON.test_volume_list",
-                ]
-            },
-            "runner": {
-                "type": "serial",
-                "times": 1,
-                "concurrency": 1
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ]
-}
diff --git a/testcases/VIM/OpenStack/CI/suites/opnfv-smoke.json b/testcases/VIM/OpenStack/CI/suites/opnfv-smoke.json
deleted file mode 100644
index 31514d274..000000000
--- a/testcases/VIM/OpenStack/CI/suites/opnfv-smoke.json
+++ /dev/null
@@ -1,274 +0,0 @@
-{
-    "TempestScenario.list_of_tests": [
-        {
-            "args": {
-                "tempest_conf": "/etc/tempest/tempest.conf",
-                "test_names": [
-"tempest.api.compute.flavors.test_flavors.FlavorsV2TestJSON.test_get_flavor",
-"tempest.api.compute.flavors.test_flavors.FlavorsV2TestJSON.test_list_flavors",
-"tempest.api.compute.flavors.test_flavors.FlavorsV2TestJSON.test_list_flavors_with_detail",
-"tempest.api.compute.images.test_images_oneserver.ImagesOneServerTestJSON.test_create_delete_image",
-"tempest.api.compute.images.test_list_images.ListImagesTestJSON.test_get_image",
-"tempest.api.compute.images.test_list_images.ListImagesTestJSON.test_list_images",
-"tempest.api.compute.images.test_list_images.ListImagesTestJSON.test_list_images_with_detail",
-"tempest.api.compute.security_groups.test_security_group_rules.SecurityGroupRulesTestJSON.test_security_group_rules_create",
-"tempest.api.compute.security_groups.test_security_group_rules.SecurityGroupRulesTestJSON.test_security_group_rules_create_with_optional_cidr",
-"tempest.api.compute.security_groups.test_security_group_rules.SecurityGroupRulesTestJSON.test_security_group_rules_create_with_optional_group_id",
-"tempest.api.compute.security_groups.test_security_group_rules.SecurityGroupRulesTestJSON.test_security_group_rules_delete_when_peer_group_deleted",
-"tempest.api.compute.security_groups.test_security_group_rules.SecurityGroupRulesTestJSON.test_security_group_rules_list",
-"tempest.api.compute.security_groups.test_security_groups.SecurityGroupsTestJSON.test_security_group_create_get_delete",
-"tempest.api.compute.security_groups.test_security_groups.SecurityGroupsTestJSON.test_security_groups_create_list_delete",
-"tempest.api.compute.security_groups.test_security_groups.SecurityGroupsTestJSON.test_server_security_groups",
-"tempest.api.compute.security_groups.test_security_groups.SecurityGroupsTestJSON.test_update_security_groups",
-"tempest.api.compute.servers.test_attach_interfaces.AttachInterfacesTestJSON.test_add_remove_fixed_ip",
-"tempest.api.compute.servers.test_attach_interfaces.AttachInterfacesTestJSON.test_create_list_show_delete_interfaces",
-"tempest.api.compute.servers.test_create_server.ServersTestJSON.test_list_servers",
-"tempest.api.compute.servers.test_create_server.ServersTestJSON.test_list_servers_with_detail",
-"tempest.api.compute.servers.test_create_server.ServersTestJSON.test_verify_server_details",
-"tempest.api.compute.servers.test_create_server.ServersTestManualDisk.test_list_servers",
-"tempest.api.compute.servers.test_create_server.ServersTestManualDisk.test_list_servers_with_detail",
-"tempest.api.compute.servers.test_create_server.ServersTestManualDisk.test_verify_server_details",
-"tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_reboot_server_hard",
-"tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_reboot_server_soft",
-"tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_rebuild_server",
-"tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_resize_server_confirm",
-"tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_resize_server_confirm_from_stopped",
-"tempest.api.compute.servers.test_server_addresses.ServerAddressesTestJSON.test_list_server_addresses",
-"tempest.api.compute.servers.test_server_addresses.ServerAddressesTestJSON.test_list_server_addresses_by_network",
-"tempest.api.compute.servers.test_server_rescue.ServerRescueTestJSON.test_rescue_unrescue_instance",
-"tempest.api.compute.test_quotas.QuotasTestJSON.test_compare_tenant_quotas_with_default_quotas",
-"tempest.api.compute.test_quotas.QuotasTestJSON.test_get_default_quotas",
-"tempest.api.compute.test_quotas.QuotasTestJSON.test_get_quotas",
-"tempest.api.compute.volumes.test_volumes_get.VolumesGetTestJSON.test_volume_create_get_delete",
-"tempest.api.data_processing.test_cluster_templates.ClusterTemplateTest.test_cluster_template_create",
-"tempest.api.data_processing.test_cluster_templates.ClusterTemplateTest.test_cluster_template_delete",
-"tempest.api.data_processing.test_cluster_templates.ClusterTemplateTest.test_cluster_template_get",
-"tempest.api.data_processing.test_cluster_templates.ClusterTemplateTest.test_cluster_template_list",
-"tempest.api.data_processing.test_data_sources.DataSourceTest.test_external_hdfs_data_source_create",
-"tempest.api.data_processing.test_data_sources.DataSourceTest.test_external_hdfs_data_source_delete",
-"tempest.api.data_processing.test_data_sources.DataSourceTest.test_external_hdfs_data_source_get",
-"tempest.api.data_processing.test_data_sources.DataSourceTest.test_external_hdfs_data_source_list",
-"tempest.api.data_processing.test_data_sources.DataSourceTest.test_local_hdfs_data_source_create",
-"tempest.api.data_processing.test_data_sources.DataSourceTest.test_local_hdfs_data_source_delete",
-"tempest.api.data_processing.test_data_sources.DataSourceTest.test_local_hdfs_data_source_get",
-"tempest.api.data_processing.test_data_sources.DataSourceTest.test_local_hdfs_data_source_list",
-"tempest.api.data_processing.test_data_sources.DataSourceTest.test_swift_data_source_create",
-"tempest.api.data_processing.test_data_sources.DataSourceTest.test_swift_data_source_delete",
-"tempest.api.data_processing.test_data_sources.DataSourceTest.test_swift_data_source_get",
-"tempest.api.data_processing.test_data_sources.DataSourceTest.test_swift_data_source_list",
-"tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_internal_db_job_binary_create",
-"tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_internal_db_job_binary_delete",
-"tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_internal_db_job_binary_get",
-"tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_internal_db_job_binary_list",
-"tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_job_binary_get_data",
-"tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_swift_job_binary_create",
-"tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_swift_job_binary_delete",
-"tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_swift_job_binary_get",
-"tempest.api.data_processing.test_job_binaries.JobBinaryTest.test_swift_job_binary_list",
-"tempest.api.data_processing.test_job_binary_internals.JobBinaryInternalTest.test_job_binary_internal_create",
-"tempest.api.data_processing.test_job_binary_internals.JobBinaryInternalTest.test_job_binary_internal_delete",
-"tempest.api.data_processing.test_job_binary_internals.JobBinaryInternalTest.test_job_binary_internal_get",
-"tempest.api.data_processing.test_job_binary_internals.JobBinaryInternalTest.test_job_binary_internal_get_data",
-"tempest.api.data_processing.test_job_binary_internals.JobBinaryInternalTest.test_job_binary_internal_list",
-"tempest.api.data_processing.test_jobs.JobTest.test_job_create",
-"tempest.api.data_processing.test_jobs.JobTest.test_job_delete",
-"tempest.api.data_processing.test_jobs.JobTest.test_job_get",
-"tempest.api.data_processing.test_jobs.JobTest.test_job_list",
-"tempest.api.data_processing.test_node_group_templates.NodeGroupTemplateTest.test_node_group_template_create",
-"tempest.api.data_processing.test_node_group_templates.NodeGroupTemplateTest.test_node_group_template_delete",
-"tempest.api.data_processing.test_node_group_templates.NodeGroupTemplateTest.test_node_group_template_get",
-"tempest.api.data_processing.test_node_group_templates.NodeGroupTemplateTest.test_node_group_template_list",
-"tempest.api.data_processing.test_plugins.PluginsTest.test_plugin_get",
-"tempest.api.data_processing.test_plugins.PluginsTest.test_plugin_list",
-"tempest.api.database.flavors.test_flavors.DatabaseFlavorsTest.test_compare_db_flavors_with_os",
-"tempest.api.database.flavors.test_flavors.DatabaseFlavorsTest.test_get_db_flavor",
-"tempest.api.database.flavors.test_flavors.DatabaseFlavorsTest.test_list_db_flavors",
-"tempest.api.database.limits.test_limits.DatabaseLimitsTest.test_absolute_limits",
-"tempest.api.database.versions.test_versions.DatabaseVersionsTest.test_list_db_versions",
-"tempest.api.identity.admin.v2.test_services.ServicesTestJSON.test_list_services",
-"tempest.api.identity.admin.v2.test_users.UsersTestJSON.test_create_user",
-"tempest.api.identity.admin.v3.test_credentials.CredentialsTestJSON.test_credentials_create_get_update_delete",
-"tempest.api.identity.admin.v3.test_domains.DomainsTestJSON.test_create_update_delete_domain",
-"tempest.api.identity.admin.v3.test_endpoints.EndPointsTestJSON.test_update_endpoint",
-"tempest.api.identity.admin.v3.test_groups.GroupsV3TestJSON.test_group_users_add_list_delete",
-"tempest.api.identity.admin.v3.test_policies.PoliciesTestJSON.test_create_update_delete_policy",
-"tempest.api.identity.admin.v3.test_regions.RegionsTestJSON.test_create_region_with_specific_id",
-"tempest.api.identity.admin.v3.test_roles.RolesV3TestJSON.test_role_create_update_get_list",
-"tempest.api.identity.admin.v3.test_services.ServicesTestJSON.test_create_update_get_service",
-"tempest.api.identity.admin.v3.test_trusts.TrustsV3TestJSON.test_get_trusts_all",
-"tempest.api.messaging.test_claims.TestClaims.test_post_claim",
-"tempest.api.messaging.test_claims.TestClaims.test_query_claim",
-"tempest.api.messaging.test_claims.TestClaims.test_release_claim",
-"tempest.api.messaging.test_claims.TestClaims.test_update_claim",
-"tempest.api.messaging.test_messages.TestMessages.test_delete_multiple_messages",
-"tempest.api.messaging.test_messages.TestMessages.test_delete_single_message",
-"tempest.api.messaging.test_messages.TestMessages.test_get_message",
-"tempest.api.messaging.test_messages.TestMessages.test_get_multiple_messages",
-"tempest.api.messaging.test_messages.TestMessages.test_list_messages",
-"tempest.api.messaging.test_messages.TestMessages.test_post_messages",
-"tempest.api.messaging.test_queues.TestManageQueue.test_check_queue_existence",
-"tempest.api.messaging.test_queues.TestManageQueue.test_check_queue_head",
-"tempest.api.messaging.test_queues.TestManageQueue.test_get_queue_stats",
-"tempest.api.messaging.test_queues.TestManageQueue.test_list_queues",
-"tempest.api.messaging.test_queues.TestManageQueue.test_set_and_get_queue_metadata",
-"tempest.api.messaging.test_queues.TestQueues.test_create_delete_queue",
-"tempest.api.network.test_extensions.ExtensionsTestJSON.test_list_show_extensions",
-"tempest.api.network.test_floating_ips.FloatingIPTestJSON.test_create_floating_ip_specifying_a_fixed_ip_address",
-"tempest.api.network.test_floating_ips.FloatingIPTestJSON.test_create_list_show_update_delete_floating_ip",
-"tempest.api.network.test_networks.BulkNetworkOpsIpV6TestJSON.test_bulk_create_delete_network",
-"tempest.api.network.test_networks.BulkNetworkOpsIpV6TestJSON.test_bulk_create_delete_port",
-"tempest.api.network.test_networks.BulkNetworkOpsIpV6TestJSON.test_bulk_create_delete_subnet",
-"tempest.api.network.test_networks.BulkNetworkOpsTestJSON.test_bulk_create_delete_network",
-"tempest.api.network.test_networks.BulkNetworkOpsTestJSON.test_bulk_create_delete_port",
-"tempest.api.network.test_networks.BulkNetworkOpsTestJSON.test_bulk_create_delete_subnet",
-"tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_create_update_delete_network_subnet",
-"tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_external_network_visibility",
-"tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_list_networks",
-"tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_list_subnets",
-"tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_show_network",
-"tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_show_subnet",
-"tempest.api.network.test_networks.NetworksIpV6TestJSON.test_create_update_delete_network_subnet",
-"tempest.api.network.test_networks.NetworksIpV6TestJSON.test_external_network_visibility",
-"tempest.api.network.test_networks.NetworksIpV6TestJSON.test_list_networks",
-"tempest.api.network.test_networks.NetworksIpV6TestJSON.test_list_subnets",
-"tempest.api.network.test_networks.NetworksIpV6TestJSON.test_show_network",
-"tempest.api.network.test_networks.NetworksIpV6TestJSON.test_show_subnet",
-"tempest.api.network.test_networks.NetworksTestJSON.test_create_update_delete_network_subnet",
-"tempest.api.network.test_networks.NetworksTestJSON.test_external_network_visibility",
-"tempest.api.network.test_networks.NetworksTestJSON.test_list_networks",
-"tempest.api.network.test_networks.NetworksTestJSON.test_list_subnets",
-"tempest.api.network.test_networks.NetworksTestJSON.test_show_network",
-"tempest.api.network.test_networks.NetworksTestJSON.test_show_subnet",
-"tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_port_in_allowed_allocation_pools",
-"tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_port_with_no_securitygroups",
-"tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_update_delete_port",
-"tempest.api.network.test_ports.PortsIpV6TestJSON.test_list_ports",
-"tempest.api.network.test_ports.PortsIpV6TestJSON.test_show_port",
-"tempest.api.network.test_ports.PortsTestJSON.test_create_port_in_allowed_allocation_pools",
-"tempest.api.network.test_ports.PortsTestJSON.test_create_port_with_no_securitygroups",
-"tempest.api.network.test_ports.PortsTestJSON.test_create_update_delete_port",
-"tempest.api.network.test_ports.PortsTestJSON.test_list_ports",
-"tempest.api.network.test_ports.PortsTestJSON.test_show_port",
-"tempest.api.network.test_routers.RoutersIpV6Test.test_add_multiple_router_interfaces",
-"tempest.api.network.test_routers.RoutersIpV6Test.test_add_remove_router_interface_with_port_id",
-"tempest.api.network.test_routers.RoutersIpV6Test.test_add_remove_router_interface_with_subnet_id",
-"tempest.api.network.test_routers.RoutersIpV6Test.test_create_show_list_update_delete_router",
-"tempest.api.network.test_routers.RoutersTest.test_add_multiple_router_interfaces",
-"tempest.api.network.test_routers.RoutersTest.test_add_remove_router_interface_with_port_id",
-"tempest.api.network.test_routers.RoutersTest.test_add_remove_router_interface_with_subnet_id",
-"tempest.api.network.test_routers.RoutersTest.test_create_show_list_update_delete_router",
-"tempest.api.network.test_security_groups.SecGroupIPv6Test.test_create_list_update_show_delete_security_group",
-"tempest.api.network.test_security_groups.SecGroupIPv6Test.test_create_show_delete_security_group_rule",
-"tempest.api.network.test_security_groups.SecGroupIPv6Test.test_list_security_groups",
-"tempest.api.network.test_security_groups.SecGroupTest.test_create_list_update_show_delete_security_group",
-"tempest.api.network.test_security_groups.SecGroupTest.test_create_show_delete_security_group_rule",
-"tempest.api.network.test_security_groups.SecGroupTest.test_list_security_groups",
-"tempest.api.object_storage.test_account_quotas.AccountQuotasTest.test_admin_modify_quota",
-"tempest.api.object_storage.test_account_quotas.AccountQuotasTest.test_upload_valid_object",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_account_metadata",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_containers",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_end_marker",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_format_json",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_format_xml",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_limit",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_limit_and_end_marker",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_limit_and_marker",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_limit_and_marker_and_end_marker",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_marker",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_containers_with_marker_and_end_marker",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_extensions",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_no_account_metadata",
-"tempest.api.object_storage.test_account_services.AccountTest.test_list_no_containers",
-"tempest.api.object_storage.test_account_services.AccountTest.test_update_account_metadata_with_create_and_delete_metadata",
-"tempest.api.object_storage.test_account_services.AccountTest.test_update_account_metadata_with_create_matadata_key",
-"tempest.api.object_storage.test_account_services.AccountTest.test_update_account_metadata_with_create_metadata",
-"tempest.api.object_storage.test_account_services.AccountTest.test_update_account_metadata_with_delete_matadata",
-"tempest.api.object_storage.test_account_services.AccountTest.test_update_account_metadata_with_delete_matadata_key",
-"tempest.api.object_storage.test_container_acl.ObjectTestACLs.test_read_object_with_rights",
-"tempest.api.object_storage.test_container_acl.ObjectTestACLs.test_write_object_with_rights",
-"tempest.api.object_storage.test_container_quotas.ContainerQuotasTest.test_upload_large_object",
-"tempest.api.object_storage.test_container_quotas.ContainerQuotasTest.test_upload_too_many_objects",
-"tempest.api.object_storage.test_container_quotas.ContainerQuotasTest.test_upload_valid_object",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_create_container",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_create_container_overwrite",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_create_container_with_metadata_key",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_create_container_with_metadata_value",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_create_container_with_remove_metadata_key",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_create_container_with_remove_metadata_value",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_delete_container",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_delimiter",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_end_marker",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_format_json",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_format_xml",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_limit",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_marker",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_no_object",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_path",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents_with_prefix",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_metadata",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_list_no_container_metadata",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_update_container_metadata_with_create_and_delete_matadata",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_update_container_metadata_with_create_matadata_key",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_update_container_metadata_with_create_metadata",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_update_container_metadata_with_delete_metadata",
-"tempest.api.object_storage.test_container_services.ContainerTest.test_update_container_metadata_with_delete_metadata_key",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_copy_object_2d_way",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_copy_object_across_containers",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_copy_object_in_same_container",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_copy_object_to_itself",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_copy_object_with_x_fresh_metadata",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_copy_object_with_x_object_meta",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_copy_object_with_x_object_metakey",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_get_object",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_get_object_with_if_match",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_get_object_with_if_modified_since",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_get_object_with_if_unmodified_since",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_get_object_with_metadata",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_get_object_with_range",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_get_object_with_x_newest",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_get_object_with_x_object_manifest",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_list_no_object_metadata",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_list_object_metadata",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_list_object_metadata_with_x_object_manifest",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_update_object_metadata",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_update_object_metadata_with_create_and_remove_metadata",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_update_object_metadata_with_x_object_manifest",
-"tempest.api.object_storage.test_object_services.ObjectTest.test_update_object_metadata_with_x_remove_object_metakey",
-"tempest.api.object_storage.test_object_services.PublicObjectTest.test_access_public_container_object_without_using_creds",
-"tempest.api.object_storage.test_object_services.PublicObjectTest.test_access_public_object_with_another_user_creds",
-"tempest.api.object_storage.test_object_version.ContainerTest.test_versioned_container",
-"tempest.api.orchestration.stacks.test_resource_types.ResourceTypesTest.test_resource_type_list",
-"tempest.api.orchestration.stacks.test_resource_types.ResourceTypesTest.test_resource_type_show",
-"tempest.api.orchestration.stacks.test_resource_types.ResourceTypesTest.test_resource_type_template",
-"tempest.api.orchestration.stacks.test_soft_conf.TestSoftwareConfig.test_get_deployment_list",
-"tempest.api.orchestration.stacks.test_soft_conf.TestSoftwareConfig.test_get_deployment_metadata",
-"tempest.api.orchestration.stacks.test_soft_conf.TestSoftwareConfig.test_get_software_config",
-"tempest.api.orchestration.stacks.test_soft_conf.TestSoftwareConfig.test_software_deployment_create_validate",
-"tempest.api.orchestration.stacks.test_soft_conf.TestSoftwareConfig.test_software_deployment_update_no_metadata_change",
-"tempest.api.orchestration.stacks.test_soft_conf.TestSoftwareConfig.test_software_deployment_update_with_metadata_change",
-"tempest.api.orchestration.stacks.test_stacks.StacksTestJSON.test_stack_crud_no_resources",
-"tempest.api.orchestration.stacks.test_stacks.StacksTestJSON.test_stack_list_responds",
-"tempest.api.telemetry.test_telemetry_notification_api.TelemetryNotificationAPITestJSON.test_check_glance_v1_notifications",
-"tempest.api.telemetry.test_telemetry_notification_api.TelemetryNotificationAPITestJSON.test_check_glance_v2_notifications",
-"tempest.api.volume.test_volumes_actions.VolumesV1ActionsTest.test_attach_detach_volume_to_instance",
-"tempest.api.volume.test_volumes_actions.VolumesV2ActionsTest.test_attach_detach_volume_to_instance",
-"tempest.api.volume.test_volumes_get.VolumesV1GetTest.test_volume_create_get_update_delete",
-"tempest.api.volume.test_volumes_get.VolumesV1GetTest.test_volume_create_get_update_delete_from_image",
-"tempest.api.volume.test_volumes_get.VolumesV2GetTest.test_volume_create_get_update_delete",
-"tempest.api.volume.test_volumes_get.VolumesV2GetTest.test_volume_create_get_update_delete_from_image",
-"tempest.api.volume.test_volumes_list.VolumesV1ListTestJSON.test_volume_list",
-"tempest.api.volume.test_volumes_list.VolumesV2ListTestJSON.test_volume_list",
-                ]
-            },
-            "runner": {
-                "type": "serial",
-                "times": 1,
-                "concurrency": 1
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ]
-}
diff --git a/testcases/VIM/OpenStack/CI/suites/opnfv-tempest.json b/testcases/VIM/OpenStack/CI/suites/opnfv-tempest.json
deleted file mode 100644
index b94de47e4..000000000
--- a/testcases/VIM/OpenStack/CI/suites/opnfv-tempest.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "TempestScenario.all": [
-        {
-            "args": {"tempest_conf": "/etc/tempest/tempest.conf"},
-            "runner": {
-                "type": "constant",
-                "times": 1,
-                "concurrency": 1
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ]
-}
-
diff --git a/testcases/VIM/OpenStack/CI/suites/opnfv-vm.json b/testcases/VIM/OpenStack/CI/suites/opnfv-vm.json
deleted file mode 100644
index 382f40251..000000000
--- a/testcases/VIM/OpenStack/CI/suites/opnfv-vm.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-    "VMTasks.boot_runcommand_delete": [
-        {
-            "args": {
-                "flavor": {
-                    "name": "m1.small"
-                },
-                "image": {
-                    "name": "^functest-img*"
-                },
-                "floating_network": "net04_ext",
-                "force_delete": false,
-                "script": "../Rally_repo/samples/tasks/support/instance_dd_test.sh",
-                "interpreter": "/bin/sh",
-                "username": "admin"
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 3,
-                    "users_per_tenant": 2
-                },
-                "network": {
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ],
-    "VMTasks.boot_runcommand_delete": [
-        {
-            "args": {
-                "flavor": {
-                    "name": "m1.small"
-                },
-                "image": {
-                    "name": "^functest-img*"
-                },
-                "volume_args": {
-                    "size": 2
-                },
-                "fixed_network": "private",
-                "floating_network": "net04_ext",
-                "use_floatingip": true,
-                "force_delete": false,
-                "script": "../Rally_repo/samples/tasks/support/instance_dd_test.sh",
-                "interpreter": "/bin/sh",
-                "username": "admin"
-            },
-            "runner": {
-                "type": "constant",
-                "times": 10,
-                "concurrency": 2
-            },
-            "context": {
-                "users": {
-                    "tenants": 3,
-                    "users_per_tenant": 2
-                }
-            },
-            "sla": {
-                "failure_rate": {"max": 0}
-            }
-        }
-    ]
-}
-
diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml
index 193844b08..2e9f3bdc3 100644
--- a/testcases/config_functest.yaml
+++ b/testcases/config_functest.yaml
@@ -4,7 +4,7 @@ general:
         dir_vping:      testcases/vPing/CI/libraries/
         dir_odl:        testcases/Controllers/ODL/CI/
         dir_rally:      testcases/VIM/OpenStack/CI/libraries/
-        dir_rally_scn:  testcases/VIM/OpenStack/CI/suites/
+        dir_rally_scn:  testcases/VIM/OpenStack/CI/rally_cert/
         dir_vIMS:       testcases/vIMS/CI/
         dir_onos:       testcases/Controllers/ONOS/Teston/CI/