leverage data_files to eliminate so many hardcoded abs_path_seekings

1. mv conf/ userconfig/ compliance/ patch to etc/ 2. after installation etc/ will be put under /etc/dovetail 3. leveraging /etc/dovetail in coding Change-Id: Icf9cb00ff7fc7cf35755f60d3e258b23e2c70839 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
author: SerenaFeng <feng.xiaowei@zte.com.cn> 2018-03-01 20:03:59 +0800
committer: SerenaFeng <feng.xiaowei@zte.com.cn> 2018-03-06 09:16:43 +0800
commit: b25c1371f82911ea26b8c893b6612bb5ae0c8c19 (patch)
tree: 91190d32b9bb723670214b4d91e0bb95cccf5382 /dovetail
parent: c308b9a718b8b4fc5e781f8d2a6dbe714e381834 (diff)
86 files changed, 52 insertions, 2108 deletions
diff --git a/dovetail/cli/commands/cli_testcase.py b/dovetail/cli/commands/cli_testcase.py
index a498d495..6fe789f7 100644
--- a/dovetail/cli/commands/cli_testcase.py
+++ b/dovetail/cli/commands/cli_testcase.py
@@ -7,37 +7,23 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 import os
-import sys
-import yaml
+
 import click
-import six
+import yaml
 
-import dovetail.utils.dovetail_utils as dt_utils
-from dovetail.utils.dovetail_config import DovetailConfig as dt_cfg
+from dovetail import constants
 from dovetail.testcase import Testsuite
+from dovetail.utils.dovetail_config import DovetailConfig as dt_cfg
+import dovetail.utils.dovetail_utils as dt_utils
 
 
 class CliTestcase(object):
 
     @classmethod
     def testsuite_load(cls):
-        dt_cfg.load_config_files()
+        dt_cfg.load_config_files(constants.CONF_PATH)
         Testsuite.load()
 
-    @classmethod
-    def get_path(cls, path):
-        if isinstance(path, six.string_types):
-            dt_cfg.load_config_files()
-            dovetail_dir = os.path.abspath(
-                os.path.join(os.path.dirname(__file__),
-                             os.pardir, os.pardir))
-            relative_path = dt_cfg.dovetail_config[path]
-            abs_path = os.path.join(dovetail_dir, relative_path)
-        else:
-            click.echo("input %s is not a string" % path)
-            sys.exit(1)
-        return abs_path
-
     def list_testcase(self, testsuite):
         self.testsuite_load()
         if testsuite:
@@ -75,14 +61,14 @@ class CliTestcase(object):
                 click.echo("No testsuite defined yet in dovetail!!!")
 
     def show_testcase(self, testcase):
-        abs_testcase_path = self.get_path('TESTCASE_PATH')
+        abs_testcase_path = constants.TESTCASE_PATH
         if testcase.startswith("dovetail."):
             testcase_yml = testcase[9:] + '.yml'
         else:
             testcase_yml = testcase + '.yml'
         for root, dirs, files in os.walk(abs_testcase_path):
             if testcase_yml in files:
-                testcase_path = abs_testcase_path + testcase_yml
+                testcase_path = os.path.join(abs_testcase_path, testcase_yml)
                 with open(testcase_path, 'r') as stream:
                     try:
                         click.echo(stream.read())
diff --git a/dovetail/compliance/compliance_set.yml b/dovetail/compliance/compliance_set.yml
deleted file mode 100644
index 75f50e42..00000000
--- a/dovetail/compliance/compliance_set.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-compliance_set:
-  name: compliance_set
-  testcases_list:
-    # Temporarily, one test case kept here as default to run
-    # for use of software development/debug
-    # TO DO: will amend when compliance set is settled
-    - dovetail.ipv6.tc001
diff --git a/dovetail/compliance/debug.yml b/dovetail/compliance/debug.yml
deleted file mode 100644
index bac48f20..00000000
--- a/dovetail/compliance/debug.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-# only used for dovetail tool development debug
-# all these are new test cases adding here for running on CI
-debug:
-  name: debug
-  testcases_list:
-    - dovetail.smoke.tc001
diff --git a/dovetail/compliance/ovp.1.0.0.yml b/dovetail/compliance/ovp.1.0.0.yml
deleted file mode 100644
index 71f2198d..00000000
--- a/dovetail/compliance/ovp.1.0.0.yml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-ovp.1.0.0:
-  name: ovp.1.0.0
-  testcases_list:
-  # mandatory test cases
-    # osinterop
-    - dovetail.osinterop.tc001
-    # vping
-    - dovetail.vping.tc001
-    - dovetail.vping.tc002
-    # HA
-    - dovetail.ha.tc001
-    - dovetail.ha.tc002
-    - dovetail.ha.tc003
-    - dovetail.ha.tc004
-    - dovetail.ha.tc005
-    - dovetail.ha.tc006
-    - dovetail.ha.tc007
-    - dovetail.ha.tc008
-  # optional test cases
-    # ipv6
-    - dovetail.ipv6.tc001
-    - dovetail.ipv6.tc002
-    - dovetail.ipv6.tc003
-    - dovetail.ipv6.tc004
-    - dovetail.ipv6.tc005
-    - dovetail.ipv6.tc006
-    - dovetail.ipv6.tc007
-    - dovetail.ipv6.tc008
-    - dovetail.ipv6.tc009
-    - dovetail.ipv6.tc010
-    - dovetail.ipv6.tc011
-    - dovetail.ipv6.tc012
-    - dovetail.ipv6.tc013
-    - dovetail.ipv6.tc014
-    - dovetail.ipv6.tc015
-    - dovetail.ipv6.tc016
-    - dovetail.ipv6.tc017
-    - dovetail.ipv6.tc018
-    - dovetail.ipv6.tc019
-    - dovetail.ipv6.tc020
-    - dovetail.ipv6.tc021
-    - dovetail.ipv6.tc022
-    - dovetail.ipv6.tc023
-    - dovetail.ipv6.tc024
-    - dovetail.ipv6.tc025
-    # tempest
-    - dovetail.tempest.tc001
-    - dovetail.tempest.tc002
-    - dovetail.tempest.tc003
-    - dovetail.tempest.tc004
-    - dovetail.tempest.tc005
-    # sdnvpn
-    - dovetail.sdnvpn.tc001
-    - dovetail.sdnvpn.tc002
-    - dovetail.sdnvpn.tc004
-    - dovetail.sdnvpn.tc008
diff --git a/dovetail/compliance/proposed_tests.yml b/dovetail/compliance/proposed_tests.yml
deleted file mode 100644
index 692ffed8..00000000
--- a/dovetail/compliance/proposed_tests.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-proposed_tests:
-  name: proposed_tests
-  testcases_list:
-  # proposed test cases for 2nd release
-    # smoke
-    - dovetail.smoke.tc001
-    - dovetail.smoke.tc002
-    # HA
-    - dovetail.ha.tc009
-    - dovetail.ha.tc010
-    - dovetail.ha.tc011
-    # vnf
-    - dovetail.vnf.tc001
-    # stress
-    - dovetail.stress.tc001
-    # sdnvpn
-    - dovetail.sdnvpn.tc000
diff --git a/dovetail/conf/__init__.py b/dovetail/conf/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/dovetail/conf/__init__.py
+++ /dev/null
diff --git a/dovetail/conf/bottlenecks_config.yml b/dovetail/conf/bottlenecks_config.yml
deleted file mode 100644
index f33e50f1..00000000
--- a/dovetail/conf/bottlenecks_config.yml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-bottlenecks:
-  image_name: opnfv/bottlenecks
-  docker_tag: stable
-  opts: '-id --privileged=true'
-  config:
-    dir: '/home/opnfv/userconfig'
-  pre_condition:
-    - 'source /tmp/admin_rc.sh &&
-       (openstack --insecure image list | grep cirros-0.3.5 ||
-       openstack --insecure image create cirros-0.3.5
-       --disk-format qcow2 --container-format bare
-       --file /home/opnfv/userconfig/pre_config/cirros-0.3.5-x86_64-disk.img)'
-    - 'source /tmp/admin_rc.sh &&
-       (openstack --insecure flavor list | grep yardstick-flavor ||
-       openstack --insecure flavor create --id 100
-       --ram 1024 --disk 3 --vcpus 1 yardstick-flavor)'
-  cmds:
-    - 'python /home/opnfv/bottlenecks/testsuites/run_testsuite.py testcase {{validate_testcase}} True'
-  post_condition:
-    - 'source /tmp/admin_rc.sh &&
-       (! openstack --insecure image list | grep cirros-0.3.5 ||
-       openstack --insecure image delete cirros-0.3.5)'
-    - 'source /tmp/admin_rc.sh &&
-       (! openstack --insecure flavor list | grep yardstick-flavor ||
-       openstack --insecure flavor delete yardstick-flavor)'
-  result:
-    dir: '/tmp'
-    file_path: 'bottlenecks.log'
-  openrc: '/tmp/admin_rc.sh'
-  extra_container:
-    - 'Bottlenecks-Yardstick'
-    - 'Bottlenecks-ELK'
diff --git a/dovetail/conf/cmd_config.yml b/dovetail/conf/cmd_config.yml
deleted file mode 100644
index 91a44b0b..00000000
--- a/dovetail/conf/cmd_config.yml
+++ /dev/null
@@ -1,71 +0,0 @@
----
-cli:
-  arguments:
-    config:
-      # This is a simple example of arguments.
-      # Dovetail has no need of this kind of parameters currently.
-      # The arguments must be given orderly at the run-time.
-      #
-      # docker_tag:
-      #   flags: 'docker_tag'
-      #   path:
-      #     - 'functest/docker_tag'
-      #     - 'yardstick/docker_tag'
-    control:
-
-  options:
-    config:
-      yard_tag:
-        flags:
-          - '--yard_tag'
-          - '-y'
-        path:
-          - 'yardstick/docker_tag'
-        help: 'Overwrite tag for yardstick docker container (e.g. opnfv-5.1.0)'
-      func_tag:
-        flags:
-          - '--func_tag'
-          - '-f'
-        path:
-          - 'functest/docker_tag'
-        help: 'Overwrite tag for functest docker container (e.g. euphrates)'
-      bott_tag:
-        flags:
-          - '--bott_tag'
-          - '-b'
-        path:
-          - 'bottlenecks/docker_tag'
-        help: 'Overwrite tag for bottlenecks docker container (e.g. stable)'
-    control:
-      testsuite:
-        flags:
-          - '--testsuite'
-        default: 'ovp.1.0.0'
-        help: 'compliance testsuite.'
-      testarea:
-        flags:
-          - '--testarea'
-        multiple: 'True'
-        help: 'compliance testarea within testsuite'
-      debug:
-        flags:
-          - '--debug'
-          - '-d'
-        is_flag: 'True'
-        help: 'Flag for showing debug log on screen.'
-      stop:
-        flags:
-          - '--stop'
-          - '-s'
-        is_flag: 'True'
-        help: 'Flag for stopping on test case failure.'
-      report:
-        flags:
-          - '--report'
-          - '-r'
-        help: 'push results to DB (e.g. --report http://192.168.135.2:8000/api/v1/results)'
-      offline:
-        flags:
-          - '--offline'
-        is_flag: 'True'
-        help: 'run in offline method, which means not to update the docker upstream images, functest, yardstick, etc.'
diff --git a/dovetail/conf/dovetail_config.yml b/dovetail/conf/dovetail_config.yml
deleted file mode 100644
index 290798da..00000000
--- a/dovetail/conf/dovetail_config.yml
+++ /dev/null
@@ -1,112 +0,0 @@
----
-# report_file: 'dovetail_report.txt'
-cli_file_name: 'cmd_config.yml'
-report_dest: 'file'
-result_file: 'results.json'
-
-# OPENSTACK Credential file
-env_file: 'env_config.sh'
-
-# POD info file
-pod_file: 'pod.yaml'
-
-# JUMPSERVER private key used in pod_file to login hosts
-# If use password to login hosts, there's no need to provide the private key
-pri_key: 'id_rsa'
-
-# SDNVPN offline image
-sdnvpn_image: 'ubuntu-16.04-server-cloudimg-amd64-disk1.img'
-
-# Tempest image
-cirros_image: 'cirros-0.3.5-x86_64-disk.img'
-
-# Ubuntu 14.04 image for snaps_smoke
-ubuntu14_image: 'ubuntu-14.04-server-cloudimg-amd64-disk1.img'
-
-# cloudify_ims image
-cloudify_image: 'cloudify-manager-premium-4.0.1.qcow2'
-
-# Trusty image
-trusty_image: 'trusty-server-cloudimg-amd64-disk1.img'
-
-COMPLIANCE_PATH: compliance/
-TESTCASE_PATH: testcase/
-# testsuite supported, should adjust accordingly
-testsuite_supported:
-  - compliance_set
-  - proposed_tests
-  - debug
-  - ovp.1.0.0
-# testarea supported, should adjust accordingly
-testarea_supported:
-  - osinterop
-  - example
-  - ha
-  - ipv6
-  - sdnvpn
-  - vping
-  - stress
-  - tempest
-  - optional
-  - mandatory
-  - full
-  - smoke
-  - vnf
-
-functest_testsuite:
-  - refstack_defcore
-  - tempest_smoke_serial
-  - tempest_full_parallel
-  - tempest_custom
-  - rally_sanity
-  - promise
-
-functest_testcase:
-  - bgpvpn
-  - connection_check
-  - api_check
-  - snaps_health_check
-  - vping_ssh
-  - vping_userdata
-  - doctor
-  - copper
-  - cloudify_ims
-  - odl
-  - snaps_smoke
-
-# used for testcase cmd template in jinja2 format
-# we have two variables available now
-# parameter path, use this path to walk through python object and get value
-# and the python object is "testcase" object by hard-coded
-parameters:
-  - name: testcase
-    path: '("name",)'
-  - name: validate_testcase
-    path: '("validate", "testcase")'
-
-include_config:
-  - functest_config.yml
-  - yardstick_config.yml
-  - bottlenecks_config.yml
-
-test_project:
-  - 'yardstick'
-  - 'functest'
-  - 'bottlenecks'
-
-validate_input:
-  valid_docker_tag:
-    - 'stable'
-    - 'latest'
-    - 'danube.3.2'
-    - 'euphrates'
-
-mandatory:
-  - osinterop
-  - ha
-  - vping
-
-optional:
-  - ipv6
-  - tempest
-  - sdnvpn
diff --git a/dovetail/conf/functest_config.yml b/dovetail/conf/functest_config.yml
deleted file mode 100644
index 896aeb95..00000000
--- a/dovetail/conf/functest_config.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-functest:
-  image_name: opnfv/functest-restapi
-  docker_tag: euphrates
-  opts: '-id --privileged=true'
-  config:
-    dir: '/home/opnfv/userconfig'
-  pre_condition:
-    - 'echo test for precondition in functest'
-  cmds:
-    - 'functest env prepare'
-    - 'functest testcase run {{validate_testcase}} -r'
-  post_condition:
-    - 'echo test for postcondition in functest'
-  result:
-    dir: '/home/opnfv/functest/results'
-    file_path: 'functest_results.txt'
-  openrc: '/home/opnfv/functest/conf/openstack.creds'
diff --git a/dovetail/conf/yardstick_config.yml b/dovetail/conf/yardstick_config.yml
deleted file mode 100644
index bbb2133e..00000000
--- a/dovetail/conf/yardstick_config.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-yardstick:
-  image_name: opnfv/yardstick
-  docker_tag: opnfv-5.1.0
-  opts: '-id --privileged=true'
-  config:
-    dir: '/home/opnfv/userconfig'
-  pre_condition:
-    - 'echo this is pre_condition'
-  cmds:
-    - 'mkdir -p /home/opnfv/yardstick/results/'
-    - "cd /home/opnfv/repos/yardstick && source /etc/yardstick/openstack.creds &&
-         yardstick task start tests/opnfv/test_cases/{{validate_testcase}}.yaml
-         --output-file /home/opnfv/yardstick/results/{{testcase}}.out
-         --task-args '{'file': '/home/opnfv/userconfig/pre_config/pod.yaml'}'"
-  post_condition:
-    - 'echo this is post_condition'
-  result:
-    dir: '/home/opnfv/yardstick/results'
-    log: '/tmp/yardstick'
-    file_path: 'yardstick.log'
-    key_path: '/root/.ssh/id_rsa'
-  openrc: '/etc/yardstick/openstack.creds'
-  yard_conf:
-    src_file: '/home/opnfv/repos/yardstick/etc/yardstick/yardstick.conf.sample'
-    dest_file: '/etc/yardstick/yardstick.conf'
diff --git a/dovetail/constants.py b/dovetail/constants.py
new file mode 100644
index 00000000..c3ce615e
--- /dev/null
+++ b/dovetail/constants.py
@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+#
+# feng.xiaowei@zte.com.cn
+# 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
+#
+import os.path
+
+
+DOVETAIL_CONF_PATH = '/etc/dovetail'
+USERCONF_PATH = os.path.join(DOVETAIL_CONF_PATH, 'userconfig')
+PATCH_PATH = os.path.join(DOVETAIL_CONF_PATH, 'patch')
+CONF_PATH = os.path.join(DOVETAIL_CONF_PATH, 'conf')
+TESTCASE_PATH = os.path.join(DOVETAIL_CONF_PATH, 'testcase')
+COMPLIANCE_PATH = os.path.join(DOVETAIL_CONF_PATH, 'compliance')
diff --git a/dovetail/patch/0001-Adjust-Yardstick-HA-test-cases-SLA-and-log-level.patch b/dovetail/patch/0001-Adjust-Yardstick-HA-test-cases-SLA-and-log-level.patch
deleted file mode 100644
index 8c9589ca..00000000
--- a/dovetail/patch/0001-Adjust-Yardstick-HA-test-cases-SLA-and-log-level.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From b7c13b5a7e07abdf4d3631049625461271fa5c5b Mon Sep 17 00:00:00 2001
-From: cvp <cvp@example.com>
-Date: Tue, 26 Sep 2017 03:59:54 +0000
-Subject: [PATCH] Adjust Yardstick HA test cases SLA and log level
-
----
- tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml | 4 ++--
- tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml | 4 ++--
- tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml | 4 ++--
- tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml | 4 ++--
- tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml | 4 ++--
- tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml | 4 ++--
- yardstick/__init__.py                             | 2 +-
- 7 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml
-index 5d3057d..c1d3645 100644
---- a/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml
-+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml
-@@ -34,10 +34,10 @@ scenarios:
-     - monitor_type: "process"
-       process_name: "nova-api"
-       host: node1
--      monitor_time: 20
-+      monitor_time: 30
-       monitor_number: 3
-       sla:
--        max_recover_time: 20
-+        max_recover_time: 30
-
-   nodes:
-     node1: node1.LF
-diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml
-index d851d5a..8c7348b 100644
---- a/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml
-+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml
-@@ -33,10 +33,10 @@ scenarios:
-     - monitor_type: "process"
-       process_name: "neutron-server"
-       host: node1
--      monitor_time: 20
-+      monitor_time: 30
-       monitor_number: 3
-       sla:
--        max_recover_time: 20
-+        max_recover_time: 30
-
-   nodes:
-     node1: node1.LF
-diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml
-index ad81a14..635e4d9 100644
---- a/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml
-+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml
-@@ -33,10 +33,10 @@ scenarios:
-     - monitor_type: "process"
-       process_name: "keystone"
-       host: node1
--      monitor_time: 20
-+      monitor_time: 30
-       monitor_number: 3
-       sla:
--        max_recover_time: 20
-+        max_recover_time: 30
-
-   nodes:
-     node1: node1.LF
-diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml
-index cc99036..57fa739 100644
---- a/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml
-+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml
-@@ -33,10 +33,10 @@ scenarios:
-     - monitor_type: "process"
-       process_name: "glance-api"
-       host: node1
--      monitor_time: 20
-+      monitor_time: 30
-       monitor_number: 3
-       sla:
--        max_recover_time: 20
-+        max_recover_time: 30
-
-   nodes:
-     node1: node1.LF
-diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml
-index 237f845..06ad641 100644
---- a/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml
-+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml
-@@ -33,10 +33,10 @@ scenarios:
-     - monitor_type: "process"
-       process_name: "cinder-api"
-       host: node1
--      monitor_time: 20
-+      monitor_time: 30
-       monitor_number: 3
-       sla:
--        max_recover_time: 20
-+        max_recover_time: 30
-
-   nodes:
-     node1: node1.LF
-diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
-index 9e05cc8..e3f0934 100644
---- a/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
-+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
-@@ -32,10 +32,10 @@ scenarios:
-           key: "service-status"
-           process_name: "haproxy"
-           host: node1
--          monitor_time: 20
-+          monitor_time: 30
-           monitor_number: 3
-           sla:
--            max_recover_time: 20
-+            max_recover_time: 30
-
-         -
-           monitor_type: "openstack-cmd"
-diff --git a/yardstick/__init__.py b/yardstick/__init__.py
-index 2f5ae9f..973bfa2 100644
---- a/yardstick/__init__.py
-+++ b/yardstick/__init__.py
-@@ -44,7 +44,7 @@ def _init_logging():
-         _LOG_STREAM_HDLR.setLevel(logging.INFO)
-     # don't append to log file, clobber
-     _LOG_FILE_HDLR.setFormatter(_LOG_FORMATTER)
--    _LOG_FILE_HDLR.setLevel(logging.DEBUG)
-+    _LOG_FILE_HDLR.setLevel(logging.INFO)
-
-     del logging.root.handlers[:]
-     logging.root.addHandler(_LOG_STREAM_HDLR)
---
-1.9.1
-
diff --git a/dovetail/run.py b/dovetail/run.py
index cddf22ef..e43c126a 100755
--- a/dovetail/run.py
+++ b/dovetail/run.py
@@ -10,24 +10,25 @@
 ##############################################################################
 
 
-import click
-import os
 import copy
+import os
 import time
 import uuid
 
-import utils.dovetail_logger as dt_logger
-import utils.dovetail_utils as dt_utils
+import click
 
-from parser import Parser
 from container import Container
+from dovetail import constants
+from parser import Parser
+from report import BottlenecksChecker, FunctestChecker, YardstickChecker
+from report import BottlenecksCrawler, FunctestCrawler, YardstickCrawler
+from report import Report
+from test_runner import DockerRunner, ShellRunner
 from testcase import Testcase
 from testcase import Testsuite
-from report import Report
-from report import FunctestCrawler, YardstickCrawler, BottlenecksCrawler
-from report import FunctestChecker, YardstickChecker, BottlenecksChecker
 from utils.dovetail_config import DovetailConfig as dt_cfg
-from test_runner import DockerRunner, ShellRunner
+import utils.dovetail_logger as dt_logger
+import utils.dovetail_utils as dt_utils
 
 
 def load_testsuite(testsuite):
@@ -212,22 +213,18 @@ def get_result_path():
 
 
 def copy_userconfig_files(logger):
-    dovetail_home = os.path.dirname(os.path.abspath(__file__))
-    userconfig_path = os.path.join(dovetail_home, 'userconfig')
     pre_config_path = dt_cfg.dovetail_config['config_dir']
     if not os.path.isdir(pre_config_path):
         os.makedirs(pre_config_path)
-    cmd = 'sudo cp -r %s/* %s' % (userconfig_path, pre_config_path)
+    cmd = 'sudo cp -r %s/* %s' % (constants.USERCONF_PATH, pre_config_path)
     dt_utils.exec_cmd(cmd, logger, exit_on_error=False)
 
 
 def copy_patch_files(logger):
-    dovetail_home = os.path.dirname(os.path.abspath(__file__))
-    patch_path = os.path.join(dovetail_home, 'patch')
     patch_set_path = dt_cfg.dovetail_config['patch_dir']
     if not os.path.isdir(patch_set_path):
         os.makedirs(patch_set_path)
-    cmd = 'sudo cp -r %s/* %s' % (patch_path, patch_set_path)
+    cmd = 'sudo cp -r %s/* %s' % (constants.PATCH_PATH, patch_set_path)
     dt_utils.exec_cmd(cmd, logger, exit_on_error=False)
 
 
@@ -313,7 +310,7 @@ def main(*args, **kwargs):
                      .format(kwargs['testsuite'], origin_testarea))
 
 
-dt_cfg.load_config_files()
+dt_cfg.load_config_files(constants.CONF_PATH)
 dovetail_config = copy.deepcopy(dt_cfg.dovetail_config)
 CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])
 if dovetail_config['cli']['options'] is not None:
diff --git a/dovetail/testcase.py b/dovetail/testcase.py
index 99845484..c9aef0e7 100644
--- a/dovetail/testcase.py
+++ b/dovetail/testcase.py
@@ -8,13 +8,14 @@
 #
 
 import os
-import yaml
 
-import utils.dovetail_logger as dt_logger
+import yaml
 
+from dovetail import constants
 from parser import Parser
-from utils.dovetail_config import DovetailConfig as dt_cfg
 from test_runner import TestRunnerFactory
+from utils.dovetail_config import DovetailConfig as dt_cfg
+import utils.dovetail_logger as dt_logger
 
 
 class Testcase(object):
@@ -221,9 +222,7 @@ class Testcase(object):
 
     @classmethod
     def load(cls):
-        testcase_dir = os.path.dirname(os.path.abspath(__file__))
-        testcase_path = dt_cfg.dovetail_config['TESTCASE_PATH']
-        abs_testcase_path = os.path.join(testcase_dir, testcase_path)
+        abs_testcase_path = constants.TESTCASE_PATH
         for root, dirs, files in os.walk(abs_testcase_path):
             for testcase_file in files:
                 with open(os.path.join(root, testcase_file)) as f:
@@ -363,9 +362,7 @@ class Testsuite(object):
 
     @classmethod
     def load(cls):
-        compliance_dir = os.path.dirname(os.path.abspath(__file__))
-        compliance_path = dt_cfg.dovetail_config['COMPLIANCE_PATH']
-        abs_compliance_path = os.path.join(compliance_dir, compliance_path)
+        abs_compliance_path = constants.COMPLIANCE_PATH
         for root, dirs, files in os.walk(abs_compliance_path):
             for testsuite_yaml in files:
                 with open(os.path.join(root, testsuite_yaml)) as f:
diff --git a/dovetail/testcase/example.tc001.yml b/dovetail/testcase/example.tc001.yml
deleted file mode 100644
index 0ba297a8..00000000
--- a/dovetail/testcase/example.tc001.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-dovetail.example.tc001:
-  name: dovetail.example.tc001
-  objective: Bulk creation and deletion of IPv6 networks, ports and subnets
-  validate:
-    type: functest
-    testcase: tempest_smoke_serial
-    pre_condition:
-      - 'echo test for precondition'
-    cmds:
-      - 'functest env prepare'
-      - 'functest testcase run {{validate_testcase}} -r'
-    post_condition:
-      - 'echo test for precondition'
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_networks.BulkNetworkOpsIpV6Test.test_bulk_create_delete_network
-      - tempest.api.network.test_networks.BulkNetworkOpsIpV6Test.test_bulk_create_delete_port
-      - tempest.api.network.test_networks.BulkNetworkOpsIpV6Test.test_bulk_create_delete_subnet
diff --git a/dovetail/testcase/example.tc002.yml b/dovetail/testcase/example.tc002.yml
deleted file mode 100644
index 72bfa49d..00000000
--- a/dovetail/testcase/example.tc002.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.example.tc002:
-  name: dovetail.example.tc002
-  objective: VIM ipv6 operations, to create/update/delete an IPv6 network and subnet
-  validate:
-    type: shell
-    testcase: "run shell"
-    pre_condition:
-      - "echo pre_condition"
-    cmds:
-      - "echo test2"
-      - "mkdir xxx"
-    post_condition:
-      - "echo post_condition"
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/example.tc003.yml b/dovetail/testcase/example.tc003.yml
deleted file mode 100644
index 3ae0fb07..00000000
--- a/dovetail/testcase/example.tc003.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-dovetail.example.tc003:
-  name: dovetail.example.tc003
-  objective: doing something useful
-  validate:
-    type: shell
-    testcase: "run shell22"
-    pre_condition:
-    cmds:
-      - "echo test2"
-    post_condition:
-      - ""
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/ha.tc001.yml b/dovetail/testcase/ha.tc001.yml
deleted file mode 100644
index e938c822..00000000
--- a/dovetail/testcase/ha.tc001.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-dovetail.ha.tc001:
-  name: dovetail.ha.tc001
-  objective: > # This test case will verify the high availability
-    # of the service provided by OpenStack (like nova-api, neutro-server) on control node.
-  validate:
-    type: yardstick
-    testcase: opnfv_yardstick_tc019
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/ha.tc002.yml b/dovetail/testcase/ha.tc002.yml
deleted file mode 100644
index 4ca78b45..00000000
--- a/dovetail/testcase/ha.tc002.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-dovetail.ha.tc002:
-  name: dovetail.ha.tc002
-  objective: > # This test case will verify the high availability of the
-    # network service provided by OpenStack (neutro-server) on control node.
-  validate:
-    type: yardstick
-    testcase: opnfv_yardstick_tc045
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/ha.tc003.yml b/dovetail/testcase/ha.tc003.yml
deleted file mode 100644
index b3a0bf7b..00000000
--- a/dovetail/testcase/ha.tc003.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-dovetail.ha.tc003:
-  name: dovetail.ha.tc003
-  objective: > # This test case will verify the high availability of the
-    # user service provided by OpenStack (keystone) on control node.
-  validate:
-    type: yardstick
-    testcase: opnfv_yardstick_tc046
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/ha.tc004.yml b/dovetail/testcase/ha.tc004.yml
deleted file mode 100644
index b25af983..00000000
--- a/dovetail/testcase/ha.tc004.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-dovetail.ha.tc004:
-  name: dovetail.ha.tc004
-  objective: > # This test case will verify the high availability of the
-    # image service provided by OpenStack (glance-api) on control node.
-  validate:
-    type: yardstick
-    testcase: opnfv_yardstick_tc047
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/ha.tc005.yml b/dovetail/testcase/ha.tc005.yml
deleted file mode 100644
index fd6e14d5..00000000
--- a/dovetail/testcase/ha.tc005.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-dovetail.ha.tc005:
-  name: dovetail.ha.tc005
-  objective: > # This test case will verify the high availability of the
-    # volume service provided by OpenStack (cinder-api) on control node.
-  validate:
-    type: yardstick
-    testcase: opnfv_yardstick_tc048
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/ha.tc006.yml b/dovetail/testcase/ha.tc006.yml
deleted file mode 100644
index aecbe8b2..00000000
--- a/dovetail/testcase/ha.tc006.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-dovetail.ha.tc006:
-  name: dovetail.ha.tc006
-  objective: > # This test case will verify the high availability of control node.
-    # When the CPU usage of a specified controller node is stressed to 100%,
-    # which breaks down the Openstack services on this node. These Openstack service
-    # should able to be accessed by other controller nodes, and the services on
-    # failed controller node should be isolated.
-  validate:
-    type: yardstick
-    testcase: opnfv_yardstick_tc051
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/ha.tc007.yml b/dovetail/testcase/ha.tc007.yml
deleted file mode 100644
index 5d985534..00000000
--- a/dovetail/testcase/ha.tc007.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-dovetail.ha.tc007:
-  name: dovetail.ha.tc007
-  objective: > # This test case will verify the high availability of control node.
-    # When the disk I/O of a specified disk is blocked, which breaks down the Openstack
-    # services on this node. Read and write services should still be accessed by other
-    # controller nodes, and the services on failed controller node should be isolated.
-  validate:
-    type: yardstick
-    testcase: opnfv_yardstick_tc052
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/ha.tc008.yml b/dovetail/testcase/ha.tc008.yml
deleted file mode 100644
index 2287b8d1..00000000
--- a/dovetail/testcase/ha.tc008.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-dovetail.ha.tc008:
-  name: dovetail.ha.tc008
-  objective: > # This test case will verify the high availability of the load balance
-    # service(current is HAProxy) that supports OpenStack on controller node. When the
-    # load balance service of a specified controller node is killed, whether other
-    # load balancers on other controller nodes will work, and whether the controller node
-    # will restart the load balancer are checked.
-  validate:
-    type: yardstick
-    testcase: opnfv_yardstick_tc053
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/ha.tc009.yml b/dovetail/testcase/ha.tc009.yml
deleted file mode 100644
index 10f4e506..00000000
--- a/dovetail/testcase/ha.tc009.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-dovetail.ha.tc009:
-  name: dovetail.ha.tc009
-  objective: > # OpenStack Controll Node abnormally shutdown.
-  validate:
-    type: yardstick
-    testcase: opnfv_yardstick_tc025
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/ha.tc010.yml b/dovetail/testcase/ha.tc010.yml
deleted file mode 100644
index 6508a4dc..00000000
--- a/dovetail/testcase/ha.tc010.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-dovetail.ha.tc010:
-  name: dovetail.ha.tc010
-  objective: > # OpenStack Controller Messaging Queue Service High Availability.
-  validate:
-    type: yardstick
-    testcase: opnfv_yardstick_tc056
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/ha.tc011.yml b/dovetail/testcase/ha.tc011.yml
deleted file mode 100644
index d1268826..00000000
--- a/dovetail/testcase/ha.tc011.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-dovetail.ha.tc011:
-  name: dovetail.ha.tc011
-  objective: > # OpenStack Controller Virtual Router Service High Availability.
-  validate:
-    type: yardstick
-    testcase: opnfv_yardstick_tc058
-    pre_condition:
-      - 'source /etc/yardstick/openstack.creds && openstack --insecure image create cirros-ha-11
-         --disk-format qcow2 --container-format bare --public
-         --file /home/opnfv/userconfig/pre_config/cirros-0.3.5-x86_64-disk.img'
-    cmds:
-      - 'mkdir -p /home/opnfv/yardstick/results/'
-      - "cd /home/opnfv/repos/yardstick && source /etc/yardstick/openstack.creds &&
-         yardstick task start tests/opnfv/test_cases/{{validate_testcase}}.yaml
-         --output-file /home/opnfv/yardstick/results/{{testcase}}.out
-         --task-args '{'file': '/home/opnfv/userconfig/pre_config/pod.yaml',
-         'image': 'cirros-ha-11', 'flavor': 'm1.tiny'}'"
-    post_condition:
-      - 'source /etc/yardstick/openstack.creds && openstack --insecure image delete cirros-ha-11'
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/ipv6.tc001.yml b/dovetail/testcase/ipv6.tc001.yml
deleted file mode 100644
index c90c21c9..00000000
--- a/dovetail/testcase/ipv6.tc001.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-dovetail.ipv6.tc001:
-  name: dovetail.ipv6.tc001
-  objective: Bulk creation and deletion of IPv6 networks, ports and subnets
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_networks.BulkNetworkOpsIpV6Test.test_bulk_create_delete_network[id-d4f9024d-1e28-4fc1-a6b1-25dbc6fa11e2,smoke]
-      - tempest.api.network.test_networks.BulkNetworkOpsIpV6Test.test_bulk_create_delete_port[id-48037ff2-e889-4c3b-b86a-8e3f34d2d060,smoke]
-      - tempest.api.network.test_networks.BulkNetworkOpsIpV6Test.test_bulk_create_delete_subnet[id-8936533b-c0aa-4f29-8e53-6cc873aec489,smoke]
diff --git a/dovetail/testcase/ipv6.tc002.yml b/dovetail/testcase/ipv6.tc002.yml
deleted file mode 100644
index c7e8d480..00000000
--- a/dovetail/testcase/ipv6.tc002.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc002:
-  name: dovetail.ipv6.tc002
-  objective: VIM ipv6 operations, to create/update/delete an IPv6 network and subnet
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_networks.NetworksIpV6Test.test_create_update_delete_network_subnet[id-0e269138-0da6-4efc-a46d-578161e7b221,smoke]
diff --git a/dovetail/testcase/ipv6.tc003.yml b/dovetail/testcase/ipv6.tc003.yml
deleted file mode 100644
index 0866407e..00000000
--- a/dovetail/testcase/ipv6.tc003.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc003:
-  name: dovetail.ipv6.tc003
-  objective: VIM ipv6 operations, to check external network visibility
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_networks.NetworksIpV6Test.test_external_network_visibility[id-af774677-42a9-4e4b-bb58-16fe6a5bc1ec,smoke]
diff --git a/dovetail/testcase/ipv6.tc004.yml b/dovetail/testcase/ipv6.tc004.yml
deleted file mode 100644
index b165af07..00000000
--- a/dovetail/testcase/ipv6.tc004.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-dovetail.ipv6.tc004:
-  name: dovetail.ipv6.tc004
-  objective: VIM ipv6 operations, to list IPv6 networks and subnets of a tenant
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_networks.NetworksIpV6Test.test_list_networks[id-f7ffdeda-e200-4a7a-bcbe-05716e86bf43,smoke]
-      - tempest.api.network.test_networks.NetworksIpV6Test.test_list_subnets[id-db68ba48-f4ea-49e9-81d1-e367f6d0b20a,smoke]
diff --git a/dovetail/testcase/ipv6.tc005.yml b/dovetail/testcase/ipv6.tc005.yml
deleted file mode 100644
index 128a535a..00000000
--- a/dovetail/testcase/ipv6.tc005.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-dovetail.ipv6.tc005:
-  name: dovetail.ipv6.tc005
-  objective: VIM ipv6 operations, to show information of an IPv6 network and subnet
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_networks.NetworksIpV6Test.test_show_network[id-2bf13842-c93f-4a69-83ed-717d2ec3b44e,smoke]
-      - tempest.api.network.test_networks.NetworksIpV6Test.test_show_subnet[id-bd635d81-6030-4dd1-b3b9-31ba0cfdf6cc,smoke]
diff --git a/dovetail/testcase/ipv6.tc006.yml b/dovetail/testcase/ipv6.tc006.yml
deleted file mode 100644
index ed6f683a..00000000
--- a/dovetail/testcase/ipv6.tc006.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc006:
-  name: dovetail.ipv6.tc006
-  objective: VIM ipv6 operations, to create an IPv6 port in allowed allocation pools
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_port_in_allowed_allocation_pools[id-0435f278-40ae-48cb-a404-b8a087bc09b1,smoke]
diff --git a/dovetail/testcase/ipv6.tc007.yml b/dovetail/testcase/ipv6.tc007.yml
deleted file mode 100644
index 592a0fef..00000000
--- a/dovetail/testcase/ipv6.tc007.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc007:
-  name: dovetail.ipv6.tc007
-  objective: VIM ipv6 operations, to create an IPv6 port without security groups
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_port_with_no_securitygroups[id-4179dcb9-1382-4ced-84fe-1b91c54f5735,smoke]
diff --git a/dovetail/testcase/ipv6.tc008.yml b/dovetail/testcase/ipv6.tc008.yml
deleted file mode 100644
index 08583fdb..00000000
--- a/dovetail/testcase/ipv6.tc008.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc008:
-  name: dovetail.ipv6.tc008
-  objective: VIM ipv6 operations, to create/update/delete an IPv6 port
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_update_delete_port[id-c72c1c0c-2193-4aca-aaa4-b1442640f51c,smoke]
diff --git a/dovetail/testcase/ipv6.tc009.yml b/dovetail/testcase/ipv6.tc009.yml
deleted file mode 100644
index 74ab872f..00000000
--- a/dovetail/testcase/ipv6.tc009.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc009:
-  name: dovetail.ipv6.tc009
-  objective: VIM ipv6 operations, to list IPv6 ports of a tenant
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_ports.PortsIpV6TestJSON.test_list_ports[id-cf95b358-3e92-4a29-a148-52445e1ac50e,smoke]
diff --git a/dovetail/testcase/ipv6.tc010.yml b/dovetail/testcase/ipv6.tc010.yml
deleted file mode 100644
index 22d36caa..00000000
--- a/dovetail/testcase/ipv6.tc010.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc010:
-  name: dovetail.ipv6.tc010
-  objective: VIM ipv6 operations, to show information of an IPv6 port
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_ports.PortsIpV6TestJSON.test_show_port[id-c9a685bd-e83f-499c-939f-9f7863ca259f,smoke]
diff --git a/dovetail/testcase/ipv6.tc011.yml b/dovetail/testcase/ipv6.tc011.yml
deleted file mode 100644
index a5629071..00000000
--- a/dovetail/testcase/ipv6.tc011.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc011:
-  name: dovetail.ipv6.tc011
-  objective: VIM ipv6 operations, to add multiple interfaces for an IPv6 router
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_routers.RoutersIpV6Test.test_add_multiple_router_interfaces[id-802c73c9-c937-4cef-824b-2191e24a6aab,smoke]
diff --git a/dovetail/testcase/ipv6.tc012.yml b/dovetail/testcase/ipv6.tc012.yml
deleted file mode 100644
index 5384acc9..00000000
--- a/dovetail/testcase/ipv6.tc012.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc012:
-  name: dovetail.ipv6.tc012
-  objective: VIM ipv6 operations, to add and remove an IPv6 router interface with port_id
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_routers.RoutersIpV6Test.test_add_remove_router_interface_with_port_id[id-2b7d2f37-6748-4d78-92e5-1d590234f0d5,smoke]
diff --git a/dovetail/testcase/ipv6.tc013.yml b/dovetail/testcase/ipv6.tc013.yml
deleted file mode 100644
index 1b99e9ba..00000000
--- a/dovetail/testcase/ipv6.tc013.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc013:
-  name: dovetail.ipv6.tc013
-  objective: VIM ipv6 operations, to add and remove an IPv6 router interface with subnet_id
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_routers.RoutersIpV6Test.test_add_remove_router_interface_with_subnet_id[id-b42e6e39-2e37-49cc-a6f4-8467e940900a,smoke]
diff --git a/dovetail/testcase/ipv6.tc014.yml b/dovetail/testcase/ipv6.tc014.yml
deleted file mode 100644
index fc58fa86..00000000
--- a/dovetail/testcase/ipv6.tc014.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc014:
-  name: dovetail.ipv6.tc014
-  objective: VIM ipv6 operations, to create, update, delete, list and show an IPv6 router
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_routers.RoutersIpV6Test.test_create_show_list_update_delete_router[id-f64403e2-8483-4b34-8ccd-b09a87bcc68c,smoke]
diff --git a/dovetail/testcase/ipv6.tc015.yml b/dovetail/testcase/ipv6.tc015.yml
deleted file mode 100644
index 5218ff9b..00000000
--- a/dovetail/testcase/ipv6.tc015.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc015:
-  name: dovetail.ipv6.tc015
-  objective: VIM ipv6 operations, to create, update, delete, list and show an IPv6 security group
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_security_groups.SecGroupIPv6Test.test_create_list_update_show_delete_security_group[id-bfd128e5-3c92-44b6-9d66-7fe29d22c802,smoke]
diff --git a/dovetail/testcase/ipv6.tc016.yml b/dovetail/testcase/ipv6.tc016.yml
deleted file mode 100644
index e8949a0c..00000000
--- a/dovetail/testcase/ipv6.tc016.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc016:
-  name: dovetail.ipv6.tc016
-  objective: VIM ipv6 operations, to create, delete and show security group rules
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_security_groups.SecGroupIPv6Test.test_create_show_delete_security_group_rule[id-cfb99e0e-7410-4a3d-8a0c-959a63ee77e9,smoke]
diff --git a/dovetail/testcase/ipv6.tc017.yml b/dovetail/testcase/ipv6.tc017.yml
deleted file mode 100644
index 8cff0c37..00000000
--- a/dovetail/testcase/ipv6.tc017.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc017:
-  name: dovetail.ipv6.tc017
-  objective: VIM ipv6 operations, to list all security groups
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.network.test_security_groups.SecGroupIPv6Test.test_list_security_groups[id-e30abd17-fef9-4739-8617-dc26da88e686,smoke]
diff --git a/dovetail/testcase/ipv6.tc018.yml b/dovetail/testcase/ipv6.tc018.yml
deleted file mode 100644
index ff7d56be..00000000
--- a/dovetail/testcase/ipv6.tc018.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc018:
-  name: dovetail.ipv6.tc018
-  objective: VIM ipv6 operations, to show information of an IPv6 port, scenario os-nosdn-nofeature dependent
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.scenario.test_network_v6.TestGettingAddress.test_dhcp6_stateless_from_os[compute,id-d7e1f858-187c-45a6-89c9-bdafde619a9f,network,slow]
diff --git a/dovetail/testcase/ipv6.tc019.yml b/dovetail/testcase/ipv6.tc019.yml
deleted file mode 100644
index 4debe2d7..00000000
--- a/dovetail/testcase/ipv6.tc019.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc019:
-  name: dovetail.ipv6.tc019
-  objective: VIM ipv6 operations, to do IPv6 address assignment - dual stack, DHCPv6 stateless, scenario os-nosdn-nofeature dependent
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_dhcp6_stateless_from_os[compute,id-76f26acd-9688-42b4-bc3e-cd134c4cb09e,network,slow]
diff --git a/dovetail/testcase/ipv6.tc020.yml b/dovetail/testcase/ipv6.tc020.yml
deleted file mode 100644
index 351b400d..00000000
--- a/dovetail/testcase/ipv6.tc020.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc020:
-  name: dovetail.ipv6.tc020
-  objective: VIM ipv6 operations, to do IPv6 Address Assignment - Multiple Prefixes, DHCPv6 Stateless, scenario os-nosdn-nofeature dependent
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.scenario.test_network_v6.TestGettingAddress.test_multi_prefix_dhcpv6_stateless[compute,id-7ab23f41-833b-4a16-a7c9-5b42fe6d4123,network,slow]
diff --git a/dovetail/testcase/ipv6.tc021.yml b/dovetail/testcase/ipv6.tc021.yml
deleted file mode 100644
index b25cc68c..00000000
--- a/dovetail/testcase/ipv6.tc021.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc021:
-  name: dovetail.ipv6.tc021
-  objective: VIM ipv6 operations, to do IPv6 Address Assignment - Dual Stack, Multiple Prefixes, DHCPv6 Stateless, scenario os-nosdn-nofeature dependent
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_multi_prefix_dhcpv6_stateless[compute,id-cf1c4425-766b-45b8-be35-e2959728eb00,network]
diff --git a/dovetail/testcase/ipv6.tc022.yml b/dovetail/testcase/ipv6.tc022.yml
deleted file mode 100644
index 08936404..00000000
--- a/dovetail/testcase/ipv6.tc022.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc022:
-  name: dovetail.ipv6.tc022
-  objective: VIM ipv6 operations, to do IPv6 Address Assignment - SLAAC, scenario os-nosdn-nofeature dependent
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.scenario.test_network_v6.TestGettingAddress.test_slaac_from_os[compute,id-2c92df61-29f0-4eaa-bee3-7c65bef62a43,network,slow]
diff --git a/dovetail/testcase/ipv6.tc023.yml b/dovetail/testcase/ipv6.tc023.yml
deleted file mode 100644
index a7f2e9f8..00000000
--- a/dovetail/testcase/ipv6.tc023.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc023:
-  name: dovetail.ipv6.tc023
-  objective: VIM ipv6 operations, to do IPv6 Address Assignment - Dual Stack, SLAAC, scenario os-nosdn-nofeature dependent
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_slaac_from_os[compute,id-b6399d76-4438-4658-bcf5-0d6c8584fde2,network,slow]
diff --git a/dovetail/testcase/ipv6.tc024.yml b/dovetail/testcase/ipv6.tc024.yml
deleted file mode 100644
index 00ce3084..00000000
--- a/dovetail/testcase/ipv6.tc024.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc024:
-  name: dovetail.ipv6.tc024
-  objective: VIM ipv6 operations, to do IPv6 address assignment - multiple prefixes, SLAAC, scenario os-nosdn-nofeature dependent
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.scenario.test_network_v6.TestGettingAddress.test_multi_prefix_slaac[compute,id-dec222b1-180c-4098-b8c5-cc1b8342d611,network,slow]
diff --git a/dovetail/testcase/ipv6.tc025.yml b/dovetail/testcase/ipv6.tc025.yml
deleted file mode 100644
index 4828abd4..00000000
--- a/dovetail/testcase/ipv6.tc025.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.ipv6.tc025:
-  name: dovetail.ipv6.tc025
-  objective: VIM ipv6 operations, to do IPv6 address assignment - dual stack, multiple prefixes, SLAAC, scenario os-nosdn-nofeature dependent
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_multi_prefix_slaac[compute,id-9178ad42-10e4-47e9-8987-e02b170cc5cd,network]
diff --git a/dovetail/testcase/osinterop.tc001.yml b/dovetail/testcase/osinterop.tc001.yml
deleted file mode 100644
index 865ee2a1..00000000
--- a/dovetail/testcase/osinterop.tc001.yml
+++ /dev/null
@@ -1,232 +0,0 @@
----
-dovetail.osinterop.tc001:
-  name: dovetail.osinterop.tc001
-  objective: > # Set of OpenStack interoperability test cases not flagged and required. It only contains OpenStack core (no object storage)
-    # The approved guidelines (2016.08) are valid for Kilo, Liberty, Mitaka and Newton releases of OpenStack
-    # The list can be generated using the Rest API from RefStack project:
-    # https://refstack.openstack.org/api/v1/guidelines/2016.08/tests?target=compute&type=required&alias=true&flag=false
-  validate:
-    type: functest
-    testcase: refstack_defcore
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-    pre_copy:
-      src_file: osinterop.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/refstack_client/defcore.txt
-    cmds:
-      - 'functest env prepare'
-      - 'functest testcase run refstack_defcore -r'
-    post_condition:
-      - 'echo test for postcondition in testcase'
-  report:
-    sub_testcase_list:
-      # VIM compute operations test cases
-      - tempest.api.compute.images.test_images_oneserver.ImagesOneServerTestJSON.test_create_delete_image
-      - tempest.api.compute.images.test_images_oneserver.ImagesOneServerTestJSON.test_create_image_specify_multibyte_character_image_name
-      - tempest.api.compute.servers.test_create_server.ServersTestJSON.test_host_name_is_same_as_server_name
-      - 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_created_server_vcpus
-      - tempest.api.compute.servers.test_create_server.ServersTestJSON.test_verify_server_details
-      - tempest.api.compute.servers.test_create_server.ServersTestManualDisk.test_host_name_is_same_as_server_name
-      - 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_created_server_vcpus
-      - tempest.api.compute.servers.test_create_server.ServersTestManualDisk.test_verify_server_details
-      - tempest.api.compute.servers.test_instance_actions.InstanceActionsTestJSON.test_get_instance_action
-      - tempest.api.compute.servers.test_instance_actions.InstanceActionsTestJSON.test_list_instance_actions
-      - tempest.api.compute.servers.test_list_server_filters.ListServerFiltersTestJSON.test_list_servers_detailed_filter_by_flavor
-      - tempest.api.compute.servers.test_list_server_filters.ListServerFiltersTestJSON.test_list_servers_detailed_filter_by_image
-      - tempest.api.compute.servers.test_list_server_filters.ListServerFiltersTestJSON.test_list_servers_detailed_filter_by_server_name
-      - tempest.api.compute.servers.test_list_server_filters.ListServerFiltersTestJSON.test_list_servers_detailed_filter_by_server_status
-      - tempest.api.compute.servers.test_list_server_filters.ListServerFiltersTestJSON.test_list_servers_detailed_limit_results
-      - tempest.api.compute.servers.test_list_server_filters.ListServerFiltersTestJSON.test_list_servers_filter_by_active_status
-      - tempest.api.compute.servers.test_list_server_filters.ListServerFiltersTestJSON.test_list_servers_filter_by_flavor
-      - tempest.api.compute.servers.test_list_server_filters.ListServerFiltersTestJSON.test_list_servers_filter_by_image
-      - tempest.api.compute.servers.test_list_server_filters.ListServerFiltersTestJSON.test_list_servers_filter_by_limit
-      - tempest.api.compute.servers.test_list_server_filters.ListServerFiltersTestJSON.test_list_servers_filter_by_server_name
-      - tempest.api.compute.servers.test_list_server_filters.ListServerFiltersTestJSON.test_list_servers_filtered_by_name_wildcard
-      - tempest.api.compute.servers.test_list_servers_negative.ListServersNegativeTestJSON.test_list_servers_by_changes_since_future_date
-      - tempest.api.compute.servers.test_list_servers_negative.ListServersNegativeTestJSON.test_list_servers_by_changes_since_invalid_date
-      - tempest.api.compute.servers.test_list_servers_negative.ListServersNegativeTestJSON.test_list_servers_by_limits
-      - tempest.api.compute.servers.test_list_servers_negative.ListServersNegativeTestJSON.test_list_servers_by_limits_greater_than_actual_count
-      - tempest.api.compute.servers.test_list_servers_negative.ListServersNegativeTestJSON.test_list_servers_by_limits_pass_negative_value
-      - tempest.api.compute.servers.test_list_servers_negative.ListServersNegativeTestJSON.test_list_servers_by_limits_pass_string
-      - tempest.api.compute.servers.test_list_servers_negative.ListServersNegativeTestJSON.test_list_servers_by_non_existing_flavor
-      - tempest.api.compute.servers.test_list_servers_negative.ListServersNegativeTestJSON.test_list_servers_by_non_existing_image
-      - tempest.api.compute.servers.test_list_servers_negative.ListServersNegativeTestJSON.test_list_servers_by_non_existing_server_name
-      - tempest.api.compute.servers.test_list_servers_negative.ListServersNegativeTestJSON.test_list_servers_detail_server_is_deleted
-      - tempest.api.compute.servers.test_list_servers_negative.ListServersNegativeTestJSON.test_list_servers_status_non_existing
-      - tempest.api.compute.servers.test_list_servers_negative.ListServersNegativeTestJSON.test_list_servers_with_a_deleted_server
-      - tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_lock_unlock_server
-      - tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_reboot_server_hard
-      - tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_rebuild_server
-      - tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_stop_start_server
-      - tempest.api.compute.servers.test_server_metadata.ServerMetadataTestJSON.test_delete_server_metadata_item
-      - tempest.api.compute.servers.test_server_metadata.ServerMetadataTestJSON.test_get_server_metadata_item
-      - tempest.api.compute.servers.test_server_metadata.ServerMetadataTestJSON.test_list_server_metadata
-      - tempest.api.compute.servers.test_server_metadata.ServerMetadataTestJSON.test_set_server_metadata
-      - tempest.api.compute.servers.test_server_metadata.ServerMetadataTestJSON.test_set_server_metadata_item
-      - tempest.api.compute.servers.test_server_metadata.ServerMetadataTestJSON.test_update_server_metadata
-      - tempest.api.compute.servers.test_servers.ServersTestJSON.test_create_server_with_admin_password
-      - tempest.api.compute.servers.test_servers.ServersTestJSON.test_create_specify_keypair
-      - tempest.api.compute.servers.test_servers.ServersTestJSON.test_create_with_existing_server_name
-      - tempest.api.compute.servers.test_servers.ServersTestJSON.test_update_access_server_address
-      - tempest.api.compute.servers.test_servers.ServersTestJSON.test_update_server_name
-      - tempest.api.compute.servers.test_servers_negative.ServersNegativeTestJSON.test_create_numeric_server_name
-      - tempest.api.compute.servers.test_servers_negative.ServersNegativeTestJSON.test_create_server_metadata_exceeds_length_limit
-      - tempest.api.compute.servers.test_servers_negative.ServersNegativeTestJSON.test_create_server_name_length_exceeds_256
-      - tempest.api.compute.servers.test_servers_negative.ServersNegativeTestJSON.test_create_with_invalid_flavor
-      - tempest.api.compute.servers.test_servers_negative.ServersNegativeTestJSON.test_create_with_invalid_image
-      - tempest.api.compute.servers.test_servers_negative.ServersNegativeTestJSON.test_create_with_invalid_network_uuid
-      - tempest.api.compute.servers.test_servers_negative.ServersNegativeTestJSON.test_delete_server_pass_id_exceeding_length_limit
-      - tempest.api.compute.servers.test_servers_negative.ServersNegativeTestJSON.test_delete_server_pass_negative_id
-      - tempest.api.compute.servers.test_servers_negative.ServersNegativeTestJSON.test_get_non_existent_server
-      - tempest.api.compute.servers.test_servers_negative.ServersNegativeTestJSON.test_invalid_ip_v6_address
-      - tempest.api.compute.servers.test_servers_negative.ServersNegativeTestJSON.test_reboot_non_existent_server
-      - tempest.api.compute.servers.test_servers_negative.ServersNegativeTestJSON.test_rebuild_deleted_server
-      - tempest.api.compute.servers.test_servers_negative.ServersNegativeTestJSON.test_rebuild_non_existent_server
-      - tempest.api.compute.servers.test_servers_negative.ServersNegativeTestJSON.test_server_name_blank
-      - tempest.api.compute.servers.test_servers_negative.ServersNegativeTestJSON.test_stop_non_existent_server
-      - tempest.api.compute.servers.test_servers_negative.ServersNegativeTestJSON.test_update_name_of_non_existent_server
-      - tempest.api.compute.servers.test_servers_negative.ServersNegativeTestJSON.test_update_server_name_length_exceeds_256
-      - tempest.api.compute.servers.test_servers_negative.ServersNegativeTestJSON.test_update_server_set_empty_name
-      - tempest.api.compute.test_quotas.QuotasTestJSON.test_get_default_quotas
-      - tempest.api.compute.test_quotas.QuotasTestJSON.test_get_quotas
-      - tempest.api.compute.test_versions.TestVersions.test_list_api_versions
-      - tempest.api.compute.volumes.test_attach_volume.AttachVolumeTestJSON.test_attach_detach_volume
-      - tempest.api.compute.volumes.test_attach_volume.AttachVolumeTestJSON.test_list_get_volume_attachments
-      # VIM identity operations test cases
-      - tempest.api.identity.v3.test_api_discovery.TestApiDiscovery.test_api_media_types
-      - tempest.api.identity.v3.test_api_discovery.TestApiDiscovery.test_api_version_resources
-      - tempest.api.identity.v3.test_api_discovery.TestApiDiscovery.test_api_version_statuses
-      - tempest.api.identity.v3.test_tokens.TokensV3Test.test_create_token
-      # VIM image operations test cases
-      - tempest.api.image.v2.test_images.BasicOperationsImagesTest.test_delete_image
-      - tempest.api.image.v2.test_images.BasicOperationsImagesTest.test_update_image
-      - tempest.api.image.v2.test_images.ListUserImagesTest.test_get_image_schema
-      - tempest.api.image.v2.test_images.ListUserImagesTest.test_get_images_schema
-      - tempest.api.image.v2.test_images.ListUserImagesTest.test_list_images_param_container_format
-      - tempest.api.image.v2.test_images.ListUserImagesTest.test_list_images_param_disk_format
-      - tempest.api.image.v2.test_images.ListUserImagesTest.test_list_images_param_limit
-      - tempest.api.image.v2.test_images.ListUserImagesTest.test_list_images_param_min_max_size
-      - tempest.api.image.v2.test_images.ListUserImagesTest.test_list_images_param_size
-      - tempest.api.image.v2.test_images.ListUserImagesTest.test_list_images_param_status
-      - tempest.api.image.v2.test_images.ListUserImagesTest.test_list_images_param_visibility
-      - tempest.api.image.v2.test_images.ListUserImagesTest.test_list_no_params
-      - tempest.api.image.v2.test_images_negative.ImagesNegativeTest.test_delete_image_null_id
-      - tempest.api.image.v2.test_images_negative.ImagesNegativeTest.test_delete_non_existing_image
-      - tempest.api.image.v2.test_images_negative.ImagesNegativeTest.test_get_delete_deleted_image
-      - tempest.api.image.v2.test_images_negative.ImagesNegativeTest.test_get_image_null_id
-      - tempest.api.image.v2.test_images_negative.ImagesNegativeTest.test_get_non_existent_image
-      - tempest.api.image.v2.test_images_tags.ImagesTagsTest.test_update_delete_tags_for_image
-      - tempest.api.image.v2.test_images_tags_negative.ImagesTagsNegativeTest.test_delete_non_existing_tag
-      - tempest.api.image.v2.test_images_tags_negative.ImagesTagsNegativeTest.test_update_tags_for_non_existing_image
-      # VIM network operations test cases
-      - tempest.api.network.test_networks.NetworksTest.test_create_delete_subnet_all_attributes
-      - tempest.api.network.test_networks.NetworksTest.test_create_delete_subnet_with_allocation_pools
-      - tempest.api.network.test_networks.NetworksTest.test_create_delete_subnet_with_dhcp_enabled
-      - tempest.api.network.test_networks.NetworksTest.test_create_delete_subnet_with_gw
-      - tempest.api.network.test_networks.NetworksTest.test_create_delete_subnet_with_gw_and_allocation_pools
-      - tempest.api.network.test_networks.NetworksTest.test_create_delete_subnet_with_host_routes_and_dns_nameservers
-      - tempest.api.network.test_networks.NetworksTest.test_create_delete_subnet_without_gateway
-      - tempest.api.network.test_networks.NetworksTest.test_create_update_delete_network_subnet
-      - tempest.api.network.test_networks.NetworksTest.test_delete_network_with_subnet
-      - tempest.api.network.test_networks.NetworksTest.test_list_networks
-      - tempest.api.network.test_networks.NetworksTest.test_list_networks_fields
-      - tempest.api.network.test_networks.NetworksTest.test_list_subnets
-      - tempest.api.network.test_networks.NetworksTest.test_list_subnets_fields
-      - tempest.api.network.test_networks.NetworksTest.test_show_network
-      - tempest.api.network.test_networks.NetworksTest.test_show_network_fields
-      - tempest.api.network.test_networks.NetworksTest.test_show_subnet
-      - tempest.api.network.test_networks.NetworksTest.test_show_subnet_fields
-      - tempest.api.network.test_networks.NetworksTest.test_update_subnet_gw_dns_host_routes_dhcp
-      - tempest.api.network.test_ports.PortsTestJSON.test_create_bulk_port
-      - tempest.api.network.test_ports.PortsTestJSON.test_create_port_in_allowed_allocation_pools
-      - 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_list_ports_fields
-      - tempest.api.network.test_ports.PortsTestJSON.test_show_port
-      - tempest.api.network.test_ports.PortsTestJSON.test_show_port_fields
-      - tempest.api.network.test_ports.PortsTestJSON.test_update_port_with_security_group_and_extra_attributes
-      - tempest.api.network.test_ports.PortsTestJSON.test_update_port_with_two_security_groups_and_extra_attributes
-      - tempest.api.network.test_security_groups.SecGroupTest.test_create_list_update_show_delete_security_group
-      - tempest.api.network.test_security_groups.SecGroupTest.test_create_security_group_rule_with_additional_args
-      - tempest.api.network.test_security_groups.SecGroupTest.test_create_security_group_rule_with_icmp_type_code
-      - tempest.api.network.test_security_groups.SecGroupTest.test_create_security_group_rule_with_protocol_integer_value
-      - tempest.api.network.test_security_groups.SecGroupTest.test_create_security_group_rule_with_remote_group_id
-      - tempest.api.network.test_security_groups.SecGroupTest.test_create_security_group_rule_with_remote_ip_prefix
-      - 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.network.test_security_groups_negative.NegativeSecGroupTest.test_create_additional_default_security_group_fails
-      - tempest.api.network.test_security_groups_negative.NegativeSecGroupTest.test_create_duplicate_security_group_rule_fails
-      - tempest.api.network.test_security_groups_negative.NegativeSecGroupTest.test_create_security_group_rule_with_bad_ethertype
-      - tempest.api.network.test_security_groups_negative.NegativeSecGroupTest.test_create_security_group_rule_with_bad_protocol
-      - tempest.api.network.test_security_groups_negative.NegativeSecGroupTest.test_create_security_group_rule_with_bad_remote_ip_prefix
-      - tempest.api.network.test_security_groups_negative.NegativeSecGroupTest.test_create_security_group_rule_with_invalid_ports
-      - tempest.api.network.test_security_groups_negative.NegativeSecGroupTest.test_create_security_group_rule_with_non_existent_remote_groupid
-      - tempest.api.network.test_security_groups_negative.NegativeSecGroupTest.test_create_security_group_rule_with_non_existent_security_group
-      - tempest.api.network.test_security_groups_negative.NegativeSecGroupTest.test_delete_non_existent_security_group
-      - tempest.api.network.test_security_groups_negative.NegativeSecGroupTest.test_show_non_existent_security_group
-      - tempest.api.network.test_security_groups_negative.NegativeSecGroupTest.test_show_non_existent_security_group_rule
-      # VIM volume operations test cases
-      - tempest.api.volume.test_availability_zone.AvailabilityZoneV2TestJSON.test_get_availability_zone_list
-      - tempest.api.volume.test_extensions.ExtensionsV2TestJSON.test_list_extensions
-      - tempest.api.volume.test_snapshot_metadata.SnapshotV2MetadataTestJSON.test_crud_snapshot_metadata
-      - tempest.api.volume.test_snapshot_metadata.SnapshotV2MetadataTestJSON.test_update_snapshot_metadata_item
-      - tempest.api.volume.test_volume_metadata.VolumesV2MetadataTest.test_crud_volume_metadata
-      - tempest.api.volume.test_volume_metadata.VolumesV2MetadataTest.test_update_volume_metadata_item
-      - tempest.api.volume.test_volumes_actions.VolumesV2ActionsTest.test_attach_detach_volume_to_instance
-      - tempest.api.volume.test_volumes_actions.VolumesV2ActionsTest.test_get_volume_attachment
-      - tempest.api.volume.test_volumes_actions.VolumesV2ActionsTest.test_reserve_unreserve_volume
-      - tempest.api.volume.test_volumes_actions.VolumesV2ActionsTest.test_volume_bootable
-      - tempest.api.volume.test_volumes_actions.VolumesV2ActionsTest.test_volume_readonly_update
-      - 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_as_clone
-      - tempest.api.volume.test_volumes_get.VolumesV2GetTest.test_volume_create_get_update_delete_from_image
-      - tempest.api.volume.test_volumes_list.VolumesV2ListTestJSON.test_volume_list
-      - tempest.api.volume.test_volumes_list.VolumesV2ListTestJSON.test_volume_list_by_name
-      - tempest.api.volume.test_volumes_list.VolumesV2ListTestJSON.test_volume_list_details_by_name
-      - tempest.api.volume.test_volumes_list.VolumesV2ListTestJSON.test_volume_list_param_display_name_and_status
-      - tempest.api.volume.test_volumes_list.VolumesV2ListTestJSON.test_volume_list_with_detail_param_display_name_and_status
-      - tempest.api.volume.test_volumes_list.VolumesV2ListTestJSON.test_volume_list_with_detail_param_metadata
-      - tempest.api.volume.test_volumes_list.VolumesV2ListTestJSON.test_volume_list_with_details
-      - tempest.api.volume.test_volumes_list.VolumesV2ListTestJSON.test_volume_list_with_param_metadata
-      - tempest.api.volume.test_volumes_list.VolumesV2ListTestJSON.test_volumes_list_by_availability_zone
-      - tempest.api.volume.test_volumes_list.VolumesV2ListTestJSON.test_volumes_list_by_status
-      - tempest.api.volume.test_volumes_list.VolumesV2ListTestJSON.test_volumes_list_details_by_availability_zone
-      - tempest.api.volume.test_volumes_list.VolumesV2ListTestJSON.test_volumes_list_details_by_status
-      - tempest.api.volume.test_volumes_negative.VolumesV2NegativeTest.test_attach_volumes_with_nonexistent_volume_id
-      - tempest.api.volume.test_volumes_negative.VolumesV2NegativeTest.test_create_volume_with_invalid_size
-      - tempest.api.volume.test_volumes_negative.VolumesV2NegativeTest.test_create_volume_with_nonexistent_snapshot_id
-      - tempest.api.volume.test_volumes_negative.VolumesV2NegativeTest.test_create_volume_with_nonexistent_source_volid
-      - tempest.api.volume.test_volumes_negative.VolumesV2NegativeTest.test_create_volume_with_nonexistent_volume_type
-      - tempest.api.volume.test_volumes_negative.VolumesV2NegativeTest.test_create_volume_with_size_negative
-      - tempest.api.volume.test_volumes_negative.VolumesV2NegativeTest.test_create_volume_with_size_zero
-      - tempest.api.volume.test_volumes_negative.VolumesV2NegativeTest.test_create_volume_without_passing_size
-      - tempest.api.volume.test_volumes_negative.VolumesV2NegativeTest.test_delete_invalid_volume_id
-      - tempest.api.volume.test_volumes_negative.VolumesV2NegativeTest.test_delete_volume_without_passing_volume_id
-      - tempest.api.volume.test_volumes_negative.VolumesV2NegativeTest.test_detach_volumes_with_invalid_volume_id
-      - tempest.api.volume.test_volumes_negative.VolumesV2NegativeTest.test_get_invalid_volume_id
-      - tempest.api.volume.test_volumes_negative.VolumesV2NegativeTest.test_get_volume_without_passing_volume_id
-      - tempest.api.volume.test_volumes_negative.VolumesV2NegativeTest.test_list_volumes_detail_with_invalid_status
-      - tempest.api.volume.test_volumes_negative.VolumesV2NegativeTest.test_list_volumes_detail_with_nonexistent_name
-      - tempest.api.volume.test_volumes_negative.VolumesV2NegativeTest.test_list_volumes_with_invalid_status
-      - tempest.api.volume.test_volumes_negative.VolumesV2NegativeTest.test_list_volumes_with_nonexistent_name
-      - tempest.api.volume.test_volumes_negative.VolumesV2NegativeTest.test_reserve_volume_with_negative_volume_status
-      - tempest.api.volume.test_volumes_negative.VolumesV2NegativeTest.test_reserve_volume_with_nonexistent_volume_id
-      - tempest.api.volume.test_volumes_negative.VolumesV2NegativeTest.test_unreserve_volume_with_nonexistent_volume_id
-      - tempest.api.volume.test_volumes_negative.VolumesV2NegativeTest.test_update_volume_with_empty_volume_id
-      - tempest.api.volume.test_volumes_negative.VolumesV2NegativeTest.test_update_volume_with_invalid_volume_id
-      - tempest.api.volume.test_volumes_negative.VolumesV2NegativeTest.test_update_volume_with_nonexistent_volume_id
-      - tempest.api.volume.test_volumes_negative.VolumesV2NegativeTest.test_volume_delete_nonexistent_volume_id
-      - tempest.api.volume.test_volumes_negative.VolumesV2NegativeTest.test_volume_get_nonexistent_volume_id
-      - tempest.api.volume.test_volumes_snapshots.VolumesV2SnapshotTestJSON.test_snapshot_create_get_list_update_delete
-      - tempest.api.volume.test_volumes_snapshots.VolumesV2SnapshotTestJSON.test_volume_from_snapshot
-      - tempest.api.volume.test_volumes_snapshots_list.VolumesV2SnapshotListTestJSON.test_snapshots_list_details_with_params
-      - tempest.api.volume.test_volumes_snapshots_list.VolumesV2SnapshotListTestJSON.test_snapshots_list_with_params
-      - tempest.api.volume.test_volumes_snapshots_negative.VolumesV2SnapshotNegativeTestJSON.test_create_snapshot_with_nonexistent_volume_id
-      - tempest.api.volume.test_volumes_snapshots_negative.VolumesV2SnapshotNegativeTestJSON.test_create_snapshot_without_passing_volume_id
-      - tempest.api.volume.v2.test_volumes_list.VolumesV2ListTestJSON.test_volume_list_details_pagination
-      - tempest.api.volume.v2.test_volumes_list.VolumesV2ListTestJSON.test_volume_list_details_with_multiple_params
-      - tempest.api.volume.v2.test_volumes_list.VolumesV2ListTestJSON.test_volume_list_pagination
diff --git a/dovetail/testcase/osinterop.tc002.yml b/dovetail/testcase/osinterop.tc002.yml
deleted file mode 100644
index 42346a53..00000000
--- a/dovetail/testcase/osinterop.tc002.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-dovetail.osinterop.tc002:
-  name: dovetail.osinterop.tc002
-  objective: > # Set of OpenStack interoperability test cases not flagged and required. It only contains OpenStack core (no object storage)
-    # The approved guidelines (2016.08) are valid for Kilo, Liberty, Mitaka and Newton releases of OpenStack
-    # The list can be generated using the Rest API from RefStack project:
-    # https://refstack.openstack.org/api/v1/guidelines/2016.08/tests?target=compute&type=required&alias=true&flag=false
-  validate:
-    type: functest
-    testcase: refstack_defcore
-    pre_condition:
-      - 'echo test for precondition in testcase'
-    cmds:
-      - 'cd /home/opnfv/repos/refstack-client; source .venv/bin/activate; ./refstack-client test -c /home/opnfv/userconfig/refstack_tempest.conf  -v --test-list /home/opnfv/userconfig/osinterop.txt'
-    post_condition:
-      - 'echo test for postcondition in testcase'
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/sdnvpn.tc000.yml b/dovetail/testcase/sdnvpn.tc000.yml
deleted file mode 100644
index 6294e1e4..00000000
--- a/dovetail/testcase/sdnvpn.tc000.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-dovetail.sdnvpn.tc000:
-  name: dovetail.sdnvpn.tc000
-  objective: validate BGPVPN API CRUD operations by means of Tempest tests from networking-bgpvpn repository
-  validate:
-    type: functest
-    testcase: bgpvpn
-    pre_condition:
-       - "sed -i 's/networking_bgpvpn_tempest/networking_bgpvpn_tempest-r networking_bgpvpn_tempest.tests.api.test_bgpvpn.BgpvpnTest*/' /usr/lib/python2.7/site-packages/sdnvpn/test/functest/tempest.py"
-    pre_copy:
-      exist_src_file: sdnvpn_config_tc000.yaml
-      dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/sdnvpn.tc001.yml b/dovetail/testcase/sdnvpn.tc001.yml
deleted file mode 100644
index 698b0d2e..00000000
--- a/dovetail/testcase/sdnvpn.tc001.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-dovetail.sdnvpn.tc001:
-  name: dovetail.sdnvpn.tc001
-  objective: Connectivity between Neutron subnets through association of Neutron Networks to VPNs
-  validate:
-    type: functest
-    testcase: bgpvpn
-    pre_copy:
-      exist_src_file: sdnvpn_config_testcase1.yaml
-      dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/sdnvpn.tc002.yml b/dovetail/testcase/sdnvpn.tc002.yml
deleted file mode 100644
index 4823ee55..00000000
--- a/dovetail/testcase/sdnvpn.tc002.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-dovetail.sdnvpn.tc002:
-  name: dovetail.sdnvpn.tc002
-  objective: Separation of tenant networks through association to different VPNs
-  validate:
-    type: functest
-    testcase: bgpvpn
-    pre_copy:
-      exist_src_file: sdnvpn_config_testcase2.yaml
-      dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/sdnvpn.tc003.yml b/dovetail/testcase/sdnvpn.tc003.yml
deleted file mode 100644
index fbf13ca3..00000000
--- a/dovetail/testcase/sdnvpn.tc003.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-dovetail.sdnvpn.tc003:
-  name: dovetail.sdnvpn.tc003
-  objective: Data center gateway integration through BGP peering
-  validate:
-    type: functest
-    testcase: bgpvpn
-    pre_copy:
-      exist_src_file: sdnvpn_config_testcase3.yaml
-      dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/sdnvpn.tc004.yml b/dovetail/testcase/sdnvpn.tc004.yml
deleted file mode 100644
index 5f44f12d..00000000
--- a/dovetail/testcase/sdnvpn.tc004.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-dovetail.sdnvpn.tc004:
-  name: dovetail.sdnvpn.tc004
-  objective: VPN provides connectivity between subnets using association of Neutron Router to VPNs
-  validate:
-    type: functest
-    testcase: bgpvpn
-    pre_copy:
-      exist_src_file: sdnvpn_config_testcase4.yaml
-      dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/sdnvpn.tc008.yml b/dovetail/testcase/sdnvpn.tc008.yml
deleted file mode 100644
index d818bf10..00000000
--- a/dovetail/testcase/sdnvpn.tc008.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-dovetail.sdnvpn.tc008:
-  name: dovetail.sdnvpn.tc008
-  objective: associate Neutron Router with an attached subnet to a VPN and verify reachability of the Floating IP
-  validate:
-    type: functest
-    testcase: bgpvpn
-    pre_copy:
-      exist_src_file: sdnvpn_config_testcase8.yaml
-      dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/smoke.tc001.yml b/dovetail/testcase/smoke.tc001.yml
deleted file mode 100644
index 6d8d6924..00000000
--- a/dovetail/testcase/smoke.tc001.yml
+++ /dev/null
@@ -1,134 +0,0 @@
----
-dovetail.smoke.tc001:
-  name: dovetail.smoke.tc001
-  objective: tempest smoke test cases
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.api.compute.flavors.test_flavors.FlavorsV2TestJSON.test_get_flavor[id-1f12046b-753d-40d2-abb6-d8eb8b30cb2f,smoke]
-      - tempest.api.compute.flavors.test_flavors.FlavorsV2TestJSON.test_list_flavors[id-e36c0eaa-dff5-4082-ad1f-3f9a80aa3f59,smoke]
-      - tempest.api.compute.security_groups.test_security_group_rules.SecurityGroupRulesTestJSON.test_security_group_rules_create[id-850795d7-d4d3-4e55-b527-a774c0123d3a,network,smoke]
-      - tempest.api.compute.security_groups.test_security_group_rules.SecurityGroupRulesTestJSON.test_security_group_rules_list[id-a6154130-5a55-4850-8be4-5e9e796dbf17,network,smoke]
-      - tempest.api.compute.security_groups.test_security_groups.SecurityGroupsTestJSON.test_security_groups_create_list_delete[id-eb2b087d-633d-4d0d-a7bd-9e6ba35b32de,network,smoke]
-      - tempest.api.compute.servers.test_attach_interfaces.AttachInterfacesTestJSON.test_add_remove_fixed_ip[id-c7e0e60b-ee45-43d0-abeb-8596fd42a2f9,network,smoke]
-      - tempest.api.compute.servers.test_create_server.ServersTestJSON.test_list_servers[id-9a438d88-10c6-4bcd-8b5b-5b6e25e1346f,smoke]
-      - tempest.api.compute.servers.test_create_server.ServersTestJSON.test_verify_server_details[id-5de47127-9977-400a-936f-abcfbec1218f,smoke]
-      - tempest.api.compute.servers.test_create_server.ServersTestManualDisk.test_list_servers[id-9a438d88-10c6-4bcd-8b5b-5b6e25e1346f,smoke]
-      - tempest.api.compute.servers.test_create_server.ServersTestManualDisk.test_verify_server_details[id-5de47127-9977-400a-936f-abcfbec1218f,smoke]
-      - tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_reboot_server_hard[id-2cb1baf6-ac8d-4429-bf0d-ba8a0ba53e32,smoke]
-      - tempest.api.compute.servers.test_server_addresses.ServerAddressesTestJSON.test_list_server_addresses[id-6eb718c0-02d9-4d5e-acd1-4e0c269cef39,network,smoke]
-      - tempest.api.compute.servers.test_server_addresses.ServerAddressesTestJSON.test_list_server_addresses_by_network[id-87bbc374-5538-4f64-b673-2b0e4443cc30,network,smoke]
-      - tempest.api.identity.admin.v2.test_services.ServicesTestJSON.test_list_services[id-34ea6489-012d-4a86-9038-1287cadd5eca,smoke]
-      - tempest.api.identity.admin.v2.test_users.UsersTestJSON.test_create_user[id-2d55a71e-da1d-4b43-9c03-d269fd93d905,smoke]
-      - tempest.api.identity.admin.v3.test_credentials.CredentialsTestJSON.test_credentials_create_get_update_delete[id-7cd59bf9-bda4-4c72-9467-d21cab278355,smoke]
-      - tempest.api.identity.admin.v3.test_domains.DefaultDomainTestJSON.test_default_domain_exists[id-17a5de24-e6a0-4e4a-a9ee-d85b6e5612b5,smoke]
-      - tempest.api.identity.admin.v3.test_domains.DomainsTestJSON.test_create_update_delete_domain[id-f2f5b44a-82e8-4dad-8084-0661ea3b18cf,smoke]
-      - tempest.api.identity.admin.v3.test_endpoints.EndPointsTestJSON.test_update_endpoint[id-37e8f15e-ee7c-4657-a1e7-f6b61e375eff,smoke]
-      - tempest.api.identity.admin.v3.test_groups.GroupsV3TestJSON.test_group_users_add_list_delete[id-1598521a-2f36-4606-8df9-30772bd51339,smoke]
-      - tempest.api.identity.admin.v3.test_policies.PoliciesTestJSON.test_create_update_delete_policy[id-e544703a-2f03-4cf2-9b0f-350782fdb0d3,smoke]
-      - tempest.api.identity.admin.v3.test_regions.RegionsTestJSON.test_create_region_with_specific_id[id-2c12c5b5-efcf-4aa5-90c5-bff1ab0cdbe2,smoke]
-      - tempest.api.identity.admin.v3.test_roles.RolesV3TestJSON.test_role_create_update_show_list[id-18afc6c0-46cf-4911-824e-9989cc056c3a,smoke]
-      - tempest.api.identity.admin.v3.test_services.ServicesTestJSON.test_create_update_get_service[id-5193aad5-bcb7-411d-85b0-b3b61b96ef06,smoke]
-      - tempest.api.identity.admin.v3.test_trusts.TrustsV3TestJSON.test_get_trusts_all[id-4773ebd5-ecbf-4255-b8d8-b63e6f72b65d,smoke]
-      - tempest.api.identity.v2.test_api_discovery.TestApiDiscovery.test_api_media_types[id-007a0be0-78fe-4fdb-bbee-e9216cc17bb2,smoke]
-      - tempest.api.identity.v2.test_api_discovery.TestApiDiscovery.test_api_version_resources[id-ea889a68-a15f-4166-bfb1-c12456eae853,smoke]
-      - tempest.api.identity.v2.test_api_discovery.TestApiDiscovery.test_api_version_statuses[id-77fd6be0-8801-48e6-b9bf-38cdd2f253ec,smoke]
-      - tempest.api.identity.v3.test_api_discovery.TestApiDiscovery.test_api_media_types[id-657c1970-4722-4189-8831-7325f3bc4265,smoke]
-      - tempest.api.identity.v3.test_api_discovery.TestApiDiscovery.test_api_version_resources[id-b9232f5e-d9e5-4d97-b96c-28d3db4de1bd,smoke]
-      - tempest.api.identity.v3.test_api_discovery.TestApiDiscovery.test_api_version_statuses[id-8879a470-abfb-47bb-bb8d-5a7fd279ad1e,smoke]
-      - tempest.api.image.v2.test_images.BasicOperationsImagesTest.test_delete_image[id-f848bb94-1c6e-45a4-8726-39e3a5b23535,smoke]
-      - tempest.api.image.v2.test_images.BasicOperationsImagesTest.test_register_upload_get_image_file[id-139b765e-7f3d-4b3d-8b37-3ca3876ee318,smoke]
-      - tempest.api.image.v2.test_images.BasicOperationsImagesTest.test_update_image[id-f66891a7-a35c-41a8-b590-a065c2a1caa6,smoke]
-      - tempest.api.network.test_extensions.ExtensionsTestJSON.test_list_show_extensions[id-ef28c7e6-e646-4979-9d67-deb207bc5564,smoke]
-      - tempest.api.network.test_floating_ips.FloatingIPTestJSON.test_create_floating_ip_specifying_a_fixed_ip_address[id-36de4bd0-f09c-43e3-a8e1-1decc1ffd3a5,smoke]
-      - tempest.api.network.test_floating_ips.FloatingIPTestJSON.test_create_list_show_update_delete_floating_ip[id-62595970-ab1c-4b7f-8fcc-fddfe55e8718,smoke]
-      - tempest.api.network.test_networks.BulkNetworkOpsIpV6Test.test_bulk_create_delete_network[id-d4f9024d-1e28-4fc1-a6b1-25dbc6fa11e2,smoke]
-      - tempest.api.network.test_networks.BulkNetworkOpsIpV6Test.test_bulk_create_delete_port[id-48037ff2-e889-4c3b-b86a-8e3f34d2d060,smoke]
-      - tempest.api.network.test_networks.BulkNetworkOpsIpV6Test.test_bulk_create_delete_subnet[id-8936533b-c0aa-4f29-8e53-6cc873aec489,smoke]
-      - tempest.api.network.test_networks.BulkNetworkOpsTest.test_bulk_create_delete_network[id-d4f9024d-1e28-4fc1-a6b1-25dbc6fa11e2,smoke]
-      - tempest.api.network.test_networks.BulkNetworkOpsTest.test_bulk_create_delete_port[id-48037ff2-e889-4c3b-b86a-8e3f34d2d060,smoke]
-      - tempest.api.network.test_networks.BulkNetworkOpsTest.test_bulk_create_delete_subnet[id-8936533b-c0aa-4f29-8e53-6cc873aec489,smoke]
-      - tempest.api.network.test_networks.NetworksIpV6Test.test_create_update_delete_network_subnet[id-0e269138-0da6-4efc-a46d-578161e7b221,smoke]
-      - tempest.api.network.test_networks.NetworksIpV6Test.test_external_network_visibility[id-af774677-42a9-4e4b-bb58-16fe6a5bc1ec,smoke]
-      - tempest.api.network.test_networks.NetworksIpV6Test.test_list_networks[id-f7ffdeda-e200-4a7a-bcbe-05716e86bf43,smoke]
-      - tempest.api.network.test_networks.NetworksIpV6Test.test_list_subnets[id-db68ba48-f4ea-49e9-81d1-e367f6d0b20a,smoke]
-      - tempest.api.network.test_networks.NetworksIpV6Test.test_show_network[id-2bf13842-c93f-4a69-83ed-717d2ec3b44e,smoke]
-      - tempest.api.network.test_networks.NetworksIpV6Test.test_show_subnet[id-bd635d81-6030-4dd1-b3b9-31ba0cfdf6cc,smoke]
-      - tempest.api.network.test_networks.NetworksTest.test_create_update_delete_network_subnet[id-0e269138-0da6-4efc-a46d-578161e7b221,smoke]
-      - tempest.api.network.test_networks.NetworksTest.test_external_network_visibility[id-af774677-42a9-4e4b-bb58-16fe6a5bc1ec,smoke]
-      - tempest.api.network.test_networks.NetworksTest.test_list_networks[id-f7ffdeda-e200-4a7a-bcbe-05716e86bf43,smoke]
-      - tempest.api.network.test_networks.NetworksTest.test_list_subnets[id-db68ba48-f4ea-49e9-81d1-e367f6d0b20a,smoke]
-      - tempest.api.network.test_networks.NetworksTest.test_show_network[id-2bf13842-c93f-4a69-83ed-717d2ec3b44e,smoke]
-      - tempest.api.network.test_networks.NetworksTest.test_show_subnet[id-bd635d81-6030-4dd1-b3b9-31ba0cfdf6cc,smoke]
-      - tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_port_in_allowed_allocation_pools[id-0435f278-40ae-48cb-a404-b8a087bc09b1,smoke]
-      - tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_port_with_no_securitygroups[id-4179dcb9-1382-4ced-84fe-1b91c54f5735,smoke]
-      - tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_update_delete_port[id-c72c1c0c-2193-4aca-aaa4-b1442640f51c,smoke]
-      - tempest.api.network.test_ports.PortsIpV6TestJSON.test_list_ports[id-cf95b358-3e92-4a29-a148-52445e1ac50e,smoke]
-      - tempest.api.network.test_ports.PortsIpV6TestJSON.test_show_port[id-c9a685bd-e83f-499c-939f-9f7863ca259f,smoke]
-      - tempest.api.network.test_ports.PortsTestJSON.test_create_port_in_allowed_allocation_pools[id-0435f278-40ae-48cb-a404-b8a087bc09b1,smoke]
-      - tempest.api.network.test_ports.PortsTestJSON.test_create_port_with_no_securitygroups[id-4179dcb9-1382-4ced-84fe-1b91c54f5735,smoke]
-      - tempest.api.network.test_ports.PortsTestJSON.test_create_update_delete_port[id-c72c1c0c-2193-4aca-aaa4-b1442640f51c,smoke]
-      - tempest.api.network.test_ports.PortsTestJSON.test_list_ports[id-cf95b358-3e92-4a29-a148-52445e1ac50e,smoke]
-      - tempest.api.network.test_ports.PortsTestJSON.test_show_port[id-c9a685bd-e83f-499c-939f-9f7863ca259f,smoke]
-      - tempest.api.network.test_routers.RoutersIpV6Test.test_add_multiple_router_interfaces[id-802c73c9-c937-4cef-824b-2191e24a6aab,smoke]
-      - tempest.api.network.test_routers.RoutersIpV6Test.test_add_remove_router_interface_with_port_id[id-2b7d2f37-6748-4d78-92e5-1d590234f0d5,smoke]
-      - tempest.api.network.test_routers.RoutersIpV6Test.test_add_remove_router_interface_with_subnet_id[id-b42e6e39-2e37-49cc-a6f4-8467e940900a,smoke]
-      - tempest.api.network.test_routers.RoutersIpV6Test.test_create_show_list_update_delete_router[id-f64403e2-8483-4b34-8ccd-b09a87bcc68c,smoke]
-      - tempest.api.network.test_routers.RoutersTest.test_add_multiple_router_interfaces[id-802c73c9-c937-4cef-824b-2191e24a6aab,smoke]
-      - tempest.api.network.test_routers.RoutersTest.test_add_remove_router_interface_with_port_id[id-2b7d2f37-6748-4d78-92e5-1d590234f0d5,smoke]
-      - tempest.api.network.test_routers.RoutersTest.test_add_remove_router_interface_with_subnet_id[id-b42e6e39-2e37-49cc-a6f4-8467e940900a,smoke]
-      - tempest.api.network.test_routers.RoutersTest.test_create_show_list_update_delete_router[id-f64403e2-8483-4b34-8ccd-b09a87bcc68c,smoke]
-      - tempest.api.network.test_security_groups.SecGroupIPv6Test.test_create_list_update_show_delete_security_group[id-bfd128e5-3c92-44b6-9d66-7fe29d22c802,smoke]
-      - tempest.api.network.test_security_groups.SecGroupIPv6Test.test_create_show_delete_security_group_rule[id-cfb99e0e-7410-4a3d-8a0c-959a63ee77e9,smoke]
-      - tempest.api.network.test_security_groups.SecGroupIPv6Test.test_list_security_groups[id-e30abd17-fef9-4739-8617-dc26da88e686,smoke]
-      - tempest.api.network.test_security_groups.SecGroupTest.test_create_list_update_show_delete_security_group[id-bfd128e5-3c92-44b6-9d66-7fe29d22c802,smoke]
-      - tempest.api.network.test_security_groups.SecGroupTest.test_create_show_delete_security_group_rule[id-cfb99e0e-7410-4a3d-8a0c-959a63ee77e9,smoke]
-      - tempest.api.network.test_security_groups.SecGroupTest.test_list_security_groups[id-e30abd17-fef9-4739-8617-dc26da88e686,smoke]
-      - tempest.api.network.test_subnetpools_extensions.SubnetPoolsTestJSON.test_create_list_show_update_delete_subnetpools[id-62595970-ab1c-4b7f-8fcc-fddfe55e9811,smoke]
-      - tempest.api.network.test_versions.NetworksApiDiscovery.test_api_version_resources[id-cac8a836-c2e0-4304-b556-cd299c7281d1,smoke]
-      - tempest.api.object_storage.test_account_quotas.AccountQuotasTest.test_admin_modify_quota[id-63f51f9f-5f1d-4fc6-b5be-d454d70949d6,smoke]
-      - tempest.api.object_storage.test_account_quotas.AccountQuotasTest.test_upload_valid_object[id-a22ef352-a342-4587-8f47-3bbdb5b039c4,smoke]
-      - tempest.api.object_storage.test_account_services.AccountTest.test_list_account_metadata[id-4894c312-6056-4587-8d6f-86ffbf861f80,smoke]
-      - tempest.api.object_storage.test_account_services.AccountTest.test_list_containers[id-3499406a-ae53-4f8c-b43a-133d4dc6fe3f,smoke]
-      - tempest.api.object_storage.test_container_quotas.ContainerQuotasTest.test_upload_large_object[id-22eeeb2b-3668-4160-baef-44790f65a5a0,smoke]
-      - tempest.api.object_storage.test_container_quotas.ContainerQuotasTest.test_upload_too_many_objects[id-3a387039-697a-44fc-a9c0-935de31f426b,smoke]
-      - tempest.api.object_storage.test_container_quotas.ContainerQuotasTest.test_upload_valid_object[id-9a0fb034-86af-4df0-86fa-f8bd7db21ae0,smoke]
-      - tempest.api.object_storage.test_container_services.ContainerTest.test_create_container[id-92139d73-7819-4db1-85f8-3f2f22a8d91f,smoke]
-      - tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_contents[id-312ff6bd-5290-497f-bda1-7c5fec6697ab,smoke]
-      - tempest.api.object_storage.test_container_services.ContainerTest.test_list_container_metadata[id-96e68f0e-19ec-4aa2-86f3-adc6a45e14dd,smoke]
-      - tempest.api.object_storage.test_object_services.ObjectTest.test_create_object[id-5b4ce26f-3545-46c9-a2ba-5754358a4c62,smoke]
-      - tempest.api.object_storage.test_object_services.ObjectTest.test_get_object[id-02610ba7-86b7-4272-9ed8-aa8d417cb3cd,smoke]
-      - tempest.api.object_storage.test_object_services.ObjectTest.test_list_object_metadata[id-9a447cf6-de06-48de-8226-a8c6ed31caf2,smoke]
-      - tempest.api.object_storage.test_object_services.ObjectTest.test_update_object_metadata[id-7a94c25d-66e6-434c-9c38-97d4e2c29945,smoke]
-      - tempest.api.orchestration.stacks.test_resource_types.ResourceTypesTest.test_resource_type_list[id-7123d082-3577-4a30-8f00-f805327c4ffd,smoke]
-      - tempest.api.orchestration.stacks.test_resource_types.ResourceTypesTest.test_resource_type_show[id-0e85a483-828b-4a28-a0e3-f0a21809192b,smoke]
-      - tempest.api.orchestration.stacks.test_resource_types.ResourceTypesTest.test_resource_type_template[id-8401821d-65fe-4d43-9fa3-57d5ce3a35c7,smoke]
-      - tempest.api.orchestration.stacks.test_soft_conf.TestSoftwareConfig.test_get_deployment_list[id-1275c835-c967-4a2c-8d5d-ad533447ed91,smoke]
-      - tempest.api.orchestration.stacks.test_soft_conf.TestSoftwareConfig.test_get_deployment_metadata[id-fe7cd9f9-54b1-429c-a3b7-7df8451db913,smoke]
-      - tempest.api.orchestration.stacks.test_soft_conf.TestSoftwareConfig.test_get_software_config[id-136162ed-9445-4b9c-b7fc-306af8b5da99,smoke]
-      - tempest.api.orchestration.stacks.test_soft_conf.TestSoftwareConfig.test_software_deployment_create_validate[id-f29d21f3-ed75-47cf-8cdc-ef1bdeb4c674,smoke]
-      - tempest.api.orchestration.stacks.test_soft_conf.TestSoftwareConfig.test_software_deployment_update_no_metadata_change[id-2ac43ab3-34f2-415d-be2e-eabb4d14ee32,smoke]
-      - tempest.api.orchestration.stacks.test_soft_conf.TestSoftwareConfig.test_software_deployment_update_with_metadata_change[id-92c48944-d79d-4595-a840-8e1a581c1a72,smoke]
-      - tempest.api.orchestration.stacks.test_stacks.StacksTestJSON.test_stack_crud_no_resources[id-10498bd5-a83e-4b62-a817-ce24afe938fe,smoke]
-      - tempest.api.orchestration.stacks.test_stacks.StacksTestJSON.test_stack_list_responds[id-d35d628c-07f6-4674-85a1-74db9919e986,smoke]
-      - tempest.api.volume.test_volumes_actions.VolumesV1ActionsTest.test_attach_detach_volume_to_instance[compute,id-fff42874-7db5-4487-a8e1-ddda5fb5288d,smoke]
-      - tempest.api.volume.test_volumes_actions.VolumesV2ActionsTest.test_attach_detach_volume_to_instance[compute,id-fff42874-7db5-4487-a8e1-ddda5fb5288d,smoke]
-      - tempest.api.volume.test_volumes_get.VolumesV1GetTest.test_volume_create_get_update_delete[id-27fb0e9f-fb64-41dd-8bdb-1ffa762f0d51,smoke]
-      - tempest.api.volume.test_volumes_get.VolumesV1GetTest.test_volume_create_get_update_delete_from_image[id-54a01030-c7fc-447c-86ee-c1182beae638,image,smoke]
-      - tempest.api.volume.test_volumes_get.VolumesV2GetTest.test_volume_create_get_update_delete[id-27fb0e9f-fb64-41dd-8bdb-1ffa762f0d51,smoke]
-      - tempest.api.volume.test_volumes_get.VolumesV2GetTest.test_volume_create_get_update_delete_from_image[id-54a01030-c7fc-447c-86ee-c1182beae638,image,smoke]
-      - tempest.api.volume.test_volumes_list.VolumesV1ListTestJSON.test_volume_list[id-0b6ddd39-b948-471f-8038-4787978747c4,smoke]
-      - tempest.api.volume.test_volumes_list.VolumesV2ListTestJSON.test_volume_list[id-0b6ddd39-b948-471f-8038-4787978747c4,smoke]
-      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops[compute,id-f323b3ba-82f8-4db7-8ea6-6a895869ec49,network,smoke]
-      - tempest.scenario.test_server_basic_ops.TestServerBasicOps.test_server_basic_ops[compute,id-7fff3fb3-91d8-4fd0-bd7d-0204f1f180ba,network,smoke]
-      - tempest.scenario.test_server_multinode.TestServerMultinode.test_schedule_to_all_nodes[compute,id-9cecbe35-b9d4-48da-a37e-7ce70aa43d30,network,smoke]
-      - tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern[compute,id-557cd2c2-4eb8-4dce-98be-f86765ff311b,image,smoke,volume]
-      - tempest.scenario.test_volume_boot_pattern.TestVolumeBootPatternV2.test_volume_boot_pattern[compute,id-557cd2c2-4eb8-4dce-98be-f86765ff311b,image,smoke,volume]
diff --git a/dovetail/testcase/smoke.tc002.yml b/dovetail/testcase/smoke.tc002.yml
deleted file mode 100644
index ae9a87f5..00000000
--- a/dovetail/testcase/smoke.tc002.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-dovetail.smoke.tc002:
-  name: dovetail.smoke.tc002
-  objective: snaps smoke test cases
-  validate:
-    type: functest
-    testcase: snaps_smoke
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/stress.tc001.yml b/dovetail/testcase/stress.tc001.yml
deleted file mode 100644
index fd29f276..00000000
--- a/dovetail/testcase/stress.tc001.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-dovetail.stress.tc001:
-  name: dovetail.stress.tc001
-  objective: > # This test case verifies the ability of the SUT setting up VM pairs
-    # for different tenants and providing acceptable capacity after the amount of
-    # VM pairs reaches certain quantity.
-  validate:
-    type: bottlenecks
-    testcase: posca_factor_ping
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/tempest.tc001.yml b/dovetail/testcase/tempest.tc001.yml
deleted file mode 100644
index 8e669248..00000000
--- a/dovetail/testcase/tempest.tc001.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-dovetail.tempest.tc001:
-  name: dovetail.tempest.tc001
-  objective: forwarding packets through virtual networks in data path
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_mtu_sized_frames[compute,id-b158ea55-472e-4086-8fa9-c64ac0c6c1d0,network]
diff --git a/dovetail/testcase/tempest.tc002.yml b/dovetail/testcase/tempest.tc002.yml
deleted file mode 100644
index 4985dfac..00000000
--- a/dovetail/testcase/tempest.tc002.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-dovetail.tempest.tc002:
-  name: dovetail.tempest.tc002
-  objective: filtering packets based on security rules and port security in data path
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_port_security_macspoofing_port[compute,id-7c0bb1a2-d053-49a4-98f9-ca1a1d849f63,network]
-      - tempest.scenario.test_security_groups_basic_ops.TestSecurityGroupsBasicOps.test_cross_tenant_traffic[compute,id-e79f879e-debb-440c-a7e4-efeda05b6848,network]
-      - tempest.scenario.test_security_groups_basic_ops.TestSecurityGroupsBasicOps.test_in_tenant_traffic[compute,id-63163892-bbf6-4249-aa12-d5ea1f8f421b,network]
-      - tempest.scenario.test_security_groups_basic_ops.TestSecurityGroupsBasicOps.test_multiple_security_groups[compute,id-d2f77418-fcc4-439d-b935-72eca704e293,network]
-      - tempest.scenario.test_security_groups_basic_ops.TestSecurityGroupsBasicOps.test_port_security_disable_security_group[compute,id-7c811dcc-263b-49a3-92d2-1b4d8405f50c,network]
-      - tempest.scenario.test_security_groups_basic_ops.TestSecurityGroupsBasicOps.test_port_update_new_security_group[compute,id-f4d556d7-1526-42ad-bafb-6bebf48568f6,network]
diff --git a/dovetail/testcase/tempest.tc003.yml b/dovetail/testcase/tempest.tc003.yml
deleted file mode 100644
index b19fd2a2..00000000
--- a/dovetail/testcase/tempest.tc003.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-dovetail.tempest.tc003:
-  name: dovetail.tempest.tc003
-  objective: dynamic network runtime operations through the life of a VNF
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_hotplug_nic[compute,id-c5adff73-e961-41f1-b4a9-343614f18cfa,network]
-      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops[compute,id-f323b3ba-82f8-4db7-8ea6-6a895869ec49,network,smoke]
-      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_subnet_details[compute,id-d8bb918e-e2df-48b2-97cd-b73c95450980,network]
-      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_update_instance_port_admin_state[compute,id-f5dfcc22-45fd-409f-954c-5bd500d7890b,network]
-      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_update_router_admin_state[compute,id-04b9fe4e-85e8-4aea-b937-ea93885ac59f,network]
diff --git a/dovetail/testcase/tempest.tc004.yml b/dovetail/testcase/tempest.tc004.yml
deleted file mode 100644
index a6a49f06..00000000
--- a/dovetail/testcase/tempest.tc004.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-dovetail.tempest.tc004:
-  name: dovetail.tempest.tc004
-  objective: correct behavior after common virtual machine life cycles events
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.scenario.test_minimum_basic.TestMinimumBasicScenario.test_minimum_basic_scenario[compute,id-bdbb5441-9204-419d-a225-b4fdbfb1a1a8,image,network,volume]
-      - tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_cold_migration[compute,id-a4858f6c-401e-4155-9a49-d5cd053d1a2f,network]
-      - tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_pause_unpause[compute,id-2b2642db-6568-4b35-b812-eceed3fa20ce,network]
-      - tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_reboot[compute,id-7b6860c2-afa3-4846-9522-adeb38dfbe08,network]
-      - tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_rebuild[compute,id-88a529c2-1daa-4c85-9aec-d541ba3eb699,network]
-      - tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_resize[compute,id-719eb59d-2f42-4b66-b8b1-bb1254473967,network]
-      - tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_stop_start[compute,id-61f1aa9a-1573-410e-9054-afa557cab021,network]
-      - tempest.scenario.test_network_advanced_server_ops.TestNetworkAdvancedServerOps.test_server_connectivity_suspend_resume[compute,id-5cdf9499-541d-4923-804e-b9a60620a7f0,network]
-      - tempest.scenario.test_server_advanced_ops.TestServerAdvancedOps.test_resize_volume_backed_server_confirm[compute,id-e6c28180-7454-4b59-b188-0257af08a63b,volume]
-      - tempest.scenario.test_server_advanced_ops.TestServerAdvancedOps.test_server_sequence_suspend_resume[compute,id-949da7d5-72c8-4808-8802-e3d70df98e2c]
-      - tempest.scenario.test_shelve_instance.TestShelveInstance.test_shelve_instance[compute,id-1164e700-0af0-4a4c-8792-35909a88743c,image,network]
-      - tempest.scenario.test_shelve_instance.TestShelveInstance.test_shelve_volume_backed_instance[compute,id-c1b6318c-b9da-490b-9c67-9339b627271f,image,network,volume]
diff --git a/dovetail/testcase/tempest.tc005.yml b/dovetail/testcase/tempest.tc005.yml
deleted file mode 100644
index b20ae5de..00000000
--- a/dovetail/testcase/tempest.tc005.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-dovetail.tempest.tc005:
-  name: dovetail.tempest.tc005
-  objective: simple virtual machine resource scheduling on multiple nodes
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    sub_testcase_list:
-      - tempest.scenario.test_server_multinode.TestServerMultinode.test_schedule_to_all_nodes[compute,id-9cecbe35-b9d4-48da-a37e-7ce70aa43d30,network,smoke]
-      - tempest.api.compute.servers.test_server_group.ServerGroupTestJSON.test_create_delete_multiple_server_groups_with_same_name_policy[id-154dc5a4-a2fe-44b5-b99e-f15806a4a113]
-      - tempest.api.compute.servers.test_server_group.ServerGroupTestJSON.test_create_delete_server_group_with_affinity_policy[id-5dc57eda-35b7-4af7-9e5f-3c2be3d2d68b]
-      - tempest.api.compute.servers.test_server_group.ServerGroupTestJSON.test_create_delete_server_group_with_anti_affinity_policy[id-3645a102-372f-4140-afad-13698d850d23]
-      - tempest.api.compute.servers.test_server_group.ServerGroupTestJSON.test_list_server_groups[id-d4874179-27b4-4d7d-80e4-6c560cdfe321]
-      - tempest.api.compute.servers.test_server_group.ServerGroupTestJSON.test_show_server_group[id-b3545034-dd78-48f0-bdc2-a4adfa6d0ead]
diff --git a/dovetail/testcase/vnf.tc001.yml b/dovetail/testcase/vnf.tc001.yml
deleted file mode 100644
index e0f39582..00000000
--- a/dovetail/testcase/vnf.tc001.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-dovetail.vnf.tc001:
-  name: dovetail.vnf.tc001
-  objective: testing for Cleawater IMS deployment using Cloudify orchestrator
-  validate:
-    type: functest
-    testcase: cloudify_ims
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/vping.tc001.yml b/dovetail/testcase/vping.tc001.yml
deleted file mode 100644
index e3b501be..00000000
--- a/dovetail/testcase/vping.tc001.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-dovetail.vping.tc001:
-  name: dovetail.vping.tc001
-  objective: testing for vping using userdata
-  validate:
-    type: functest
-    testcase: vping_userdata
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/vping.tc002.yml b/dovetail/testcase/vping.tc002.yml
deleted file mode 100644
index a800a4db..00000000
--- a/dovetail/testcase/vping.tc002.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-dovetail.vping.tc002:
-  name: dovetail.vping.tc002
-  objective: testing for vping using ssh
-  validate:
-    type: functest
-    testcase: vping_ssh
-  report:
-    sub_testcase_list:
diff --git a/dovetail/tests/unit/test_parser.py b/dovetail/tests/unit/test_parser.py
index 7047d5ce..5cc3fe9f 100644
--- a/dovetail/tests/unit/test_parser.py
+++ b/dovetail/tests/unit/test_parser.py
@@ -28,7 +28,10 @@ class TestParser(unittest.TestCase):
 
     def setUp(self):
         """Test case setup"""
-        dt_cfg.load_config_files()
+        conf_path = os.path.join(self.test_path,
+                                 os.pardir, os.pardir, os.pardir,
+                                 'etc/conf')
+        dt_cfg.load_config_files(conf_path)
         logging.disable(logging.CRITICAL)
 
     def test_parser_cmd(self, mock_logger):
diff --git a/dovetail/userconfig/ansible.cfg b/dovetail/userconfig/ansible.cfg
deleted file mode 100644
index 14c80651..00000000
--- a/dovetail/userconfig/ansible.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[defaults]
-host_key_checking = False
diff --git a/dovetail/userconfig/hosts.yaml.sample b/dovetail/userconfig/hosts.yaml.sample
deleted file mode 100644
index 45f8db3e..00000000
--- a/dovetail/userconfig/hosts.yaml.sample
+++ /dev/null
@@ -1,7 +0,0 @@
----
-hosts_info:
-  192.168.141.101:
-    - ha-vip
-  <ip>:
-    - <hostname1>
-    - <hostname2>
diff --git a/dovetail/userconfig/pod.yaml.sample b/dovetail/userconfig/pod.yaml.sample
deleted file mode 100644
index 26636a6b..00000000
--- a/dovetail/userconfig/pod.yaml.sample
+++ /dev/null
@@ -1,50 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others.
-#
-# 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
-##############################################################################
----
-# sample config file about the POD information, including the
-# name/IP/user/ssh key  and Controllers/Computes
-#
-# The options of this config file include:
-# name: the name of this node
-# role: node's role, support role: Master/Controller/Comupte/BareMetal
-# ip: the node's IP address
-# user: the username for login
-# key_filename:the path of the private key file for login
-
-nodes:
--
-    name: node1
-    role: Controller
-    ip: 10.1.0.50
-    user: root
-    key_filename: /root/.ssh/id_rsa
--
-    name: node2
-    role: Controller
-    ip: 10.1.0.51
-    user: root
-    key_filename: /root/.ssh/id_rsa
--
-    name: node3
-    role: Controller
-    ip: 10.1.0.52
-    user: root
-    key_filename: /root/.ssh/id_rsa
--
-    name: node4
-    role: Compute
-    ip: 10.1.0.53
-    user: root
-    key_filename: /root/.ssh/id_rsa
--
-    name: node5
-    role: Compute
-    ip: 10.1.0.54
-    user: root
-    key_filename: /root/.ssh/id_rsa
diff --git a/dovetail/userconfig/sdnvpn_config_tc000.yaml b/dovetail/userconfig/sdnvpn_config_tc000.yaml
deleted file mode 100644
index 1cb4c63f..00000000
--- a/dovetail/userconfig/sdnvpn_config_tc000.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-defaults:
-  flavor: m1.tiny # adapt to your environment
-
-testcases:
-  sdnvpn.test.functest.tempest:
-    enabled: true
-    description: Neutron BGPVPN tests in tempest
diff --git a/dovetail/userconfig/sdnvpn_config_testcase1.yaml b/dovetail/userconfig/sdnvpn_config_testcase1.yaml
deleted file mode 100644
index 5736dcff..00000000
--- a/dovetail/userconfig/sdnvpn_config_testcase1.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-defaults:
-  flavor: m1.tiny # adapt to your environment
-
-testcases:
-  sdnvpn.test.functest.testcase_1:
-      enabled: true
-      description: VPN provides connectivity between subnets
-      testname_db: functest_testcase_1
-      instance_1_name: sdnvpn-1-1
-      instance_2_name: sdnvpn-1-2
-      instance_3_name: sdnvpn-1-3
-      instance_4_name: sdnvpn-1-4
-      instance_5_name: sdnvpn-1-5
-      image_name: sdnvpn-image
-      net_1_name: sdnvpn-1-1-net
-      subnet_1_name: sdnvpn-1-1-subnet
-      subnet_1_cidr: 10.10.10.0/24
-      router_1_name: sdnvpn-1-1-router
-      net_2_name: sdnvpn-1-2-net
-      subnet_2_name: sdnvpn-1-2-subnet
-      subnet_2_cidr: 10.10.11.0/24
-      router_2_name: sdnvpn-1-2-router
-      secgroup_name: sdnvpn-sg
-      secgroup_descr: Security group for SDNVPN test cases
-      targets1: '88:88'
-      targets2: '55:55'
-      route_distinguishers: '11:11'
diff --git a/dovetail/userconfig/sdnvpn_config_testcase2.yaml b/dovetail/userconfig/sdnvpn_config_testcase2.yaml
deleted file mode 100644
index 2be3bdb5..00000000
--- a/dovetail/userconfig/sdnvpn_config_testcase2.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-defaults:
-  flavor: m1.tiny # adapt to your environment
-
-testcases:
-  sdnvpn.test.functest.testcase_2:
-      enabled: true
-      description: Tenant separation
-      testname_db: functest_testcase_2
-      instance_1_name: sdnvpn-2-1
-      instance_2_name: sdnvpn-2-2
-      instance_3_name: sdnvpn-2-3
-      instance_4_name: sdnvpn-2-4
-      instance_5_name: sdnvpn-2-5
-      instance_1_ip: 10.10.10.11
-      instance_2_ip: 10.10.10.12
-      instance_3_ip: 10.10.11.13
-      instance_4_ip: 10.10.10.12
-      instance_5_ip: 10.10.11.13
-      image_name: sdnvpn-image
-      net_1_name: sdnvpn-2-1-net
-      subnet_1a_name: sdnvpn-2-1a-subnet
-      subnet_1a_cidr: 10.10.10.0/24
-      subnet_1b_name: sdnvpn-2-1b-subnet
-      subnet_1b_cidr: 10.10.11.0/24
-      router_1_name: sdnvpn-2-1-router
-      net_2_name: sdnvpn-2-2-net
-      subnet_2a_name: sdnvpn-2-2a-subnet
-      subnet_2a_cidr: 10.10.11.0/24
-      subnet_2b_name: sdnvpn-2-2b-subnet
-      subnet_2b_cidr: 10.10.10.0/24
-      router_2_name: sdnvpn-2-2-router
-      secgroup_name: sdnvpn-sg
-      secgroup_descr: Security group for SDNVPN test cases
-      targets1: '88:88'
-      targets2: '55:55'
-      route_distinguishers1: '111:111'
-      route_distinguishers2: '222:222'
diff --git a/dovetail/userconfig/sdnvpn_config_testcase3.yaml b/dovetail/userconfig/sdnvpn_config_testcase3.yaml
deleted file mode 100644
index c1ffc13b..00000000
--- a/dovetail/userconfig/sdnvpn_config_testcase3.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-defaults:
-  flavor: m1.tiny # adapt to your environment
-
-testcases:
-  sdnvpn.test.functest.testcase_3:
-      enabled: true
-      description: Data center gateway integration
-      testname_db: functest_testcase_3
-      secgroup_name: sdnvpn-sg
-      secgroup_descr: Security group for SDNVPN test cases
-      image_name: sdnvpn-image
-      ubuntu_image_name: sdnvpn-ubuntu-image
-      net_1_name: sdnvpn-3-1-net
-      subnet_1_name: sdnvpn-3-1-subnet
-      subnet_1_cidr: 10.10.10.0/24
-      router_1_name: sdnvpn-3-1-router
-      quagga_net_name: sdnvpn-3-2-quagga-net
-      quagga_subnet_name: sdnvpn-3-2-quagga-subnet
-      quagga_subnet_cidr: 10.10.11.0/24
-      quagga_router_name: sdnvpn-3-2-quagga-router
-      quagga_instance_name: sdnvpn-3-2-quagga
-      quagga_instance_ip: 10.10.11.5
-      instance_1_name: sdnvpn-3-1
-      instance_1_ip: 10.10.10.5
-      import_targets: '31:31'
-      export_targets: '32:32'
diff --git a/dovetail/userconfig/sdnvpn_config_testcase4.yaml b/dovetail/userconfig/sdnvpn_config_testcase4.yaml
deleted file mode 100644
index f3f5a56b..00000000
--- a/dovetail/userconfig/sdnvpn_config_testcase4.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-defaults:
-  flavor: m1.tiny # adapt to your environment
-
-testcases:
-  sdnvpn.test.functest.testcase_4:
-      enabled: true
-      description: VPN provides connectivity between subnets using router association
-      testname_db: functest_testcase_4
-      instance_1_name: sdnvpn-4-1
-      instance_2_name: sdnvpn-4-2
-      instance_3_name: sdnvpn-4-3
-      instance_4_name: sdnvpn-4-4
-      instance_5_name: sdnvpn-4-5
-      image_name: sdnvpn-image
-      net_1_name: sdnvpn-4-1-net
-      subnet_1_name: sdnvpn-4-1-subnet
-      subnet_1_cidr: 10.10.10.0/24
-      router_1_name: sdnvpn-4-1-router
-      net_2_name: sdnvpn-4-2-net
-      subnet_2_name: sdnvpn-4-2-subnet
-      subnet_2_cidr: 10.10.11.0/24
-      router_2_name: sdnvpn-4-2-router
-      secgroup_name: sdnvpn-sg
-      secgroup_descr: Security group for SDNVPN test cases
-      targets1: '88:88'
-      targets2: '55:55'
-      route_distinguishers: '12:12'
diff --git a/dovetail/userconfig/sdnvpn_config_testcase8.yaml b/dovetail/userconfig/sdnvpn_config_testcase8.yaml
deleted file mode 100644
index 8712122b..00000000
--- a/dovetail/userconfig/sdnvpn_config_testcase8.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-defaults:
-  flavor: m1.tiny # adapt to your environment
-
-testcases:
-  sdnvpn.test.functest.testcase_8:
-      enabled: true
-      description: Test floating IP and router assoc coexistence
-      testname_db: functest_testcase_8
-      image_name: sdnvpn-image
-      instance_1_name: sdnvpn-8-1
-      instance_2_name: sdnvpn-8-2
-      net_1_name: sdnvpn-8-1
-      subnet_1_name: sdnvpn-8-1-subnet
-      subnet_1_cidr: 10.10.10.0/24
-      router_1_name: sdnvpn-8-1-router
-      net_2_name: sdnvpn-8-2
-      subnet_2_name: sdnvpn-8-2-subnet
-      subnet_2_cidr: 10.10.20.0/24
-      router_2_name: sdnvpn-8-2-router
-      secgroup_name: sdnvpn-sg
-      secgroup_descr: Security group for SDNVPN test cases
-      targets: '88:88'
-      route_distinguishers: '18:18'
diff --git a/dovetail/userconfig/tempest_conf.yaml.sample b/dovetail/userconfig/tempest_conf.yaml.sample
deleted file mode 100644
index 944e3a9f..00000000
--- a/dovetail/userconfig/tempest_conf.yaml.sample
+++ /dev/null
@@ -1,16 +0,0 @@
-# This is an empty configuration file to be filled up with the desired options
-# to generate a custom tempest.conf
-# Examples:
-# network-feature-enabled:
-#     port_security: True
-
-# volume-feature-enabled:
-#     api_v1: False
-
-# validation:
-#     image_ssh_user: root
-#     ssh_timeout: 300
-
-# compute:
-#     min_compute_nodes: 2
-#     volume_device_name: vdb
diff --git a/dovetail/userconfig/testcases.yaml b/dovetail/userconfig/testcases.yaml
deleted file mode 100644
index 1452a45d..00000000
--- a/dovetail/userconfig/testcases.yaml
+++ /dev/null
@@ -1,156 +0,0 @@
----
-tiers:
-    -
-        name: smoke
-        order: 1
-        ci_loop: '(daily)|(weekly)'
-        description: >-
-            Set of basic Functional tests to validate the OPNFV scenarios.
-        testcases:
-            -
-                case_name: vping_ssh
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    This test case verifies: 1) SSH to an instance using
-                    floating IPs over the public network. 2) Connectivity
-                    between 2 instances over a private network.
-                dependencies:
-                    installer: ''
-                    scenario: ''
-                run:
-                    module: 'functest.opnfv_tests.openstack.vping.vping_ssh'
-                    class: 'VPingSSH'
-
-            -
-                case_name: vping_userdata
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    This test case verifies:  1) Boot a VM with given userdata.
-                    2) Connectivity between 2 instances over a private network.
-                dependencies:
-                    installer: ''
-                    scenario: ''
-                run:
-                    module:
-                        'functest.opnfv_tests.openstack.vping.vping_userdata'
-                    class: 'VPingUserdata'
-
-            -
-                case_name: refstack_defcore
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    This test case runs a sub group of tests of the OpenStack
-                    Defcore testcases by using refstack client.
-                dependencies:
-                    installer: ''
-                    scenario: ''
-                run:
-                    module:
-                        'functest.opnfv_tests.openstack.refstack_client.refstack_client'
-                    class: 'RefstackClient'
-
-            -
-                case_name: tempest_smoke_serial
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    This test case runs the smoke subset of the OpenStack
-                    Tempest suite. The list of test cases is generated by
-                    Tempest automatically and depends on the parameters of
-                    the OpenStack deplopyment.
-                dependencies:
-                    installer: ''
-                    scenario: ''
-                run:
-                    module: 'functest.opnfv_tests.openstack.tempest.tempest'
-                    class: 'TempestSmokeSerial'
-
-            -
-                case_name: snaps_smoke
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    This test case contains tests that setup and destroy
-                    environments with VMs with and without Floating IPs
-                    with a newly created user and project. Set the config
-                    value snaps.use_floating_ips (True|False) to toggle
-                    this functionality. When the config value of
-                    snaps.use_keystone is True, functest must have access to
-                    the cloud's private network.
-                dependencies:
-                    installer: ''
-                    scenario: ''
-                run:
-                    module: 'functest.opnfv_tests.openstack.snaps.smoke'
-                    class: 'SnapsSmoke'
-
-            -
-                case_name: tempest_custom
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    The test case allows running a customized list of tempest
-                    test cases defined in a file under
-                    <dir_functest_repo>/functest/opnfv_tests/openstack/
-                      /tempest/custom_tests/test_list.txt
-                    The file is empty and can be customized with the desired tests.
-                dependencies:
-                    installer: ''
-                    scenario: ''
-                run:
-                    module: 'functest.opnfv_tests.openstack.tempest.tempest'
-                    class: 'TempestCustom'
-
-    -
-        name: features
-        order: 2
-        ci_loop: '(daily)|(weekly)'
-        description: >-
-            Test suites from feature projects
-            integrated in functest
-        testcases:
-            -
-                case_name: bgpvpn
-                project_name: sdnvpn
-                criteria: 100
-                blocking: false
-                description: >-
-                    Test suite from SDNVPN project.
-                dependencies:
-                    installer: ''
-                    scenario: ''
-                run:
-                    module: 'sdnvpn.test.functest.run_sdnvpn_tests'
-                    class: 'SdnvpnFunctest'
-
-    -
-        name: vnf
-        order: 4
-        ci_loop: '(daily)|(weekly)'
-        description: >-
-            Collection of VNF test cases.
-        testcases:
-            -
-                case_name: cloudify_ims
-                project_name: functest
-                criteria: 80
-                blocking: false
-                description: >-
-                    This test case deploys an OpenSource vIMS solution from
-                    Clearwater using the Cloudify orchestrator. It also runs
-                    some signaling traffic.
-                dependencies:
-                    installer: ''
-                    scenario: ''
-                run:
-                    module: 'functest.opnfv_tests.vnf.ims.cloudify_ims'
-                    class: 'CloudifyIms'
diff --git a/dovetail/utils/dovetail_config.py b/dovetail/utils/dovetail_config.py
index 5e100d69..d3b54192 100644
--- a/dovetail/utils/dovetail_config.py
+++ b/dovetail/utils/dovetail_config.py
@@ -16,18 +16,16 @@ class DovetailConfig(object):
     dovetail_config = {}
 
     @classmethod
-    def load_config_files(cls):
-        curr_path = os.path.dirname(os.path.abspath(__file__))
-        config_path = os.path.join(os.path.dirname(curr_path), 'conf')
-        with open(os.path.join(config_path, 'dovetail_config.yml')) as f:
+    def load_config_files(cls, conf_path):
+        with open(os.path.join(conf_path, 'dovetail_config.yml')) as f:
             cls.dovetail_config = yaml.safe_load(f)
 
         for extra_config_file in cls.dovetail_config['include_config']:
-            with open(os.path.join(config_path, extra_config_file)) as f:
+            with open(os.path.join(conf_path, extra_config_file)) as f:
                 extra_config = yaml.safe_load(f)
                 cls.dovetail_config.update(extra_config)
 
-        path = os.path.join(config_path, cls.dovetail_config['cli_file_name'])
+        path = os.path.join(conf_path, cls.dovetail_config['cli_file_name'])
         with open(path) as f:
             cmd_yml = yaml.safe_load(f)
             cls.dovetail_config['cli'] = cmd_yml[cmd_yml.keys()[0]]
author	SerenaFeng <feng.xiaowei@zte.com.cn>	2018-03-01 20:03:59 +0800
committer	SerenaFeng <feng.xiaowei@zte.com.cn>	2018-03-06 09:16:43 +0800
commit	b25c1371f82911ea26b8c893b6612bb5ae0c8c19 (patch)
tree	91190d32b9bb723670214b4d91e0bb95cccf5382 /dovetail
parent	c308b9a718b8b4fc5e781f8d2a6dbe714e381834 (diff)