Clean all OpenStack related modules

Xtesting is only focused on the framework and entry points.

Change-Id: I1a4146ed8519438b13810a20ddf1140c35bb6ecd
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

34 files changed, 0 insertions, 3698 deletions

diff --git a/functest/tests/unit/ci/test_check_deployment.py b/functest/tests/unit/ci/test_check_deployment.py
deleted file mode 100644
index aeeca587..00000000
--- a/functest/tests/unit/ci/test_check_deployment.py
+++ /dev/null
@@ -1,286 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2017 Ericsson 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
-
-# pylint: disable=missing-docstring
-
-import socket
-import unittest
-
-import logging
-import mock
-
-from functest.ci import check_deployment
-
-__author__ = "Jose Lausuch <jose.lausuch@ericsson.com>"
-
-
-class CheckDeploymentTesting(unittest.TestCase):
-    """The super class which testing classes could inherit."""
-    # pylint: disable=missing-docstring,too-many-public-methods
-
-    logging.disable(logging.CRITICAL)
-
-    def setUp(self):
-        self.client_test = mock.Mock()
-        self.deployment = check_deployment.CheckDeployment()
-        self.service_test = 'compute'
-        self.rc_file = self.deployment.rc_file
-        self.endpoint_test = 'http://192.168.0.6:5000/v3'
-        creds_attr = {'auth_url': self.endpoint_test,
-                      'proxy_settings': ''}
-        proxy_attr = {'host': '192.168.0.1', 'port': '5000'}
-        proxy_settings = mock.Mock()
-        proxy_settings.configure_mock(**proxy_attr)
-        self.os_creds = mock.Mock()
-        self.os_creds.configure_mock(**creds_attr)
-        self.os_creds.proxy_settings = proxy_settings
-        self.deployment.os_creds = self.os_creds
-
-    @mock.patch('socket.socket.connect', side_effect=TypeError)
-    def test_verify_connectivity_ko1(self, *args):
-        self.assertFalse(check_deployment.verify_connectivity("127.0.0.1"))
-        args[0].assert_called_once_with((None, 80))
-
-    @mock.patch('socket.socket.connect', side_effect=socket.error)
-    def test_verify_connectivity_ko2(self, *args):
-        self.assertFalse(
-            check_deployment.verify_connectivity("http://127.0.0.1"))
-        args[0].assert_called_once_with(("127.0.0.1", 80))
-
-    @mock.patch('socket.socket.connect', side_effect=socket.error)
-    def test_verify_connectivity_ko3(self, *args):
-        self.assertFalse(
-            check_deployment.verify_connectivity("https://127.0.0.1"))
-        args[0].assert_called_once_with(("127.0.0.1", 443))
-
-    @mock.patch('socket.socket.connect')
-    def test_verify_connectivity(self, *args):
-        self.assertTrue(
-            check_deployment.verify_connectivity("https://127.0.0.1"))
-        args[0].assert_called_once_with(("127.0.0.1", 443))
-
-    @mock.patch('snaps.openstack.utils.keystone_utils.keystone_session',
-                return_value=mock.Mock(
-                    get_token=mock.Mock(side_effect=Exception)))
-    def test_get_auth_token_ko(self, *args):
-        with self.assertRaises(Exception):
-            check_deployment.get_auth_token(self.os_creds)
-        args[0].assert_called_once_with(self.os_creds)
-
-    @mock.patch('snaps.openstack.utils.keystone_utils.keystone_session',
-                return_value=mock.Mock(
-                    get_token=mock.Mock(return_value="foo")))
-    def test_get_auth_token(self, *args):
-        self.assertEqual(check_deployment.get_auth_token(self.os_creds), "foo")
-        args[0].assert_called_once_with(self.os_creds)
-
-    @mock.patch('six.moves.builtins.open',
-                mock.mock_open(read_data='OS_AUTH_URL'))
-    @mock.patch('functest.ci.check_deployment.os.path.isfile', returns=True)
-    def test_check_rc(self, *args):
-        self.deployment.check_rc()
-        args[0].assert_called_once_with(self.rc_file)
-
-    @mock.patch('functest.ci.check_deployment.os.path.isfile',
-                return_value=False)
-    def test_check_rc_missing_file(self, *args):
-        with self.assertRaises(Exception) as context:
-            self.deployment.check_rc()
-        args[0].assert_called_once_with(self.rc_file)
-        msg = 'RC file {} does not exist!'.format(self.rc_file)
-        self.assertTrue(msg in str(context.exception))
-
-    @mock.patch('six.moves.builtins.open',
-                mock.mock_open(read_data='test'))
-    @mock.patch('functest.ci.check_deployment.os.path.isfile',
-                return_value=True)
-    def test_check_rc_missing_os_auth(self, *args):
-        with self.assertRaises(Exception) as context:
-            self.deployment.check_rc()
-        args[0].assert_called_once_with(self.rc_file)
-        msg = 'OS_AUTH_URL not defined in {}.'.format(self.rc_file)
-        self.assertTrue(msg in str(context.exception))
-
-    @mock.patch('functest.ci.check_deployment.get_auth_token',
-                return_value='gAAAAABaOhXGS')
-    @mock.patch('functest.ci.check_deployment.verify_connectivity',
-                return_value=True)
-    def test_check_auth_endpoint(self, *args):
-        self.deployment.check_auth_endpoint()
-        args[0].assert_called_once_with(self.endpoint_test)
-        args[1].assert_called_once_with(mock.ANY)
-
-    @mock.patch('functest.ci.check_deployment.verify_connectivity',
-                return_value=False)
-    def test_check_auth_endpoint_ko(self, *args):
-        with self.assertRaises(Exception) as context:
-            self.deployment.check_auth_endpoint()
-        msg = "OS_AUTH_URL {} is not reachable.".format(self.os_creds.auth_url)
-        args[0].assert_called_once_with(self.os_creds.auth_url)
-        self.assertTrue(msg in str(context.exception))
-
-    @mock.patch('functest.ci.check_deployment.verify_connectivity',
-                return_value=True)
-    @mock.patch('functest.ci.check_deployment.keystone_utils.get_endpoint')
-    def test_check_public_endpoint(self, *args):
-        args[0].return_value = self.endpoint_test
-        self.deployment.check_public_endpoint()
-        args[0].assert_called_once_with(
-            mock.ANY, 'identity', interface='public')
-        args[1].assert_called_once_with(self.endpoint_test)
-
-    @mock.patch('functest.ci.check_deployment.verify_connectivity',
-                return_value=False)
-    @mock.patch('functest.ci.check_deployment.keystone_utils.get_endpoint')
-    def test_check_public_endpoint_ko(self, *args):
-        args[0].return_value = self.endpoint_test
-        with self.assertRaises(Exception) as context:
-            self.deployment.check_public_endpoint()
-        args[0].assert_called_once_with(
-            mock.ANY, 'identity', interface='public')
-        args[1].assert_called_once_with(self.endpoint_test)
-        msg = "Public endpoint {} is not reachable.".format(self.endpoint_test)
-        self.assertTrue(msg in str(context.exception))
-
-    @mock.patch('functest.ci.check_deployment.verify_connectivity',
-                return_value=True)
-    @mock.patch('functest.ci.check_deployment.keystone_utils.get_endpoint')
-    def test_check_service_endpoint(self, *args):
-        self.deployment.check_service_endpoint(self.service_test)
-        args[0].assert_called_once_with(
-            mock.ANY, self.service_test, interface='public')
-        args[1].assert_called_once_with(args[0].return_value)
-
-    @mock.patch('functest.ci.check_deployment.verify_connectivity',
-                return_value=False)
-    @mock.patch('functest.ci.check_deployment.keystone_utils.get_endpoint')
-    def test_check_service_endpoint_ko(self, *args):
-        args[0].return_value = self.endpoint_test
-        with self.assertRaises(Exception) as context:
-            self.deployment.check_service_endpoint(self.service_test)
-        msg = "{} endpoint {} is not reachable.".format(
-            self.service_test, self.endpoint_test)
-        self.assertTrue(msg in str(context.exception))
-        args[0].assert_called_once_with(
-            mock.ANY, self.service_test, interface='public')
-        args[1].assert_called_once_with(args[0].return_value)
-
-    @mock.patch('functest.ci.check_deployment.nova_utils.nova_client')
-    def test_check_nova(self, mock_method):
-        self.deployment.check_nova()
-        mock_method.assert_called_once_with(mock.ANY)
-
-    @mock.patch('functest.ci.check_deployment.nova_utils.nova_client',
-                return_value=mock.Mock(
-                    servers=mock.Mock(list=mock.Mock(side_effect=Exception))))
-    def test_check_nova_fail(self, mock_method):
-        with self.assertRaises(Exception):
-            self.deployment.check_nova()
-        mock_method.assert_called_once_with(mock.ANY)
-
-    @mock.patch('functest.ci.check_deployment.neutron_utils.neutron_client')
-    def test_check_neutron(self, mock_method):
-        self.deployment.check_neutron()
-        mock_method.assert_called_once_with(mock.ANY)
-
-    @mock.patch('functest.ci.check_deployment.neutron_utils.neutron_client',
-                return_value=mock.Mock(
-                    list_networks=mock.Mock(side_effect=Exception)))
-    def test_check_neutron_fail(self, mock_method):
-        with self.assertRaises(Exception):
-            self.deployment.check_neutron()
-        mock_method.assert_called_once_with(mock.ANY)
-
-    @mock.patch('functest.ci.check_deployment.glance_utils.glance_client')
-    def test_check_glance(self, mock_method):
-        self.deployment.check_glance()
-        mock_method.assert_called_once_with(mock.ANY)
-
-    @mock.patch('functest.ci.check_deployment.glance_utils.glance_client',
-                return_value=mock.Mock(
-                    images=mock.Mock(list=mock.Mock(side_effect=Exception))))
-    def test_check_glance_fail(self, mock_method):
-        with self.assertRaises(Exception):
-            self.deployment.check_glance()
-        mock_method.assert_called_once_with(mock.ANY)
-
-    @mock.patch('functest.ci.check_deployment.LOGGER.info')
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
-                'get_ext_net_name', return_value='ext-net')
-    def test_check_extnet(self, *args):
-        self.deployment.check_ext_net()
-        args[0].assert_called_once_with(mock.ANY)
-        args[1].assert_called_once_with(
-            "External network found: %s", "ext-net")
-
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
-                'get_ext_net_name', return_value='')
-    def test_check_extnet_none(self, mock_getext):
-        with self.assertRaises(Exception) as context:
-            self.deployment.check_ext_net()
-        self.assertTrue(mock_getext.called)
-        msg = 'ERROR: No external networks in the deployment.'
-        self.assertTrue(msg in str(context.exception))
-
-    @mock.patch('functest.ci.check_deployment.CheckDeployment.check_rc',
-                side_effect=Exception)
-    def test_check_all_exc1(self, *args):
-        with self.assertRaises(Exception):
-            self.deployment.check_all()
-        args[0].assert_called_once_with()
-
-    @mock.patch('snaps.openstack.tests.openstack_tests.get_credentials',
-                side_effect=Exception)
-    @mock.patch('functest.ci.check_deployment.CheckDeployment.check_rc')
-    def test_check_all_exc2(self, *args):
-        with self.assertRaises(Exception):
-            self.deployment.check_all()
-        args[0].assert_called_once_with()
-        args[1].assert_called_once_with(
-            os_env_file=self.rc_file, proxy_settings_str=None,
-            ssh_proxy_cmd=None)
-
-    @mock.patch('snaps.openstack.tests.openstack_tests.get_credentials',
-                return_value=None)
-    @mock.patch('functest.ci.check_deployment.CheckDeployment.check_rc')
-    def test_check_all_exc3(self, *args):
-        with self.assertRaises(Exception):
-            self.deployment.check_all()
-        args[0].assert_called_once_with()
-        args[1].assert_called_once_with(
-            os_env_file=self.rc_file, proxy_settings_str=None,
-            ssh_proxy_cmd=None)
-
-    @mock.patch('functest.ci.check_deployment.CheckDeployment.check_ext_net')
-    @mock.patch('functest.ci.check_deployment.CheckDeployment.check_glance')
-    @mock.patch('functest.ci.check_deployment.CheckDeployment.check_neutron')
-    @mock.patch('functest.ci.check_deployment.CheckDeployment.check_nova')
-    @mock.patch(
-        'functest.ci.check_deployment.CheckDeployment.check_service_endpoint')
-    @mock.patch(
-        'functest.ci.check_deployment.CheckDeployment.check_public_endpoint')
-    @mock.patch(
-        'functest.ci.check_deployment.CheckDeployment.check_auth_endpoint')
-    @mock.patch('snaps.openstack.tests.openstack_tests.get_credentials')
-    @mock.patch('functest.ci.check_deployment.CheckDeployment.check_rc')
-    def test_check_all(self, *args):
-        self.assertEqual(self.deployment.check_all(), 0)
-        for i in [0, 2, 3, 5, 6, 7, 8]:
-            args[i].assert_called_once_with()
-        args[1].assert_called_once_with(
-            os_env_file=self.rc_file, proxy_settings_str=None,
-            ssh_proxy_cmd=None)
-        calls = [mock.call('compute'), mock.call('network'),
-                 mock.call('image')]
-        args[4].assert_has_calls(calls)
-
-
-if __name__ == "__main__":
-    logging.disable(logging.CRITICAL)
-    unittest.main(verbosity=2)
diff --git a/functest/tests/unit/cli/__init__.py b/functest/tests/unit/cli/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/functest/tests/unit/cli/__init__.py
+++ /dev/null
diff --git a/functest/tests/unit/cli/commands/__init__.py b/functest/tests/unit/cli/commands/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/functest/tests/unit/cli/commands/__init__.py
+++ /dev/null
diff --git a/functest/tests/unit/cli/commands/test_cli_env.py b/functest/tests/unit/cli/commands/test_cli_env.py
deleted file mode 100644
index 7d6f7787..00000000
--- a/functest/tests/unit/cli/commands/test_cli_env.py
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/env python
-
-# 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
-
-# pylint: disable=missing-docstring
-
-import logging
-import os
-import re
-import unittest
-
-import mock
-
-from functest.cli.commands import cli_env
-
-
-class RegexMatch(object):  # pylint: disable=too-few-public-methods
-    def __init__(self, msg):
-        self.msg = msg
-
-    def __eq__(self, other):
-        match = re.search(self.msg, other)
-        return match is not None
-
-
-class CliEnvTesting(unittest.TestCase):
-
-    def setUp(self):
-        self.cli_environ = cli_env.CliEnv()
-
-    def _test_show_missing_env_var(self, var, *args):
-        # pylint: disable=unused-argument
-        if var == 'INSTALLER_TYPE':
-            os.environ['INSTALLER_TYPE'] = ''
-            reg_string = r"|  INSTALLER: Unknown, \S+\s*|"
-        elif var == 'SCENARIO':
-            os.environ['DEPLOY_SCENARIO'] = ''
-            reg_string = r"|   SCENARIO: Unknown\s*|"
-        elif var == 'NODE':
-            os.environ['NODE_NAME'] = ''
-            reg_string = r"|        POD: Unknown\s*|"
-        elif var == 'BUILD_TAG':
-            os.environ['BUILD_TAG'] = ''
-            reg_string = r"|  BUILD TAG: None|"
-
-        with mock.patch('functest.cli.commands.cli_env.click.echo') \
-                as mock_click_echo:
-            self.cli_environ.show()
-            mock_click_echo.assert_called_with(RegexMatch(reg_string))
-
-    def test_show_ci_installer_type_ko(self, *args):
-        self._test_show_missing_env_var('INSTALLER_TYPE', *args)
-
-    def test_show_missing_ci_scenario(self, *args):
-        self._test_show_missing_env_var('SCENARIO', *args)
-
-    def test_show_missing_ci_node(self, *args):
-        self._test_show_missing_env_var('NODE', *args)
-
-    def test_show_missing_ci_build_tag(self, *args):
-        self._test_show_missing_env_var('BUILD_TAG', *args)
-
-
-if __name__ == "__main__":
-    logging.disable(logging.CRITICAL)
-    unittest.main(verbosity=2)
diff --git a/functest/tests/unit/cli/commands/test_cli_os.py b/functest/tests/unit/cli/commands/test_cli_os.py
deleted file mode 100644
index a5e562a2..00000000
--- a/functest/tests/unit/cli/commands/test_cli_os.py
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env python
-#
-# jose.lausuch@ericsson.com
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-
-# pylint: disable=missing-docstring
-
-import logging
-import unittest
-import os
-
-import mock
-
-from functest.cli.commands import cli_os
-
-
-class CliOpenStackTesting(unittest.TestCase):
-
-    def setUp(self):
-        self.endpoint_ip = 'test_ip'
-        self.os_auth_url = 'http://test_ip:test_port/v2.0'
-        self.installer_type = 'test_installer_type'
-        self.openstack_creds = 'test_env_file'
-        self.snapshot_file = 'test_snapshot_file'
-        os.environ["OS_AUTH_URL"] = ''
-        self.cli_os = cli_os.CliOpenStack()
-
-    def test_ping_endpoint_default(self):
-        self.cli_os.os_auth_url = self.os_auth_url
-        self.cli_os.endpoint_ip = self.endpoint_ip
-        with mock.patch('functest.cli.commands.cli_os.os.system',
-                        return_value=0):
-            self.assertEqual(self.cli_os.ping_endpoint(), 0)
-
-    @mock.patch('functest.cli.commands.cli_os.exit', side_effect=Exception)
-    @mock.patch('functest.cli.commands.cli_os.click.echo')
-    def test_ping_endpoint_auth_url_ko(self, mock_click_echo, mock_exit):
-        with self.assertRaises(Exception):
-            self.cli_os.os_auth_url = None
-            self.cli_os.ping_endpoint()
-        mock_click_echo.assert_called_once_with(
-            "Source the OpenStack credentials first")
-        mock_exit.assert_called_once_with(0)
-
-    @mock.patch('functest.cli.commands.cli_os.exit')
-    @mock.patch('functest.cli.commands.cli_os.click.echo')
-    def test_ping_endpoint_system_fails(self, mock_click_echo, mock_exit):
-        self.cli_os.os_auth_url = self.os_auth_url
-        self.cli_os.endpoint_ip = self.endpoint_ip
-        with mock.patch('functest.cli.commands.cli_os.os.system',
-                        return_value=1):
-            self.cli_os.ping_endpoint()
-            mock_click_echo.assert_called_once_with(
-                "Cannot talk to the endpoint %s\n" % self.endpoint_ip)
-            mock_exit.assert_called_once_with(0)
-
-    def test_check(self):
-        with mock.patch.object(self.cli_os, 'ping_endpoint'), \
-            mock.patch('functest.cli.commands.cli_os.check_deployment.'
-                       'CheckDeployment') as mock_check_deployment:
-            self.cli_os.check()
-            self.assertTrue(mock_check_deployment.called)
-
-    @mock.patch('functest.cli.commands.cli_os.click.echo')
-    def test_show_credentials(self, mock_click_echo):
-        key = 'OS_KEY'
-        value = 'OS_VALUE'
-        with mock.patch.dict(os.environ, {key: value}):
-            self.cli_os.show_credentials()
-            mock_click_echo.assert_any_call("{}={}".format(key, value))
-
-
-if __name__ == "__main__":
-    logging.disable(logging.CRITICAL)
-    unittest.main(verbosity=2)
diff --git a/functest/tests/unit/cli/commands/test_cli_testcase.py b/functest/tests/unit/cli/commands/test_cli_testcase.py
deleted file mode 100644
index 30e55fac..00000000
--- a/functest/tests/unit/cli/commands/test_cli_testcase.py
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/bin/env python
-
-# 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
-
-# pylint: disable=missing-docstring
-
-import logging
-import unittest
-
-import mock
-
-from functest.cli.commands import cli_testcase
-
-
-class CliTestCasesTesting(unittest.TestCase):
-
-    def setUp(self):
-        self.testname = 'testname'
-        with mock.patch('functest.ci.tier_builder'):
-            self.cli_tests = cli_testcase.CliTestcase()
-
-    @mock.patch('functest.utils.functest_utils.execute_command')
-    def test_run_default(self, mock_ft_utils):
-        cmd = "run_tests -n -r -t {}".format(self.testname)
-        self.cli_tests.run(self.testname, noclean=True, report=True)
-        mock_ft_utils.assert_called_with(cmd)
-
-    @mock.patch('functest.utils.functest_utils.execute_command')
-    def test_run_noclean_missing_report(self, mock_ft_utils):
-        cmd = "run_tests -n -t {}".format(self.testname)
-        self.cli_tests.run(self.testname, noclean=True, report=False)
-        mock_ft_utils.assert_called_with(cmd)
-
-    @mock.patch('functest.utils.functest_utils.execute_command')
-    def test_run_report_missing_noclean(self, mock_ft_utils):
-        cmd = "run_tests -r -t {}".format(self.testname)
-        self.cli_tests.run(self.testname, noclean=False, report=True)
-        mock_ft_utils.assert_called_with(cmd)
-
-    @mock.patch('functest.utils.functest_utils.execute_command')
-    def test_run_missing_noclean_report(self, mock_ft_utils):
-        cmd = "run_tests -t {}".format(self.testname)
-        self.cli_tests.run(self.testname, noclean=False, report=False)
-        mock_ft_utils.assert_called_with(cmd)
-
-    @mock.patch('functest.cli.commands.cli_testcase.click.echo')
-    def test_list(self, mock_click_echo):
-        with mock.patch.object(self.cli_tests.tiers, 'get_tiers',
-                               return_value=[]):
-            self.cli_tests.list()
-            mock_click_echo.assert_called_with("")
-
-    @mock.patch('functest.cli.commands.cli_testcase.click.echo')
-    def test_show_default_desc_none(self, mock_click_echo):
-        with mock.patch.object(self.cli_tests.tiers, 'get_test',
-                               return_value=None):
-            self.cli_tests.show(self.testname)
-            mock_click_echo.assert_any_call("The test case '%s' "
-                                            "does not exist or is"
-                                            " not supported."
-                                            % self.testname)
-
-    @mock.patch('functest.cli.commands.cli_testcase.click.echo')
-    def test_show_default(self, mock_click_echo):
-        mock_obj = mock.Mock()
-        with mock.patch.object(self.cli_tests.tiers, 'get_test',
-                               return_value=mock_obj):
-            self.cli_tests.show(self.testname)
-            mock_click_echo.assert_called_with(mock_obj)
-
-
-if __name__ == "__main__":
-    logging.disable(logging.CRITICAL)
-    unittest.main(verbosity=2)
diff --git a/functest/tests/unit/cli/commands/test_cli_tier.py b/functest/tests/unit/cli/commands/test_cli_tier.py
deleted file mode 100644
index f81ad31d..00000000
--- a/functest/tests/unit/cli/commands/test_cli_tier.py
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/usr/bin/env python
-
-# 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
-
-# pylint: disable=missing-docstring
-
-import logging
-import unittest
-
-import mock
-
-from functest.cli.commands import cli_tier
-
-
-class CliTierTesting(unittest.TestCase):
-
-    def setUp(self):
-        self.tiername = 'tiername'
-        self.testnames = 'testnames'
-        with mock.patch('functest.ci.tier_builder'):
-            self.cli_tier = cli_tier.CliTier()
-
-    @mock.patch('functest.cli.commands.cli_tier.click.echo')
-    def test_list(self, mock_click_echo):
-        with mock.patch.object(self.cli_tier.tiers, 'get_tiers',
-                               return_value=[]):
-            self.cli_tier.list()
-            mock_click_echo.assert_called_with("")
-
-    @mock.patch('functest.cli.commands.cli_tier.click.echo')
-    def test_show_default(self, mock_click_echo):
-        with mock.patch.object(self.cli_tier.tiers, 'get_tier',
-                               return_value=self.tiername):
-            self.cli_tier.show(self.tiername)
-            mock_click_echo.assert_called_with(self.tiername)
-
-    @mock.patch('functest.cli.commands.cli_tier.click.echo')
-    def test_show_missing_tier(self, mock_click_echo):
-        with mock.patch.object(self.cli_tier.tiers, 'get_tier',
-                               return_value=None), \
-            mock.patch.object(self.cli_tier.tiers, 'get_tier_names',
-                              return_value='tiernames'):
-            self.cli_tier.show(self.tiername)
-            mock_click_echo.assert_called_with("The tier with name '%s' does "
-                                               "not exist. Available tiers are"
-                                               ":\n  %s\n" % (self.tiername,
-                                                              'tiernames'))
-
-    @mock.patch('functest.cli.commands.cli_tier.click.echo')
-    def test_gettests_default(self, mock_click_echo):
-        mock_obj = mock.Mock()
-        attrs = {'get_test_names.return_value': self.testnames}
-        mock_obj.configure_mock(**attrs)
-
-        with mock.patch.object(self.cli_tier.tiers, 'get_tier',
-                               return_value=mock_obj):
-            self.cli_tier.gettests(self.tiername)
-            mock_click_echo.assert_called_with(
-                "Test cases in tier '%s':\n %s\n" % (
-                    self.tiername, self.testnames))
-
-    @mock.patch('functest.cli.commands.cli_tier.click.echo')
-    def test_gettests_missing_tier(self, mock_click_echo):
-        with mock.patch.object(self.cli_tier.tiers, 'get_tier',
-                               return_value=None), \
-            mock.patch.object(self.cli_tier.tiers, 'get_tier_names',
-                              return_value='tiernames'):
-            self.cli_tier.gettests(self.tiername)
-            mock_click_echo.assert_called_with("The tier with name '%s' does "
-                                               "not exist. Available tiers are"
-                                               ":\n  %s\n" % (self.tiername,
-                                                              'tiernames'))
-
-    @mock.patch('functest.utils.functest_utils.execute_command')
-    def test_run_default(self, mock_ft_utils):
-        cmd = "run_tests -n -r -t {}".format(self.tiername)
-        self.cli_tier.run(self.tiername, noclean=True, report=True)
-        mock_ft_utils.assert_called_with(cmd)
-
-    @mock.patch('functest.utils.functest_utils.execute_command')
-    def test_run_report_missing_noclean(self, mock_ft_utils):
-        cmd = "run_tests -r -t {}".format(self.tiername)
-        self.cli_tier.run(self.tiername, noclean=False, report=True)
-        mock_ft_utils.assert_called_with(cmd)
-
-    @mock.patch('functest.utils.functest_utils.execute_command')
-    def test_run_noclean_missing_report(self, mock_ft_utils):
-        cmd = "run_tests -n -t {}".format(self.tiername)
-        self.cli_tier.run(self.tiername, noclean=True, report=False)
-        mock_ft_utils.assert_called_with(cmd)
-
-    @mock.patch('functest.utils.functest_utils.execute_command')
-    def test_run_missing_noclean_report(self, mock_ft_utils):
-        cmd = "run_tests -t {}".format(self.tiername)
-        self.cli_tier.run(self.tiername, noclean=False, report=False)
-        mock_ft_utils.assert_called_with(cmd)
-
-
-if __name__ == "__main__":
-    logging.disable(logging.CRITICAL)
-    unittest.main(verbosity=2)
diff --git a/functest/tests/unit/cli/test_cli_base.py b/functest/tests/unit/cli/test_cli_base.py
deleted file mode 100644
index 185a5220..00000000
--- a/functest/tests/unit/cli/test_cli_base.py
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2016 Orange 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
-
-# pylint: disable=missing-docstring
-
-import logging
-import os
-import unittest
-
-import mock
-from click.testing import CliRunner
-
-with mock.patch('functest.cli.commands.cli_testcase.CliTestcase.__init__',
-                mock.Mock(return_value=None)), \
-    mock.patch('functest.cli.commands.cli_tier.CliTier.__init__',
-               mock.Mock(return_value=None)):
-    os.environ['OS_AUTH_URL'] = ''
-    from functest.cli import cli_base
-
-
-class CliBaseTesting(unittest.TestCase):
-
-    def setUp(self):
-        self.runner = CliRunner()
-        self._openstack = cli_base.OPENSTACK
-        self._env = cli_base.ENV
-        self._testcase = cli_base.TESTCASE
-        self._tier = cli_base.TIER
-
-    def test_os_check(self):
-        with mock.patch.object(self._openstack, 'check') as mock_method:
-            result = self.runner.invoke(cli_base.os_check)
-            self.assertEqual(result.exit_code, 0)
-            self.assertTrue(mock_method.called)
-
-    def test_os_show_credentials(self):
-        with mock.patch.object(self._openstack, 'show_credentials') \
-                as mock_method:
-            result = self.runner.invoke(cli_base.os_show_credentials)
-            self.assertEqual(result.exit_code, 0)
-            self.assertTrue(mock_method.called)
-
-    def test_env_show(self):
-        with mock.patch.object(self._env, 'show') as mock_method:
-            result = self.runner.invoke(cli_base.env_show)
-            self.assertEqual(result.exit_code, 0)
-            self.assertTrue(mock_method.called)
-
-    def test_testcase_list(self):
-        with mock.patch.object(self._testcase, 'list') as mock_method:
-            result = self.runner.invoke(cli_base.testcase_list)
-            self.assertEqual(result.exit_code, 0)
-            self.assertTrue(mock_method.called)
-
-    def test_testcase_show(self):
-        with mock.patch.object(self._testcase, 'show') as mock_method:
-            result = self.runner.invoke(cli_base.testcase_show, ['testname'])
-            self.assertEqual(result.exit_code, 0)
-            self.assertTrue(mock_method.called)
-
-    def test_testcase_run(self):
-        with mock.patch.object(self._testcase, 'run') as mock_method:
-            result = self.runner.invoke(cli_base.testcase_run,
-                                        ['testname', '--noclean'])
-            self.assertEqual(result.exit_code, 0)
-            self.assertTrue(mock_method.called)
-
-    def test_tier_list(self):
-        with mock.patch.object(self._tier, 'list') as mock_method:
-            result = self.runner.invoke(cli_base.tier_list)
-            self.assertEqual(result.exit_code, 0)
-            self.assertTrue(mock_method.called)
-
-    def test_tier_show(self):
-        with mock.patch.object(self._tier, 'show') as mock_method:
-            result = self.runner.invoke(cli_base.tier_show, ['tiername'])
-            self.assertEqual(result.exit_code, 0)
-            self.assertTrue(mock_method.called)
-
-    def test_tier_gettests(self):
-        with mock.patch.object(self._tier, 'gettests') as mock_method:
-            result = self.runner.invoke(cli_base.tier_gettests, ['tiername'])
-            self.assertEqual(result.exit_code, 0)
-            self.assertTrue(mock_method.called)
-
-    def test_tier_run(self):
-        with mock.patch.object(self._tier, 'run') as mock_method:
-            result = self.runner.invoke(cli_base.tier_run,
-                                        ['tiername', '--noclean'])
-            self.assertEqual(result.exit_code, 0)
-            self.assertTrue(mock_method.called)
-
-
-if __name__ == "__main__":
-    logging.disable(logging.CRITICAL)
-    unittest.main(verbosity=2)
diff --git a/functest/tests/unit/odl/__init__.py b/functest/tests/unit/odl/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/functest/tests/unit/odl/__init__.py
+++ /dev/null
diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py
deleted file mode 100644
index 65784ae5..00000000
--- a/functest/tests/unit/odl/test_odl.py
+++ /dev/null
@@ -1,523 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2016 Orange 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
-
-"""Define the classes required to fully cover odl."""
-
-import logging
-import os
-import unittest
-
-import mock
-from robot.errors import RobotError
-import six
-from six.moves import urllib
-
-from functest.core import testcase
-from functest.opnfv_tests.sdn.odl import odl
-
-__author__ = "Cedric Ollivier <cedric.ollivier@orange.com>"
-
-
-class ODLTesting(unittest.TestCase):
-
-    """The super class which testing classes could inherit."""
-    # pylint: disable=missing-docstring
-
-    logging.disable(logging.CRITICAL)
-
-    _keystone_ip = "127.0.0.1"
-    _neutron_url = u"https://127.0.0.1:9696"
-    _sdn_controller_ip = "127.0.0.3"
-    _os_auth_url = "http://{}:5000/v3".format(_keystone_ip)
-    _os_projectname = "admin"
-    _os_username = "admin"
-    _os_password = "admin"
-    _odl_webport = "8080"
-    _odl_restconfport = "8181"
-    _odl_username = "admin"
-    _odl_password = "admin"
-    _os_userdomainname = 'Default'
-    _os_projectdomainname = 'Default'
-
-    def setUp(self):
-        for var in ("INSTALLER_TYPE", "SDN_CONTROLLER", "SDN_CONTROLLER_IP"):
-            if var in os.environ:
-                del os.environ[var]
-        os.environ["OS_AUTH_URL"] = self._os_auth_url
-        os.environ["OS_USERNAME"] = self._os_username
-        os.environ["OS_USER_DOMAIN_NAME"] = self._os_userdomainname
-        os.environ["OS_PASSWORD"] = self._os_password
-        os.environ["OS_PROJECT_NAME"] = self._os_projectname
-        os.environ["OS_PROJECT_DOMAIN_NAME"] = self._os_projectdomainname
-        os.environ["OS_PASSWORD"] = self._os_password
-        self.test = odl.ODLTests(case_name='odl', project_name='functest')
-        self.defaultargs = {'odlusername': self._odl_username,
-                            'odlpassword': self._odl_password,
-                            'neutronurl': "http://{}:9696".format(
-                                self._keystone_ip),
-                            'osauthurl': self._os_auth_url,
-                            'osusername': self._os_username,
-                            'osuserdomainname': self._os_userdomainname,
-                            'osprojectname': self._os_projectname,
-                            'osprojectdomainname': self._os_projectdomainname,
-                            'ospassword': self._os_password,
-                            'odlip': self._keystone_ip,
-                            'odlwebport': self._odl_webport,
-                            'odlrestconfport': self._odl_restconfport,
-                            'pushtodb': False}
-
-
-class ODLRobotTesting(ODLTesting):
-
-    """The class testing ODLTests.set_robotframework_vars()."""
-    # pylint: disable=missing-docstring
-
-    @mock.patch('fileinput.input', side_effect=Exception())
-    def test_set_vars_ko(self, mock_method):
-        self.assertFalse(self.test.set_robotframework_vars())
-        mock_method.assert_called_once_with(
-            os.path.join(odl.ODLTests.odl_test_repo,
-                         'csit/variables/Variables.robot'), inplace=True)
-
-    @mock.patch('fileinput.input', return_value=[])
-    def test_set_vars_empty(self, mock_method):
-        self.assertTrue(self.test.set_robotframework_vars())
-        mock_method.assert_called_once_with(
-            os.path.join(odl.ODLTests.odl_test_repo,
-                         'csit/variables/Variables.robot'), inplace=True)
-
-    @mock.patch('sys.stdout', new_callable=six.StringIO)
-    def _test_set_vars(self, msg1, msg2, *args):
-        line = mock.MagicMock()
-        line.__iter__.return_value = [msg1]
-        with mock.patch('fileinput.input', return_value=line) as mock_method:
-            self.assertTrue(self.test.set_robotframework_vars())
-            mock_method.assert_called_once_with(
-                os.path.join(odl.ODLTests.odl_test_repo,
-                             'csit/variables/Variables.robot'), inplace=True)
-            self.assertEqual(args[0].getvalue(), "{}\n".format(msg2))
-
-    def test_set_vars_auth_default(self):
-        self._test_set_vars(
-            "@{AUTH} ",
-            "@{AUTH}           admin    admin")
-
-    def test_set_vars_auth1(self):
-        self._test_set_vars(
-            "@{AUTH1}           foo    bar",
-            "@{AUTH1}           foo    bar")
-
-    @mock.patch('sys.stdout', new_callable=six.StringIO)
-    def test_set_vars_auth_foo(self, *args):
-        line = mock.MagicMock()
-        line.__iter__.return_value = ["@{AUTH} "]
-        with mock.patch('fileinput.input', return_value=line) as mock_method:
-            self.assertTrue(self.test.set_robotframework_vars('foo', 'bar'))
-            mock_method.assert_called_once_with(
-                os.path.join(odl.ODLTests.odl_test_repo,
-                             'csit/variables/Variables.robot'), inplace=True)
-            self.assertEqual(
-                args[0].getvalue(),
-                "@{AUTH}           foo    bar\n")
-
-
-class ODLMainTesting(ODLTesting):
-
-    """The class testing ODLTests.run_suites()."""
-    # pylint: disable=missing-docstring
-
-    def _get_run_suites_kwargs(self, key=None):
-        kwargs = {'odlusername': self._odl_username,
-                  'odlpassword': self._odl_password,
-                  'neutronurl': self._neutron_url,
-                  'osauthurl': self._os_auth_url,
-                  'osusername': self._os_username,
-                  'osuserdomainname': self._os_userdomainname,
-                  'osprojectname': self._os_projectname,
-                  'osprojectdomainname': self._os_projectdomainname,
-                  'ospassword': self._os_password,
-                  'odlip': self._sdn_controller_ip,
-                  'odlwebport': self._odl_webport,
-                  'odlrestconfport': self._odl_restconfport}
-        if key:
-            del kwargs[key]
-        return kwargs
-
-    def _test_run_suites(self, status, *args):
-        kwargs = self._get_run_suites_kwargs()
-        self.assertEqual(self.test.run_suites(**kwargs), status)
-        if args:
-            args[0].assert_called_once_with(self.test.odl_variables_file)
-        if len(args) > 1:
-            variable = [
-                'KEYSTONEURL:{}://{}'.format(
-                    urllib.parse.urlparse(self._os_auth_url).scheme,
-                    urllib.parse.urlparse(self._os_auth_url).netloc),
-                'NEUTRONURL:{}'.format(self._neutron_url),
-                'OS_AUTH_URL:"{}"'.format(self._os_auth_url),
-                'OSUSERNAME:"{}"'.format(self._os_username),
-                'OSUSERDOMAINNAME:"{}"'.format(self._os_userdomainname),
-                'OSTENANTNAME:"{}"'.format(self._os_projectname),
-                'OSPROJECTDOMAINNAME:"{}"'.format(self._os_projectdomainname),
-                'OSPASSWORD:"{}"'.format(self._os_password),
-                'ODL_SYSTEM_IP:{}'.format(self._sdn_controller_ip),
-                'PORT:{}'.format(self._odl_webport),
-                'RESTCONFPORT:{}'.format(self._odl_restconfport)]
-            args[1].assert_called_once_with(
-                odl.ODLTests.basic_suite_dir, odl.ODLTests.neutron_suite_dir,
-                log='NONE',
-                output=os.path.join(self.test.res_dir, 'output.xml'),
-                report='NONE', stdout=mock.ANY, variable=variable,
-                variablefile=[])
-
-    def _test_no_keyword(self, key):
-        kwargs = self._get_run_suites_kwargs(key)
-        self.assertEqual(self.test.run_suites(**kwargs),
-                         testcase.TestCase.EX_RUN_ERROR)
-
-    def test_no_odlusername(self):
-        self._test_no_keyword('odlusername')
-
-    def test_no_odlpassword(self):
-        self._test_no_keyword('odlpassword')
-
-    def test_no_neutronurl(self):
-        self._test_no_keyword('neutronurl')
-
-    def test_no_osauthurl(self):
-        self._test_no_keyword('osauthurl')
-
-    def test_no_osusername(self):
-        self._test_no_keyword('osusername')
-
-    def test_no_osprojectname(self):
-        self._test_no_keyword('osprojectname')
-
-    def test_no_ospassword(self):
-        self._test_no_keyword('ospassword')
-
-    def test_no_odlip(self):
-        self._test_no_keyword('odlip')
-
-    def test_no_odlwebport(self):
-        self._test_no_keyword('odlwebport')
-
-    def test_no_odlrestconfport(self):
-        self._test_no_keyword('odlrestconfport')
-
-    @mock.patch('os.path.isfile', return_value=True)
-    def test_set_vars_ko(self, *args):
-        with mock.patch.object(self.test, 'set_robotframework_vars',
-                               return_value=False) as mock_object:
-            self._test_run_suites(testcase.TestCase.EX_RUN_ERROR)
-            mock_object.assert_called_once_with(
-                self._odl_username, self._odl_password)
-        args[0].assert_called_once_with(self.test.odl_variables_file)
-
-    @mock.patch('robot.run', side_effect=RobotError)
-    @mock.patch('os.path.isfile', return_value=True)
-    def test_run_ko(self, *args):
-        with mock.patch.object(self.test, 'set_robotframework_vars',
-                               return_value=True), \
-                self.assertRaises(RobotError):
-            self._test_run_suites(testcase.TestCase.EX_RUN_ERROR, *args)
-
-    @mock.patch('robot.run')
-    @mock.patch('os.path.isfile', return_value=True)
-    def test_parse_results_ko(self, *args):
-        with mock.patch.object(self.test, 'set_robotframework_vars',
-                               return_value=True), \
-                mock.patch.object(self.test, 'parse_results',
-                                  side_effect=RobotError):
-            self._test_run_suites(testcase.TestCase.EX_RUN_ERROR, *args)
-
-    @mock.patch('robot.run')
-    @mock.patch('os.path.isfile', return_value=True)
-    def test_ok(self, *args):
-        with mock.patch.object(self.test, 'set_robotframework_vars',
-                               return_value=True), \
-                mock.patch.object(self.test, 'parse_results'):
-            self._test_run_suites(testcase.TestCase.EX_OK, *args)
-
-    @mock.patch('robot.run')
-    @mock.patch('os.path.isfile', return_value=False)
-    def test_ok_no_creds(self, *args):
-        with mock.patch.object(self.test, 'set_robotframework_vars',
-                               return_value=True) as mock_method, \
-                mock.patch.object(self.test, 'parse_results'):
-            self._test_run_suites(testcase.TestCase.EX_OK, *args)
-            mock_method.assert_not_called()
-
-    @mock.patch('robot.run', return_value=1)
-    @mock.patch('os.path.isfile', return_value=True)
-    def test_testcases_in_failure(self, *args):
-        with mock.patch.object(self.test, 'set_robotframework_vars',
-                               return_value=True), \
-                mock.patch.object(self.test, 'parse_results'):
-            self._test_run_suites(testcase.TestCase.EX_OK, *args)
-
-
-class ODLRunTesting(ODLTesting):
-
-    """The class testing ODLTests.run()."""
-    # pylint: disable=missing-docstring
-
-    @mock.patch('snaps.openstack.utils.keystone_utils.get_endpoint',
-                return_value=ODLTesting._neutron_url)
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
-                'get_credentials')
-    def _test_no_env_var(self, var, *args):
-        del os.environ[var]
-        self.assertEqual(self.test.run(), testcase.TestCase.EX_RUN_ERROR)
-        args[0].assert_called_once_with()
-        args[1].assert_called_once_with(mock.ANY, 'network')
-
-    @mock.patch('snaps.openstack.utils.keystone_utils.get_endpoint',
-                return_value=ODLTesting._neutron_url)
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
-                'get_credentials')
-    def _test_missing_value(self, *args):
-        self.assertEqual(self.test.run(), testcase.TestCase.EX_RUN_ERROR)
-        args[0].assert_called_once_with()
-        args[1].assert_called_once_with(mock.ANY, 'network')
-
-    @mock.patch('snaps.openstack.utils.keystone_utils.get_endpoint',
-                return_value=ODLTesting._neutron_url)
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
-                'get_credentials')
-    def _test_run(self, status=testcase.TestCase.EX_OK,
-                  exception=None, *args, **kwargs):
-        odlip = kwargs['odlip'] if 'odlip' in kwargs else '127.0.0.3'
-        odlwebport = kwargs['odlwebport'] if 'odlwebport' in kwargs else '8080'
-        odlrestconfport = (kwargs['odlrestconfport']
-                           if 'odlrestconfport' in kwargs else '8181')
-        if exception:
-            self.test.run_suites = mock.Mock(side_effect=exception)
-        else:
-            self.test.run_suites = mock.Mock(return_value=status)
-        self.assertEqual(self.test.run(), status)
-        self.test.run_suites.assert_called_once_with(
-            odl.ODLTests.default_suites, neutronurl=self._neutron_url,
-            odlip=odlip, odlpassword=self._odl_password,
-            odlrestconfport=odlrestconfport, odlusername=self._odl_username,
-            odlwebport=odlwebport, osauthurl=self._os_auth_url,
-            ospassword=self._os_password, osprojectname=self._os_projectname,
-            osusername=self._os_username,
-            osprojectdomainname=self._os_projectdomainname,
-            osuserdomainname=self._os_userdomainname)
-        args[0].assert_called_once_with()
-        args[1].assert_called_once_with(mock.ANY, 'network')
-
-    @mock.patch('snaps.openstack.utils.keystone_utils.get_endpoint',
-                return_value=ODLTesting._neutron_url)
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
-                'get_credentials')
-    def _test_multiple_suites(self, suites,
-                              status=testcase.TestCase.EX_OK, *args, **kwargs):
-        odlip = kwargs['odlip'] if 'odlip' in kwargs else '127.0.0.3'
-        odlwebport = kwargs['odlwebport'] if 'odlwebport' in kwargs else '8080'
-        odlrestconfport = (kwargs['odlrestconfport']
-                           if 'odlrestconfport' in kwargs else '8181')
-        self.test.run_suites = mock.Mock(return_value=status)
-        self.assertEqual(self.test.run(suites=suites), status)
-        self.test.run_suites.assert_called_once_with(
-            suites, neutronurl=self._neutron_url, odlip=odlip,
-            odlpassword=self._odl_password, odlrestconfport=odlrestconfport,
-            odlusername=self._odl_username, odlwebport=odlwebport,
-            osauthurl=self._os_auth_url, ospassword=self._os_password,
-            osprojectname=self._os_projectname, osusername=self._os_username,
-            osprojectdomainname=self._os_projectdomainname,
-            osuserdomainname=self._os_userdomainname)
-        args[0].assert_called_once_with()
-        args[1].assert_called_once_with(mock.ANY, 'network')
-
-    def test_exc(self):
-        with mock.patch('snaps.openstack.utils.keystone_utils.get_endpoint',
-                        side_effect=Exception()):
-            self.assertEqual(self.test.run(),
-                             testcase.TestCase.EX_RUN_ERROR)
-
-    def test_no_os_auth_url(self):
-        self._test_no_env_var("OS_AUTH_URL")
-
-    def test_no_os_username(self):
-        self._test_no_env_var("OS_USERNAME")
-
-    def test_no_os_password(self):
-        self._test_no_env_var("OS_PASSWORD")
-
-    def test_no_os__name(self):
-        self._test_no_env_var("OS_PROJECT_NAME")
-
-    def test_run_suites_false(self):
-        os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip
-        self._test_run(testcase.TestCase.EX_RUN_ERROR, None,
-                       odlip=self._sdn_controller_ip,
-                       odlwebport=self._odl_webport)
-
-    def test_run_suites_exc(self):
-        with self.assertRaises(Exception):
-            os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip
-            self._test_run(testcase.TestCase.EX_RUN_ERROR,
-                           Exception(),
-                           odlip=self._sdn_controller_ip,
-                           odlwebport=self._odl_webport)
-
-    def test_no_sdn_controller_ip(self):
-        self._test_missing_value()
-
-    def test_without_installer_type(self):
-        os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip
-        self._test_run(testcase.TestCase.EX_OK, None,
-                       odlip=self._sdn_controller_ip,
-                       odlwebport=self._odl_webport)
-
-    def test_suites(self):
-        os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip
-        self._test_multiple_suites(
-            [odl.ODLTests.basic_suite_dir],
-            testcase.TestCase.EX_OK,
-            odlip=self._sdn_controller_ip,
-            odlwebport=self._odl_webport)
-
-    def test_fuel(self):
-        os.environ["INSTALLER_TYPE"] = "fuel"
-        self._test_run(testcase.TestCase.EX_OK, None,
-                       odlip=urllib.parse.urlparse(self._neutron_url).hostname,
-                       odlwebport='8181',
-                       odlrestconfport='8282')
-
-    def test_apex_no_controller_ip(self):
-        os.environ["INSTALLER_TYPE"] = "apex"
-        self._test_missing_value()
-
-    def test_apex(self):
-        os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip
-        os.environ["INSTALLER_TYPE"] = "apex"
-        self._test_run(testcase.TestCase.EX_OK, None,
-                       odlip=self._sdn_controller_ip, odlwebport='8081',
-                       odlrestconfport='8081')
-
-    def test_netvirt_no_controller_ip(self):
-        os.environ["INSTALLER_TYPE"] = "netvirt"
-        self._test_missing_value()
-
-    def test_netvirt(self):
-        os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip
-        os.environ["INSTALLER_TYPE"] = "netvirt"
-        self._test_run(testcase.TestCase.EX_OK, None,
-                       odlip=self._sdn_controller_ip, odlwebport='8081',
-                       odlrestconfport='8081')
-
-    def test_compass(self):
-        os.environ["INSTALLER_TYPE"] = "compass"
-        self._test_run(testcase.TestCase.EX_OK, None,
-                       odlip=urllib.parse.urlparse(self._neutron_url).hostname,
-                       odlrestconfport='8080')
-
-    def test_daisy_no_controller_ip(self):
-        os.environ["INSTALLER_TYPE"] = "daisy"
-        self._test_missing_value()
-
-    def test_daisy(self):
-        os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip
-        os.environ["INSTALLER_TYPE"] = "daisy"
-        self._test_run(testcase.TestCase.EX_OK, None,
-                       odlip=self._sdn_controller_ip, odlwebport='8181',
-                       odlrestconfport='8087')
-
-
-class ODLArgParserTesting(ODLTesting):
-
-    """The class testing ODLParser."""
-    # pylint: disable=missing-docstring
-
-    def setUp(self):
-        self.parser = odl.ODLParser()
-        super(ODLArgParserTesting, self).setUp()
-
-    def test_default(self):
-        self.assertEqual(self.parser.parse_args(), self.defaultargs)
-
-    def test_basic(self):
-        self.defaultargs['neutronurl'] = self._neutron_url
-        self.defaultargs['odlip'] = self._sdn_controller_ip
-        self.assertEqual(
-            self.parser.parse_args(
-                ["--neutronurl={}".format(self._neutron_url),
-                 "--odlip={}".format(self._sdn_controller_ip)]),
-            self.defaultargs)
-
-    @mock.patch('sys.stderr', new_callable=six.StringIO)
-    def test_fail(self, mock_method):
-        self.defaultargs['foo'] = 'bar'
-        with self.assertRaises(SystemExit):
-            self.parser.parse_args(["--foo=bar"])
-        self.assertTrue(mock_method.getvalue().startswith("usage:"))
-
-    def _test_arg(self, arg, value):
-        self.defaultargs[arg] = value
-        self.assertEqual(
-            self.parser.parse_args(["--{}={}".format(arg, value)]),
-            self.defaultargs)
-
-    def test_odlusername(self):
-        self._test_arg('odlusername', 'foo')
-
-    def test_odlpassword(self):
-        self._test_arg('odlpassword', 'foo')
-
-    def test_osauthurl(self):
-        self._test_arg('osauthurl', 'http://127.0.0.4:5000/v2')
-
-    def test_neutronurl(self):
-        self._test_arg('neutronurl', 'http://127.0.0.4:9696')
-
-    def test_osusername(self):
-        self._test_arg('osusername', 'foo')
-
-    def test_osuserdomainname(self):
-        self._test_arg('osuserdomainname', 'domain')
-
-    def test_osprojectname(self):
-        self._test_arg('osprojectname', 'foo')
-
-    def test_osprojectdomainname(self):
-        self._test_arg('osprojectdomainname', 'domain')
-
-    def test_ospassword(self):
-        self._test_arg('ospassword', 'foo')
-
-    def test_odlip(self):
-        self._test_arg('odlip', '127.0.0.4')
-
-    def test_odlwebport(self):
-        self._test_arg('odlwebport', '80')
-
-    def test_odlrestconfport(self):
-        self._test_arg('odlrestconfport', '80')
-
-    def test_pushtodb(self):
-        self.defaultargs['pushtodb'] = True
-        self.assertEqual(self.parser.parse_args(["--{}".format('pushtodb')]),
-                         self.defaultargs)
-
-    def test_multiple_args(self):
-        self.defaultargs['neutronurl'] = self._neutron_url
-        self.defaultargs['odlip'] = self._sdn_controller_ip
-        self.assertEqual(
-            self.parser.parse_args(
-                ["--neutronurl={}".format(self._neutron_url),
-                 "--odlip={}".format(self._sdn_controller_ip)]),
-            self.defaultargs)
-
-
-if __name__ == "__main__":
-    logging.disable(logging.CRITICAL)
-    unittest.main(verbosity=2)
diff --git a/functest/tests/unit/openstack/__init__.py b/functest/tests/unit/openstack/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/functest/tests/unit/openstack/__init__.py
+++ /dev/null
diff --git a/functest/tests/unit/openstack/rally/__init__.py b/functest/tests/unit/openstack/rally/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/functest/tests/unit/openstack/rally/__init__.py
+++ /dev/null
diff --git a/functest/tests/unit/openstack/rally/test_rally.py b/functest/tests/unit/openstack/rally/test_rally.py
deleted file mode 100644
index 9cc6bf53..00000000
--- a/functest/tests/unit/openstack/rally/test_rally.py
+++ /dev/null
@@ -1,431 +0,0 @@
-#!/usr/bin/env python
-
-# 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
-
-# pylint: disable=missing-docstring,protected-access,invalid-name
-
-import json
-import logging
-import os
-import unittest
-
-import mock
-
-from functest.core import testcase
-from functest.opnfv_tests.openstack.rally import rally
-
-from snaps.openstack.os_credentials import OSCreds
-
-
-class OSRallyTesting(unittest.TestCase):
-    # pylint: disable=too-many-public-methods
-    def setUp(self):
-        os_creds = OSCreds(
-            username='user', password='pass',
-            auth_url='http://foo.com:5000/v3', project_name='bar')
-        with mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
-                        'get_credentials',
-                        return_value=os_creds) as mock_get_creds:
-            self.rally_base = rally.RallyBase()
-        self.assertTrue(mock_get_creds.called)
-
-    def test_build_task_args_missing_floating_network(self):
-        os.environ['OS_AUTH_URL'] = ''
-        self.rally_base.ext_net_name = ''
-        task_args = self.rally_base._build_task_args('test_file_name')
-        self.assertEqual(task_args['floating_network'], '')
-
-    def test_build_task_args_missing_net_id(self):
-        os.environ['OS_AUTH_URL'] = ''
-        self.rally_base.priv_net_id = ''
-        task_args = self.rally_base._build_task_args('test_file_name')
-        self.assertEqual(task_args['netid'], '')
-
-    @staticmethod
-    def check_scenario_file(value):
-        yaml_file = 'opnfv-{}.yaml'.format('test_file_name')
-        if yaml_file in value:
-            return False
-        return True
-
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os.path.exists')
-    def test_prepare_test_list_missing_scenario_file(self, mock_func):
-        mock_func.side_effect = self.check_scenario_file
-        with self.assertRaises(Exception):
-            self.rally_base._prepare_test_list('test_file_name')
-        mock_func.assert_called()
-
-    @staticmethod
-    def check_temp_dir(value):
-        yaml_file = 'opnfv-{}.yaml'.format('test_file_name')
-        if yaml_file in value:
-            return True
-        return False
-
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os.path.exists')
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os.makedirs')
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
-                '_apply_blacklist')
-    def test_prepare_test_list_missing_temp_dir(
-            self, mock_method, mock_os_makedirs, mock_path_exists):
-        mock_path_exists.side_effect = self.check_temp_dir
-
-        yaml_file = 'opnfv-{}.yaml'.format('test_file_name')
-        ret_val = os.path.join(self.rally_base.TEMP_DIR, yaml_file)
-        self.assertEqual(self.rally_base._prepare_test_list('test_file_name'),
-                         ret_val)
-        mock_path_exists.assert_called()
-        mock_method.assert_called()
-        mock_os_makedirs.assert_called()
-
-    def test_get_task_id_default(self):
-        cmd_raw = 'Task 1: started'
-        self.assertEqual(self.rally_base.get_task_id(cmd_raw),
-                         '1')
-
-    def test_get_task_id_missing_id(self):
-        cmd_raw = ''
-        self.assertEqual(self.rally_base.get_task_id(cmd_raw),
-                         None)
-
-    def test_task_succeed_fail(self):
-        json_raw = json.dumps([None])
-        self.assertEqual(self.rally_base.task_succeed(json_raw),
-                         False)
-        json_raw = json.dumps([{'result': [{'error': ['test_error']}]}])
-        self.assertEqual(self.rally_base.task_succeed(json_raw),
-                         False)
-
-    def test_task_succeed_success(self):
-        json_raw = json.dumps('')
-        self.assertEqual(self.rally_base.task_succeed(json_raw),
-                         True)
-
-    def test_get_cmd_output(self):
-        proc = mock.Mock()
-        proc.stdout.__iter__ = mock.Mock(return_value=iter(['line1', 'line2']))
-        self.assertEqual(self.rally_base.get_cmd_output(proc),
-                         'line1line2')
-
-    @mock.patch('__builtin__.open', mock.mock_open())
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.yaml.safe_load',
-                return_value={'scenario': [
-                    {'scenarios': ['test_scenario'],
-                     'installers': ['test_installer'],
-                     'tests': ['test']},
-                    {'scenarios': ['other_scenario'],
-                     'installers': ['test_installer'],
-                     'tests': ['other_test']}]})
-    def test_excl_scenario_default(self, mock_func):
-        os.environ['INSTALLER_TYPE'] = 'test_installer'
-        os.environ['DEPLOY_SCENARIO'] = 'test_scenario'
-        self.assertEqual(self.rally_base.excl_scenario(), ['test'])
-        mock_func.assert_called()
-
-    @mock.patch('__builtin__.open', mock.mock_open())
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.yaml.safe_load',
-                return_value={'scenario': [
-                    {'scenarios': ['^os-[^-]+-featT-modeT$'],
-                     'installers': ['test_installer'],
-                     'tests': ['test1']},
-                    {'scenarios': ['^os-ctrlT-[^-]+-modeT$'],
-                     'installers': ['test_installer'],
-                     'tests': ['test2']},
-                    {'scenarios': ['^os-ctrlT-featT-[^-]+$'],
-                     'installers': ['test_installer'],
-                     'tests': ['test3']},
-                    {'scenarios': ['^os-'],
-                     'installers': ['test_installer'],
-                     'tests': ['test4']},
-                    {'scenarios': ['other_scenario'],
-                     'installers': ['test_installer'],
-                     'tests': ['test0a']},
-                    {'scenarios': [''],  # empty scenario
-                     'installers': ['test_installer'],
-                     'tests': ['test0b']}]})
-    def test_excl_scenario_regex(self, mock_func):
-        os.environ['INSTALLER_TYPE'] = 'test_installer'
-        os.environ['DEPLOY_SCENARIO'] = 'os-ctrlT-featT-modeT'
-        self.assertEqual(self.rally_base.excl_scenario(),
-                         ['test1', 'test2', 'test3', 'test4'])
-        mock_func.assert_called()
-
-    @mock.patch('__builtin__.open', side_effect=Exception)
-    def test_excl_scenario_exception(self, mock_open):
-        self.assertEqual(self.rally_base.excl_scenario(), [])
-        mock_open.assert_called()
-
-    @mock.patch('__builtin__.open', mock.mock_open())
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.yaml.safe_load',
-                return_value={'functionality': [
-                    {'functions': ['no_migration'], 'tests': ['test']}]})
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
-                '_migration_supported', return_value=False)
-    def test_excl_func_default(self, mock_func, mock_yaml_load):
-        os.environ['INSTALLER_TYPE'] = 'test_installer'
-        os.environ['DEPLOY_SCENARIO'] = 'test_scenario'
-        self.assertEqual(self.rally_base.excl_func(), ['test'])
-        mock_func.assert_called()
-        mock_yaml_load.assert_called()
-
-    @mock.patch('__builtin__.open', side_effect=Exception)
-    def test_excl_func_exception(self, mock_open):
-        self.assertEqual(self.rally_base.excl_func(), [])
-        mock_open.assert_called()
-
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os.stat')
-    def test_file_is_empty_default(self, mock_os_stat):
-        attrs = {'st_size': 10}
-        mock_os_stat.return_value.configure_mock(**attrs)
-        self.assertEqual(self.rally_base.file_is_empty('test_file_name'),
-                         False)
-        mock_os_stat.assert_called()
-
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os.stat',
-                side_effect=Exception)
-    def test_file_is_empty_exception(self, mock_os_stat):
-        self.assertEqual(self.rally_base.file_is_empty('test_file_name'), True)
-        mock_os_stat.assert_called()
-
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os.path.exists',
-                return_value=False)
-    def test_run_task_missing_task_file(self, mock_path_exists):
-        with self.assertRaises(Exception):
-            self.rally_base._run_task('test_name')
-        mock_path_exists.assert_called()
-
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os.path.exists',
-                return_value=True)
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
-                '_prepare_test_list', return_value='test_file_name')
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
-                'file_is_empty', return_value=True)
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.LOGGER.info')
-    def test_run_task_no_tests_for_scenario(self, mock_logger_info,
-                                            mock_file_empty, mock_prep_list,
-                                            mock_path_exists):
-        self.rally_base._run_task('test_name')
-        mock_logger_info.assert_any_call('No tests for scenario \"%s\"',
-                                         'test_name')
-        mock_file_empty.assert_called()
-        mock_prep_list.assert_called()
-        mock_path_exists.assert_called()
-
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
-                '_prepare_test_list', return_value='test_file_name')
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
-                'file_is_empty', return_value=False)
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
-                '_build_task_args', return_value={})
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
-                '_append_summary')
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
-                'get_task_id', return_value=None)
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
-                'get_cmd_output', return_value='')
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os.path.exists',
-                return_value=True)
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.subprocess.Popen')
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.LOGGER.error')
-    def test_run_task_taskid_missing(self, mock_logger_error, *args):
-        # pylint: disable=unused-argument
-        self.rally_base._run_task('test_name')
-        text = 'Failed to retrieve task_id, validating task...'
-        mock_logger_error.assert_any_call(text)
-
-    @mock.patch('__builtin__.open', mock.mock_open())
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
-                '_prepare_test_list', return_value='test_file_name')
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
-                'file_is_empty', return_value=False)
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
-                '_build_task_args', return_value={})
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
-                '_append_summary')
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
-                'get_task_id', return_value='1')
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
-                'get_cmd_output', return_value='')
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
-                'task_succeed', return_value=True)
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os.path.exists',
-                return_value=True)
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.subprocess.Popen')
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os.makedirs')
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.LOGGER.info')
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.LOGGER.error')
-    def test_run_task_default(self, mock_logger_error, mock_logger_info,
-                              *args):
-        # pylint: disable=unused-argument
-        self.rally_base._run_task('test_name')
-        text = 'Test scenario: "test_name" OK.\n'
-        mock_logger_info.assert_any_call(text)
-        mock_logger_error.assert_not_called()
-
-    def test_prepare_env_testname_invalid(self):
-        self.rally_base.TESTS = ['test1', 'test2']
-        self.rally_base.test_name = 'test'
-        with self.assertRaises(Exception):
-            self.rally_base._prepare_env()
-
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
-                'get_active_compute_cnt')
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
-                'get_ext_net_name', return_value='test_net_name')
-    @mock.patch('snaps.openstack.utils.deploy_utils.create_image',
-                return_value=None)
-    def test_prepare_env_image_missing(
-            self, mock_get_img, mock_get_net, mock_get_comp_cnt):
-        self.rally_base.TESTS = ['test1', 'test2']
-        self.rally_base.test_name = 'test1'
-        with self.assertRaises(Exception):
-            self.rally_base._prepare_env()
-        mock_get_img.assert_called()
-        mock_get_net.assert_called()
-        mock_get_comp_cnt.assert_called()
-
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
-                'get_active_compute_cnt')
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
-                'get_ext_net_name', return_value='test_net_name')
-    @mock.patch('snaps.openstack.utils.deploy_utils.create_image')
-    @mock.patch('snaps.openstack.utils.deploy_utils.create_network',
-                return_value=None)
-    def test_prepare_env_network_creation_failed(
-            self, mock_create_net, mock_get_img, mock_get_net,
-            mock_get_comp_cnt):
-        self.rally_base.TESTS = ['test1', 'test2']
-        self.rally_base.test_name = 'test1'
-        with self.assertRaises(Exception):
-            self.rally_base._prepare_env()
-        mock_create_net.assert_called()
-        mock_get_img.assert_called()
-        mock_get_net.assert_called()
-        mock_get_comp_cnt.assert_called()
-
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
-                'get_active_compute_cnt')
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
-                'get_ext_net_name', return_value='test_net_name')
-    @mock.patch('snaps.openstack.utils.deploy_utils.create_image')
-    @mock.patch('snaps.openstack.utils.deploy_utils.create_network')
-    @mock.patch('snaps.openstack.utils.deploy_utils.create_router',
-                return_value=None)
-    def test_prepare_env_router_creation_failed(self, *args):
-        self.rally_base.TESTS = ['test1', 'test2']
-        self.rally_base.test_name = 'test1'
-        with self.assertRaises(Exception):
-            self.rally_base._prepare_env()
-        for func in args:
-            func.assert_called()
-
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
-                'get_active_compute_cnt')
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
-                'get_ext_net_name', return_value='test_net_name')
-    @mock.patch('snaps.openstack.utils.deploy_utils.create_image')
-    @mock.patch('snaps.openstack.utils.deploy_utils.create_network')
-    @mock.patch('snaps.openstack.utils.deploy_utils.create_router')
-    @mock.patch('snaps.openstack.create_flavor.OpenStackFlavor.create',
-                return_value=None)
-    def test_prepare_env_flavor_creation_failed(self, mock_create_flavor,
-                                                *args):
-        self.rally_base.TESTS = ['test1', 'test2']
-        self.rally_base.test_name = 'test1'
-        with self.assertRaises(Exception):
-            self.rally_base._prepare_env()
-        for func in args:
-            func.assert_called()
-        mock_create_flavor.assert_called_once()
-
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
-                'get_active_compute_cnt')
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
-                'get_ext_net_name', return_value='test_net_name')
-    @mock.patch('snaps.openstack.utils.deploy_utils.create_image')
-    @mock.patch('snaps.openstack.utils.deploy_utils.create_network')
-    @mock.patch('snaps.openstack.utils.deploy_utils.create_router')
-    @mock.patch('snaps.openstack.create_flavor.OpenStackFlavor.create',
-                side_effect=[mock.Mock, None])
-    def test_prepare_env_flavor_alt_creation_failed(self, mock_create_flavor,
-                                                    *args):
-        self.rally_base.TESTS = ['test1', 'test2']
-        self.rally_base.test_name = 'test1'
-        with self.assertRaises(Exception):
-            self.rally_base._prepare_env()
-        for func in args:
-            func.assert_called()
-        self.assertEqual(mock_create_flavor.call_count, 2)
-
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
-                '_run_task')
-    def test_run_tests_all(self, mock_run_task):
-        self.rally_base.TESTS = ['test1', 'test2']
-        self.rally_base.test_name = 'all'
-        self.rally_base._run_tests()
-        mock_run_task.assert_any_call('test1')
-        mock_run_task.assert_any_call('test2')
-
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
-                '_run_task')
-    def test_run_tests_default(self, mock_run_task):
-        self.rally_base.TESTS = ['test1', 'test2']
-        self.rally_base.test_name = 'test1'
-        self.rally_base._run_tests()
-        mock_run_task.assert_any_call('test1')
-
-    def test_clean_up_default(self):
-        creator1 = mock.Mock()
-        creator2 = mock.Mock()
-        self.rally_base.creators = [creator1, creator2]
-        self.rally_base._clean_up()
-        self.assertTrue(creator1.clean.called)
-        self.assertTrue(creator2.clean.called)
-
-    @mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                'create_rally_deployment')
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
-                '_prepare_env')
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
-                '_run_tests')
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
-                '_generate_report')
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
-                '_clean_up')
-    def test_run_default(self, *args):
-        self.assertEqual(self.rally_base.run(), testcase.TestCase.EX_OK)
-        for func in args:
-            func.assert_called()
-
-    @mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                'create_rally_deployment', side_effect=Exception)
-    def test_run_exception_create_rally_dep(self, mock_create_rally_dep):
-        self.assertEqual(self.rally_base.run(), testcase.TestCase.EX_RUN_ERROR)
-        mock_create_rally_dep.assert_called()
-
-    @mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                'create_rally_deployment', return_value=mock.Mock())
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
-                '_prepare_env', side_effect=Exception)
-    def test_run_exception_prepare_env(self, mock_prep_env, *args):
-        # pylint: disable=unused-argument
-        self.assertEqual(self.rally_base.run(), testcase.TestCase.EX_RUN_ERROR)
-        mock_prep_env.assert_called()
-
-    def test_append_summary(self):
-        text = '[{"result":[{"error":[]},{"error":["err"]}],' \
-               '"full_duration": 17.312026}]'
-        self.rally_base._append_summary(text, "foo_test")
-        self.assertEqual(self.rally_base.summary[0]['test_name'], "foo_test")
-        self.assertEqual(self.rally_base.summary[0]['overall_duration'],
-                         17.312026)
-        self.assertEqual(self.rally_base.summary[0]['nb_tests'], 2)
-        self.assertEqual(self.rally_base.summary[0]['nb_success'], 1)
-
-
-if __name__ == "__main__":
-    logging.disable(logging.CRITICAL)
-    unittest.main(verbosity=2)
diff --git a/functest/tests/unit/openstack/refstack_client/__init__.py b/functest/tests/unit/openstack/refstack_client/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/functest/tests/unit/openstack/refstack_client/__init__.py
+++ /dev/null
diff --git a/functest/tests/unit/openstack/refstack_client/test_refstack_client.py b/functest/tests/unit/openstack/refstack_client/test_refstack_client.py
deleted file mode 100644
index 1d5cc69f..00000000
--- a/functest/tests/unit/openstack/refstack_client/test_refstack_client.py
+++ /dev/null
@@ -1,149 +0,0 @@
-#!/usr/bin/env python
-
-# 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
-
-# pylint: disable=missing-docstring
-
-import logging
-import os
-import unittest
-
-import mock
-import pkg_resources
-
-from functest.core import testcase
-from functest.opnfv_tests.openstack.refstack_client.refstack_client import \
-    RefstackClient, RefstackClientParser
-
-from snaps.openstack.os_credentials import OSCreds
-
-__author__ = ("Matthew Li <matthew.lijun@huawei.com>,"
-              "Linda Wang <wangwulin@huawei.com>")
-
-
-class OSRefstackClientTesting(unittest.TestCase):
-    """The class testing RefstackClient """
-    # pylint: disable=missing-docstring, too-many-public-methods
-
-    _config = pkg_resources.resource_filename(
-        'functest',
-        'opnfv_tests/openstack/refstack_client/refstack_tempest.conf')
-
-    def setUp(self):
-        self.default_args = {'config': None,
-                             'testlist': RefstackClient.defcorelist}
-        os.environ['OS_AUTH_URL'] = 'https://ip:5000/v3'
-        os.environ['OS_INSECURE'] = 'true'
-        self.case_name = 'refstack_defcore'
-        self.result = 0
-        self.os_creds = OSCreds(
-            username='user', password='pass',
-            auth_url='http://foo.com:5000/v3', project_name='bar')
-        self.details = {"tests": 3,
-                        "failures": 1,
-                        "success": ['tempest.api.compute [18.464988s]'],
-                        "errors": ['tempest.api.volume [0.230334s]'],
-                        "skipped": ['tempest.api.network [1.265828s]']}
-
-    def _create_client(self):
-        with mock.patch('snaps.openstack.tests.openstack_tests.'
-                        'get_credentials', return_value=self.os_creds):
-            return RefstackClient()
-
-    @mock.patch('functest.utils.functest_utils.execute_command')
-    def test_run_defcore_insecure(self, m_cmd):
-        insecure = '-k'
-        config = 'tempest.conf'
-        testlist = 'testlist'
-        client = self._create_client()
-        cmd = ("refstack-client test {0} -c {1} -v --test-list {2}".format(
-            insecure, config, testlist))
-        client.run_defcore(config, testlist)
-        m_cmd.assert_any_call(cmd)
-
-    @mock.patch('functest.utils.functest_utils.execute_command')
-    def test_run_defcore(self, m_cmd):
-        os.environ['OS_AUTH_URL'] = 'http://ip:5000/v3'
-        insecure = ''
-        config = 'tempest.conf'
-        testlist = 'testlist'
-        client = self._create_client()
-        cmd = ("refstack-client test {0} -c {1} -v --test-list {2}".format(
-            insecure, config, testlist))
-        client.run_defcore(config, testlist)
-        m_cmd.assert_any_call(cmd)
-
-    @mock.patch('functest.opnfv_tests.openstack.refstack_client.'
-                'refstack_client.LOGGER.info')
-    @mock.patch('__builtin__.open', side_effect=Exception)
-    def test_parse_refstack_result_fail(self, *args):
-        self._create_client().parse_refstack_result()
-        args[1].assert_called_once_with(
-            "Testcase %s success_rate is %s%%",
-            self.case_name, self.result)
-
-    def test_parse_refstack_result_ok(self):
-        log_file = ('''
-                    {0} tempest.api.compute [18.464988s] ... ok
-                    {0} tempest.api.volume [0.230334s] ... FAILED
-                    {0} tempest.api.network [1.265828s] ... SKIPPED:
-                    Ran: 3 tests in 1259.0000 sec.
-                    - Passed: 1
-                    - Skipped: 1
-                    - Failed: 1
-                   ''')
-        client = self._create_client()
-        with mock.patch('__builtin__.open',
-                        mock.mock_open(read_data=log_file)):
-            client.parse_refstack_result()
-            self.assertEqual(client.details, self.details)
-
-    def _get_main_kwargs(self, key=None):
-        kwargs = {'config': self._config,
-                  'testlist': RefstackClient.defcorelist}
-        if key:
-            del kwargs[key]
-        return kwargs
-
-    def _test_main_missing_keyword(self, key):
-        kwargs = self._get_main_kwargs(key)
-        client = self._create_client()
-        self.assertEqual(client.main(**kwargs),
-                         testcase.TestCase.EX_RUN_ERROR)
-
-    def test_main_missing_conf(self):
-        self._test_main_missing_keyword('config')
-
-    def test_main_missing_testlist(self):
-        self._test_main_missing_keyword('testlist')
-
-    def _test_argparser(self, arg, value):
-        self.default_args[arg] = value
-        parser = RefstackClientParser()
-        self.assertEqual(parser.parse_args(["--{}={}".format(arg, value)]),
-                         self.default_args)
-
-    def test_argparser_conf(self):
-        self._test_argparser('config', self._config)
-
-    def test_argparser_testlist(self):
-        self._test_argparser('testlist', RefstackClient.defcorelist)
-
-    def test_argparser_multiple_args(self):
-        self.default_args['config'] = self._config
-        self.default_args['testlist'] = RefstackClient.defcorelist
-        parser = RefstackClientParser()
-        self.assertEqual(parser.parse_args(
-            ["--config={}".format(self._config),
-             "--testlist={}".format(RefstackClient.defcorelist)]),
-                         self.default_args)
-
-
-if __name__ == "__main__":
-    logging.disable(logging.CRITICAL)
-    unittest.main(verbosity=2)
diff --git a/functest/tests/unit/openstack/snaps/__init__.py b/functest/tests/unit/openstack/snaps/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/functest/tests/unit/openstack/snaps/__init__.py
+++ /dev/null
diff --git a/functest/tests/unit/openstack/snaps/test_snaps.py b/functest/tests/unit/openstack/snaps/test_snaps.py
deleted file mode 100644
index 3d9e9df0..00000000
--- a/functest/tests/unit/openstack/snaps/test_snaps.py
+++ /dev/null
@@ -1,285 +0,0 @@
-# Copyright (c) 2017 Cable Television Laboratories, Inc. 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
-
-# pylint: disable=missing-docstring
-
-import logging
-import unittest
-
-import mock
-from snaps.openstack.os_credentials import OSCreds
-
-from functest.core.testcase import TestCase
-from functest.opnfv_tests.openstack.snaps import (
-    connection_check, api_check, health_check, smoke)
-
-
-class ConnectionCheckTesting(unittest.TestCase):
-    """
-    Ensures the VPingUserdata class can run in Functest. This test does not
-    actually connect with an OpenStack pod.
-    """
-
-    def setUp(self):
-        self.os_creds = OSCreds(
-            username='user', password='pass',
-            auth_url='http://foo.com:5000/v3', project_name='bar')
-
-        self.connection_check = connection_check.ConnectionCheck(
-            os_creds=self.os_creds, ext_net_name='foo')
-
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_suite_builder.'
-                'add_openstack_client_tests')
-    @mock.patch('unittest.TextTestRunner.run',
-                return_value=mock.MagicMock(name='unittest.TextTestResult'))
-    def test_run_success(self, *args):
-        args[0].return_value.testsRun = 100
-        args[0].return_value.failures = []
-        args[0].return_value.errors = []
-        self.assertEquals(TestCase.EX_OK, self.connection_check.run())
-        self.assertEquals(
-            TestCase.EX_OK, self.connection_check.is_successful())
-        args[0].assert_called_with(mock.ANY)
-        args[1].assert_called_with(
-            ext_net_name='foo', os_creds=self.os_creds, suite=mock.ANY,
-            use_keystone=True)
-
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_suite_builder.'
-                'add_openstack_client_tests')
-    @mock.patch('unittest.TextTestRunner.run',
-                return_value=mock.MagicMock(name='unittest.TextTestResult'))
-    def test_run_1_of_100_ko(self, *args):
-        args[0].return_value.testsRun = 100
-        args[0].return_value.failures = ['foo']
-        args[0].return_value.errors = []
-        self.assertEquals(TestCase.EX_OK, self.connection_check.run())
-        self.assertEquals(
-            TestCase.EX_TESTCASE_FAILED, self.connection_check.is_successful())
-        args[0].assert_called_with(mock.ANY)
-        args[1].assert_called_with(
-            ext_net_name='foo', os_creds=self.os_creds, suite=mock.ANY,
-            use_keystone=True)
-
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_suite_builder.'
-                'add_openstack_client_tests')
-    @mock.patch('unittest.TextTestRunner.run',
-                return_value=mock.MagicMock(name='unittest.TextTestResult'))
-    def test_run_1_of_100_ko_criteria(self, *args):
-        self.connection_check.criteria = 90
-        args[0].return_value.testsRun = 100
-        args[0].return_value.failures = ['foo']
-        args[0].return_value.errors = []
-        self.assertEquals(TestCase.EX_OK, self.connection_check.run())
-        self.assertEquals(
-            TestCase.EX_OK, self.connection_check.is_successful())
-        args[0].assert_called_with(mock.ANY)
-        args[1].assert_called_with(
-            ext_net_name='foo', os_creds=self.os_creds, suite=mock.ANY,
-            use_keystone=True)
-
-
-class APICheckTesting(unittest.TestCase):
-    """
-    Ensures the VPingUserdata class can run in Functest. This test does not
-    actually connect with an OpenStack pod.
-    """
-
-    def setUp(self):
-        self.os_creds = OSCreds(
-            username='user', password='pass',
-            auth_url='http://foo.com:5000/v3', project_name='bar')
-
-        self.api_check = api_check.ApiCheck(
-            os_creds=self.os_creds, ext_net_name='foo')
-
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_suite_builder.'
-                'add_openstack_api_tests')
-    @mock.patch('unittest.TextTestRunner.run',
-                return_value=mock.MagicMock(name='unittest.TextTestResult'))
-    def test_run_success(self, *args):
-        args[0].return_value.testsRun = 100
-        args[0].return_value.failures = []
-        args[0].return_value.errors = []
-        self.assertEquals(TestCase.EX_OK, self.api_check.run())
-        self.assertEquals(
-            TestCase.EX_OK, self.api_check.is_successful())
-        args[0].assert_called_with(mock.ANY)
-        args[1].assert_called_with(
-            ext_net_name='foo', image_metadata=mock.ANY,
-            os_creds=self.os_creds, suite=mock.ANY, use_keystone=True)
-
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_suite_builder.'
-                'add_openstack_api_tests')
-    @mock.patch('unittest.TextTestRunner.run',
-                return_value=mock.MagicMock(name='unittest.TextTestResult'))
-    def test_run_1_of_100_ko(self, *args):
-        args[0].return_value.testsRun = 100
-        args[0].return_value.failures = ['foo']
-        args[0].return_value.errors = []
-        self.assertEquals(TestCase.EX_OK, self.api_check.run())
-        self.assertEquals(
-            TestCase.EX_TESTCASE_FAILED, self.api_check.is_successful())
-        args[0].assert_called_with(mock.ANY)
-        args[1].assert_called_with(
-            ext_net_name='foo', image_metadata=mock.ANY,
-            os_creds=self.os_creds, suite=mock.ANY, use_keystone=True)
-
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_suite_builder.'
-                'add_openstack_api_tests')
-    @mock.patch('unittest.TextTestRunner.run',
-                return_value=mock.MagicMock(name='unittest.TextTestResult'))
-    def test_run_1_of_100_ko_criteria(self, *args):
-        self.api_check.criteria = 90
-        args[0].return_value.testsRun = 100
-        args[0].return_value.failures = ['foo']
-        args[0].return_value.errors = []
-        self.assertEquals(TestCase.EX_OK, self.api_check.run())
-        self.assertEquals(
-            TestCase.EX_OK, self.api_check.is_successful())
-        args[0].assert_called_with(mock.ANY)
-        args[1].assert_called_with(
-            ext_net_name='foo', image_metadata=mock.ANY,
-            os_creds=self.os_creds, suite=mock.ANY, use_keystone=True)
-
-
-class HealthCheckTesting(unittest.TestCase):
-    """
-    Ensures the VPingUserdata class can run in Functest. This test does not
-    actually connect with an OpenStack pod.
-    """
-
-    def setUp(self):
-        self.os_creds = OSCreds(
-            username='user', password='pass',
-            auth_url='http://foo.com:5000/v3', project_name='bar')
-
-        self.health_check = health_check.HealthCheck(
-            os_creds=self.os_creds, ext_net_name='foo')
-
-    @mock.patch('snaps.openstack.tests.os_source_file_test.'
-                'OSIntegrationTestCase.parameterize')
-    @mock.patch('unittest.TextTestRunner.run',
-                return_value=mock.MagicMock(name='unittest.TextTestResult'))
-    def test_run_success(self, *args):
-        args[0].return_value.testsRun = 100
-        args[0].return_value.failures = []
-        args[0].return_value.errors = []
-        self.assertEquals(TestCase.EX_OK, self.health_check.run())
-        self.assertEquals(
-            TestCase.EX_OK, self.health_check.is_successful())
-        args[0].assert_called_with(mock.ANY)
-        args[1].assert_called_with(
-            mock.ANY, ext_net_name='foo', flavor_metadata=None,
-            image_metadata=mock.ANY, netconf_override=None,
-            os_creds=self.os_creds, use_keystone=True)
-
-    @mock.patch('snaps.openstack.tests.os_source_file_test.'
-                'OSIntegrationTestCase.parameterize')
-    @mock.patch('unittest.TextTestRunner.run',
-                return_value=mock.MagicMock(name='unittest.TextTestResult'))
-    def test_run_1_of_100_ko(self, *args):
-        args[0].return_value.testsRun = 100
-        args[0].return_value.failures = ['foo']
-        args[0].return_value.errors = []
-        self.assertEquals(TestCase.EX_OK, self.health_check.run())
-        self.assertEquals(
-            TestCase.EX_TESTCASE_FAILED, self.health_check.is_successful())
-        args[0].assert_called_with(mock.ANY)
-        args[1].assert_called_with(
-            mock.ANY, ext_net_name='foo', flavor_metadata=None,
-            image_metadata=mock.ANY, netconf_override=None,
-            os_creds=self.os_creds, use_keystone=True)
-
-    @mock.patch('snaps.openstack.tests.os_source_file_test.'
-                'OSIntegrationTestCase.parameterize')
-    @mock.patch('unittest.TextTestRunner.run',
-                return_value=mock.MagicMock(name='unittest.TextTestResult'))
-    def test_run_1_of_100_ko_criteria(self, *args):
-        self.health_check.criteria = 90
-        args[0].return_value.testsRun = 100
-        args[0].return_value.failures = ['foo']
-        args[0].return_value.errors = []
-        self.assertEquals(TestCase.EX_OK, self.health_check.run())
-        self.assertEquals(
-            TestCase.EX_OK, self.health_check.is_successful())
-        args[0].assert_called_with(mock.ANY)
-        args[1].assert_called_with(
-            mock.ANY, ext_net_name='foo', flavor_metadata=None,
-            image_metadata=mock.ANY, netconf_override=None,
-            os_creds=self.os_creds, use_keystone=True)
-
-
-class SmokeTesting(unittest.TestCase):
-    """
-    Ensures the VPingUserdata class can run in Functest. This test does not
-    actually connect with an OpenStack pod.
-    """
-
-    def setUp(self):
-        self.os_creds = OSCreds(
-            username='user', password='pass',
-            auth_url='http://foo.com:5000/v3', project_name='bar')
-
-        self.smoke = smoke.SnapsSmoke(
-            os_creds=self.os_creds, ext_net_name='foo')
-
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_suite_builder.'
-                'add_openstack_integration_tests')
-    @mock.patch('unittest.TextTestRunner.run',
-                return_value=mock.MagicMock(name='unittest.TextTestResult'))
-    def test_run_success(self, *args):
-        args[0].return_value.testsRun = 100
-        args[0].return_value.failures = []
-        args[0].return_value.errors = []
-        self.assertEquals(TestCase.EX_OK, self.smoke.run())
-        self.assertEquals(TestCase.EX_OK, self.smoke.is_successful())
-        args[0].assert_called_with(mock.ANY)
-        args[1].assert_called_with(
-            ext_net_name='foo', flavor_metadata=None, image_metadata=mock.ANY,
-            netconf_override=None, os_creds=self.os_creds,
-            suite=mock.ANY, use_floating_ips=True, use_keystone=True)
-
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_suite_builder.'
-                'add_openstack_integration_tests')
-    @mock.patch('unittest.TextTestRunner.run',
-                return_value=mock.MagicMock(name='unittest.TextTestResult'))
-    def test_run_1_of_100_ko(self, *args):
-        args[0].return_value.testsRun = 100
-        args[0].return_value.failures = ['foo']
-        args[0].return_value.errors = []
-        self.assertEquals(TestCase.EX_OK, self.smoke.run())
-        self.assertEquals(
-            TestCase.EX_TESTCASE_FAILED, self.smoke.is_successful())
-        args[0].assert_called_with(mock.ANY)
-        args[1].assert_called_with(
-            ext_net_name='foo', flavor_metadata=None, image_metadata=mock.ANY,
-            netconf_override=mock.ANY, os_creds=self.os_creds,
-            suite=mock.ANY, use_floating_ips=True, use_keystone=True)
-
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_suite_builder.'
-                'add_openstack_integration_tests')
-    @mock.patch('unittest.TextTestRunner.run',
-                return_value=mock.MagicMock(name='unittest.TextTestResult'))
-    def test_run_1_of_100_ko_criteria(self, *args):
-        self.smoke.criteria = 90
-        args[0].return_value.testsRun = 100
-        args[0].return_value.failures = ['foo']
-        args[0].return_value.errors = []
-        self.assertEquals(TestCase.EX_OK, self.smoke.run())
-        self.assertEquals(
-            TestCase.EX_OK, self.smoke.is_successful())
-        args[0].assert_called_with(mock.ANY)
-        args[1].assert_called_with(
-            ext_net_name='foo', flavor_metadata=None, image_metadata=mock.ANY,
-            netconf_override=None, os_creds=self.os_creds,
-            suite=mock.ANY, use_floating_ips=True, use_keystone=True)
-
-
-if __name__ == "__main__":
-    logging.disable(logging.CRITICAL)
-    unittest.main(verbosity=2)
diff --git a/functest/tests/unit/openstack/tempest/__init__.py b/functest/tests/unit/openstack/tempest/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/functest/tests/unit/openstack/tempest/__init__.py
+++ /dev/null
diff --git a/functest/tests/unit/openstack/tempest/test_conf_utils.py b/functest/tests/unit/openstack/tempest/test_conf_utils.py
deleted file mode 100644
index 1d5f29a2..00000000
--- a/functest/tests/unit/openstack/tempest/test_conf_utils.py
+++ /dev/null
@@ -1,320 +0,0 @@
-#!/usr/bin/env python
-
-# 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
-
-# pylint: disable=missing-docstring
-
-import logging
-import os
-import unittest
-
-import mock
-
-from functest.opnfv_tests.openstack.tempest import tempest, conf_utils
-from functest.utils import config
-from snaps.openstack.os_credentials import OSCreds
-
-
-class OSTempestConfUtilsTesting(unittest.TestCase):
-    # pylint: disable=too-many-public-methods
-    def setUp(self):
-        self.os_creds = OSCreds(
-            username='user', password='pass',
-            auth_url='http://foo.com:5000/v3', project_name='bar')
-
-    @mock.patch('snaps.openstack.utils.deploy_utils.create_project',
-                return_value=mock.Mock())
-    @mock.patch('snaps.openstack.utils.deploy_utils.create_user',
-                return_value=mock.Mock())
-    @mock.patch('snaps.openstack.utils.deploy_utils.create_network',
-                return_value=None)
-    @mock.patch('snaps.openstack.utils.deploy_utils.create_image',
-                return_value=mock.Mock())
-    def test_create_res_missing_net_dic(self, *mock_args):
-        # pylint: disable=unused-argument
-        tempest_resources = tempest.TempestResourcesManager(
-            os_creds=self.os_creds)
-        with self.assertRaises(Exception) as context:
-            tempest_resources.create()
-        msg = 'Failed to create private network'
-        self.assertTrue(msg in context.exception)
-
-    @mock.patch('snaps.openstack.utils.deploy_utils.create_project',
-                return_value=mock.Mock())
-    @mock.patch('snaps.openstack.utils.deploy_utils.create_user',
-                return_value=mock.Mock())
-    @mock.patch('snaps.openstack.utils.deploy_utils.create_network',
-                return_value=mock.Mock())
-    @mock.patch('snaps.openstack.utils.deploy_utils.create_image',
-                return_value=None)
-    def test_create_res_missing_image(self, *mock_args):
-        # pylint: disable=unused-argument
-        tempest_resources = tempest.TempestResourcesManager(
-            os_creds=self.os_creds)
-
-        with self.assertRaises(Exception) as context:
-            tempest_resources.create()
-        msg = 'Failed to create image'
-        self.assertTrue(msg in context.exception, msg=str(context.exception))
-
-    @mock.patch('snaps.openstack.utils.deploy_utils.create_project',
-                return_value=mock.Mock())
-    @mock.patch('snaps.openstack.utils.deploy_utils.create_user',
-                return_value=mock.Mock())
-    @mock.patch('snaps.openstack.utils.deploy_utils.create_network',
-                return_value=mock.Mock())
-    @mock.patch('snaps.openstack.utils.deploy_utils.create_image',
-                return_value=mock.Mock())
-    @mock.patch('snaps.openstack.utils.keystone_utils.keystone_client')
-    @mock.patch('snaps.openstack.utils.keystone_utils.get_project')
-    @mock.patch('snaps.openstack.create_flavor.OpenStackFlavor.create',
-                return_value=None)
-    def test_create_res_missing_flavor(self, *mock_args):
-        # pylint: disable=unused-argument
-        tempest_resources = tempest.TempestResourcesManager(
-            os_creds=self.os_creds)
-
-        setattr(config.CONF, 'tempest_use_custom_flavors', 'True')
-        with self.assertRaises(Exception) as context:
-            tempest_resources.create()
-        msg = 'Failed to create flavor'
-        self.assertTrue(msg in context.exception, msg=str(context.exception))
-
-        setattr(config.CONF, 'tempest_use_custom_flavors', 'False')
-        with self.assertRaises(Exception) as context:
-            tempest_resources.create(use_custom_flavors=True)
-        msg = 'Failed to create flavor'
-        self.assertTrue(msg in context.exception, msg=str(context.exception))
-
-    @staticmethod
-    @mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils'
-                '.LOGGER.info')
-    @mock.patch('functest.utils.functest_utils.execute_command_raise')
-    @mock.patch('functest.utils.functest_utils.execute_command')
-    def test_create_rally_deployment(mock_exec, mock_exec_raise,
-                                     mock_logger_info):
-
-        conf_utils.create_rally_deployment()
-
-        cmd = "rally deployment destroy opnfv-rally"
-        error_msg = "Deployment %s does not exist." % \
-                    getattr(config.CONF, 'rally_deployment_name')
-        mock_logger_info.assert_any_call("Creating Rally environment...")
-        mock_exec.assert_any_call(cmd, error_msg=error_msg, verbose=False)
-
-        cmd = "rally deployment create --fromenv --name="
-        cmd += getattr(config.CONF, 'rally_deployment_name')
-        error_msg = "Problem while creating Rally deployment"
-        mock_exec_raise.assert_any_call(cmd, error_msg=error_msg)
-
-        cmd = "rally deployment check"
-        error_msg = ("OpenStack not responding or "
-                     "faulty Rally deployment.")
-        mock_exec_raise.assert_any_call(cmd, error_msg=error_msg)
-
-    @mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils'
-                '.LOGGER.debug')
-    def test_create_verifier(self, mock_logger_debug):
-        mock_popen = mock.Mock()
-        attrs = {'poll.return_value': None,
-                 'stdout.readline.return_value': '0'}
-        mock_popen.configure_mock(**attrs)
-
-        setattr(config.CONF, 'tempest_verifier_name', 'test_verifier_name')
-        with mock.patch('functest.utils.functest_utils.execute_command_raise',
-                        side_effect=Exception), \
-                self.assertRaises(Exception):
-            conf_utils.create_verifier()
-            mock_logger_debug.assert_any_call("Tempest test_verifier_name"
-                                              " does not exist")
-
-    @mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                'create_verifier', return_value=mock.Mock())
-    @mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                'create_rally_deployment', return_value=mock.Mock())
-    def test_get_verif_id_missing_verif(self, mock_rally, mock_tempest):
-        # pylint: disable=unused-argument
-        setattr(config.CONF, 'tempest_verifier_name', 'test_verifier_name')
-        with mock.patch('functest.opnfv_tests.openstack.tempest.'
-                        'conf_utils.subprocess.Popen') as mock_popen, \
-                self.assertRaises(Exception):
-            mock_stdout = mock.Mock()
-            attrs = {'stdout.readline.return_value': ''}
-            mock_stdout.configure_mock(**attrs)
-            mock_popen.return_value = mock_stdout
-            conf_utils.get_verifier_id()
-
-    @mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                'create_verifier', return_value=mock.Mock())
-    @mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                'create_rally_deployment', return_value=mock.Mock())
-    def test_get_verifier_id_default(self, mock_rally, mock_tempest):
-        # pylint: disable=unused-argument
-        setattr(config.CONF, 'tempest_verifier_name', 'test_verifier_name')
-        with mock.patch('functest.opnfv_tests.openstack.tempest.'
-                        'conf_utils.subprocess.Popen') as mock_popen:
-            mock_stdout = mock.Mock()
-            attrs = {'stdout.readline.return_value': 'test_deploy_id'}
-            mock_stdout.configure_mock(**attrs)
-            mock_popen.return_value = mock_stdout
-
-            self.assertEqual(conf_utils.get_verifier_id(),
-                             'test_deploy_id')
-
-    def test_get_depl_id_missing_rally(self):
-        setattr(config.CONF, 'tempest_verifier_name', 'test_deploy_name')
-        with mock.patch('functest.opnfv_tests.openstack.tempest.'
-                        'conf_utils.subprocess.Popen') as mock_popen, \
-                self.assertRaises(Exception):
-            mock_stdout = mock.Mock()
-            attrs = {'stdout.readline.return_value': ''}
-            mock_stdout.configure_mock(**attrs)
-            mock_popen.return_value = mock_stdout
-            conf_utils.get_verifier_deployment_id()
-
-    def test_get_depl_id_default(self):
-        setattr(config.CONF, 'tempest_verifier_name', 'test_deploy_name')
-        with mock.patch('functest.opnfv_tests.openstack.tempest.'
-                        'conf_utils.subprocess.Popen') as mock_popen:
-            mock_stdout = mock.Mock()
-            attrs = {'stdout.readline.return_value': 'test_deploy_id'}
-            mock_stdout.configure_mock(**attrs)
-            mock_popen.return_value = mock_stdout
-
-            self.assertEqual(conf_utils.get_verifier_deployment_id(),
-                             'test_deploy_id')
-
-    def test_get_verif_repo_dir_default(self):
-        with mock.patch('functest.opnfv_tests.openstack.tempest.'
-                        'conf_utils.os.path.join',
-                        return_value='test_verifier_repo_dir'), \
-            mock.patch('functest.opnfv_tests.openstack.tempest.'
-                       'conf_utils.get_verifier_id') as mock_get_id:
-            self.assertEqual(conf_utils.get_verifier_repo_dir(''),
-                             'test_verifier_repo_dir')
-            self.assertTrue(mock_get_id.called)
-
-    def test_get_depl_dir_default(self):
-        with mock.patch('functest.opnfv_tests.openstack.tempest.'
-                        'conf_utils.os.path.join',
-                        return_value='test_verifier_repo_dir'), \
-            mock.patch('functest.opnfv_tests.openstack.tempest.'
-                       'conf_utils.get_verifier_id') as mock_get_vid, \
-            mock.patch('functest.opnfv_tests.openstack.tempest.'
-                       'conf_utils.get_verifier_deployment_id') \
-                as mock_get_did:
-            self.assertEqual(conf_utils.get_verifier_deployment_dir('', ''),
-                             'test_verifier_repo_dir')
-            self.assertTrue(mock_get_vid.called)
-            self.assertTrue(mock_get_did.called)
-
-    def test_backup_config_default(self):
-        with mock.patch('functest.opnfv_tests.openstack.tempest.'
-                        'conf_utils.os.path.exists',
-                        return_value=False), \
-            mock.patch('functest.opnfv_tests.openstack.tempest.'
-                       'conf_utils.os.makedirs') as mock_makedirs, \
-            mock.patch('functest.opnfv_tests.openstack.tempest.'
-                       'conf_utils.shutil.copyfile') as mock_copyfile:
-            conf_utils.backup_tempest_config('test_conf_file')
-            self.assertTrue(mock_makedirs.called)
-            self.assertTrue(mock_copyfile.called)
-
-        with mock.patch('functest.opnfv_tests.openstack.tempest.'
-                        'conf_utils.os.path.exists',
-                        return_value=True), \
-            mock.patch('functest.opnfv_tests.openstack.tempest.'
-                       'conf_utils.shutil.copyfile') as mock_copyfile:
-            conf_utils.backup_tempest_config('test_conf_file')
-            self.assertTrue(mock_copyfile.called)
-
-    def test_conf_tempest_def(self):
-        with mock.patch('functest.opnfv_tests.openstack.tempest.'
-                        'conf_utils.configure_verifier',
-                        return_value='test_conf_file'), \
-            mock.patch('functest.opnfv_tests.openstack.tempest.'
-                       'conf_utils.configure_tempest_update_params')\
-                as mock_upd:
-            conf_utils.configure_tempest('test_dep_dir')
-            self.assertTrue(mock_upd.called)
-
-    def test_gen_test_accounts_file_def(self):
-        with mock.patch("__builtin__.open", mock.mock_open()), \
-            mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                       'yaml.dump') as mock_dump:
-            conf_utils.generate_test_accounts_file('test_tenant_id')
-            self.assertTrue(mock_dump.called)
-
-    def _test_missing_param(self, params, image_id, flavor_id):
-        with mock.patch('functest.opnfv_tests.openstack.tempest.'
-                        'conf_utils.ConfigParser.RawConfigParser.'
-                        'set') as mset, \
-            mock.patch('functest.opnfv_tests.openstack.tempest.'
-                       'conf_utils.ConfigParser.RawConfigParser.'
-                       'read') as mread, \
-            mock.patch('functest.opnfv_tests.openstack.tempest.'
-                       'conf_utils.ConfigParser.RawConfigParser.'
-                       'write') as mwrite, \
-            mock.patch('__builtin__.open', mock.mock_open()), \
-            mock.patch('functest.opnfv_tests.openstack.tempest.'
-                       'conf_utils.backup_tempest_config'), \
-            mock.patch('functest.utils.functest_utils.yaml.safe_load',
-                       return_value={'validation': {'ssh_timeout': 300}}):
-            os.environ['OS_ENDPOINT_TYPE'] = ''
-            conf_utils.configure_tempest_update_params(
-                'test_conf_file', image_id=image_id, flavor_id=flavor_id)
-            mset.assert_any_call(params[0], params[1], params[2])
-            self.assertTrue(mread.called)
-            self.assertTrue(mwrite.called)
-
-    def test_upd_missing_image_id(self):
-        self._test_missing_param(('compute', 'image_ref', 'test_image_id'),
-                                 'test_image_id', None)
-
-    def test_upd_missing_image_id_alt(self):
-        conf_utils.IMAGE_ID_ALT = 'test_image_id_alt'
-        self._test_missing_param(('compute', 'image_ref_alt',
-                                  'test_image_id_alt'), None, None)
-
-    def test_upd_missing_flavor_id(self):
-        setattr(config.CONF, 'tempest_use_custom_flavors', 'True')
-        self._test_missing_param(('compute', 'flavor_ref', 'test_flavor_id'),
-                                 None, 'test_flavor_id')
-
-    def test_upd_missing_flavor_id_alt(self):
-        setattr(config.CONF, 'tempest_use_custom_flavors', 'True')
-        conf_utils.FLAVOR_ID_ALT = 'test_flavor_id_alt'
-        self._test_missing_param(('compute', 'flavor_ref_alt',
-                                  'test_flavor_id_alt'), None, None)
-
-    def test_verif_missing_conf_file(self):
-        with mock.patch('functest.opnfv_tests.openstack.tempest.'
-                        'conf_utils.os.path.isfile',
-                        return_value=False), \
-                mock.patch('functest.opnfv_tests.openstack.tempest.'
-                           'conf_utils.ft_utils.execute_command') as mexe, \
-                self.assertRaises(Exception) as context:
-            conf_utils.configure_verifier('test_dep_dir')
-            mexe.assert_any_call("rally verify configure-verifier")
-            msg = ("Tempest configuration file 'test_dep_dir/tempest.conf'"
-                   " NOT found.")
-            self.assertTrue(msg in context.exception)
-
-    def test_configure_verifier_default(self):
-        with mock.patch('functest.opnfv_tests.openstack.tempest.'
-                        'conf_utils.os.path.isfile',
-                        return_value=True), \
-            mock.patch('functest.opnfv_tests.openstack.tempest.'
-                       'conf_utils.ft_utils.execute_command') as mexe:
-            self.assertEqual(conf_utils.configure_verifier('test_dep_dir'),
-                             'test_dep_dir/tempest.conf')
-            mexe.assert_any_call("rally verify configure-verifier "
-                                 "--reconfigure")
-
-
-if __name__ == "__main__":
-    logging.disable(logging.CRITICAL)
-    unittest.main(verbosity=2)
diff --git a/functest/tests/unit/openstack/tempest/test_tempest.py b/functest/tests/unit/openstack/tempest/test_tempest.py
deleted file mode 100644
index ba2c1c48..00000000
--- a/functest/tests/unit/openstack/tempest/test_tempest.py
+++ /dev/null
@@ -1,261 +0,0 @@
-#!/usr/bin/env python
-
-# 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
-
-# pylint: disable=missing-docstring
-
-import logging
-import os
-import unittest
-
-import mock
-
-from functest.core import testcase
-from functest.opnfv_tests.openstack.tempest import tempest
-from functest.opnfv_tests.openstack.tempest import conf_utils
-
-from snaps.openstack.os_credentials import OSCreds
-
-
-class OSTempestTesting(unittest.TestCase):
-
-    def setUp(self):
-        os_creds = OSCreds(
-            username='user', password='pass',
-            auth_url='http://foo.com:5000/v3', project_name='bar')
-
-        with mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                        'conf_utils.get_verifier_id',
-                        return_value='test_deploy_id'), \
-            mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                       'conf_utils.get_verifier_deployment_id',
-                       return_value='test_deploy_id'), \
-            mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                       'conf_utils.get_verifier_repo_dir',
-                       return_value='test_verifier_repo_dir'), \
-            mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                       'conf_utils.get_verifier_deployment_dir',
-                       return_value='test_verifier_deploy_dir'), \
-            mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
-                       'get_credentials',
-                       return_value=os_creds):
-            self.tempestcommon = tempest.TempestCommon()
-            self.tempestsmoke_serial = tempest.TempestSmokeSerial()
-            self.tempestsmoke_parallel = tempest.TempestSmokeParallel()
-            self.tempestfull_parallel = tempest.TempestFullParallel()
-            self.tempestcustom = tempest.TempestCustom()
-            self.tempestdefcore = tempest.TempestDefcore()
-
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.LOGGER.error')
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.LOGGER.debug')
-    def test_gen_tl_cm_missing_file(self, mock_logger_debug,
-                                    mock_logger_error):
-        # pylint: disable=unused-argument
-        self.tempestcommon.mode = 'custom'
-        with mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                        'os.path.isfile', return_value=False), \
-                self.assertRaises(Exception) as context:
-            msg = "Tempest test list file %s NOT found."
-            self.tempestcommon.generate_test_list('test_verifier_repo_dir')
-            self.assertTrue(
-                (msg % conf_utils.TEMPEST_CUSTOM) in context.exception)
-
-    def test_gen_tl_cm_default(self):
-        self.tempestcommon.mode = 'custom'
-        with mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                        'shutil.copyfile') as mock_copyfile, \
-            mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                       'os.path.isfile', return_value=True):
-            self.tempestcommon.generate_test_list('test_verifier_repo_dir')
-            self.assertTrue(mock_copyfile.called)
-
-    def _test_gen_tl_mode_default(self, mode):
-        self.tempestcommon.mode = mode
-        if self.tempestcommon.mode == 'smoke':
-            testr_mode = r"'tempest\.(api|scenario).*\[.*\bsmoke\b.*\]'"
-        elif self.tempestcommon.mode == 'full':
-            testr_mode = r"'^tempest\.'"
-        else:
-            testr_mode = 'tempest.api.' + self.tempestcommon.mode
-        conf_utils.TEMPEST_RAW_LIST = 'raw_list'
-        verifier_repo_dir = 'test_verifier_repo_dir'
-        with mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                        'ft_utils.execute_command') as mock_exec:
-            cmd = ("cd {0};"
-                   "testr list-tests {1} > {2};"
-                   "cd -;".format(verifier_repo_dir, testr_mode,
-                                  conf_utils.TEMPEST_RAW_LIST))
-            self.tempestcommon.generate_test_list('test_verifier_repo_dir')
-            mock_exec.assert_any_call(cmd)
-
-    def test_gen_tl_smoke_mode(self):
-        self._test_gen_tl_mode_default('smoke')
-
-    def test_gen_tl_full_mode(self):
-        self._test_gen_tl_mode_default('full')
-
-    def test_verif_res_missing_verif_id(self):
-        self.tempestcommon.verification_id = None
-        with self.assertRaises(Exception):
-            self.tempestcommon.parse_verifier_result()
-
-    def test_apply_missing_blacklist(self):
-        with mock.patch('__builtin__.open', mock.mock_open()) as mock_open, \
-            mock.patch.object(self.tempestcommon, 'read_file',
-                              return_value=['test1', 'test2']):
-            conf_utils.TEMPEST_BLACKLIST = Exception
-            os.environ['INSTALLER_TYPE'] = 'installer_type'
-            os.environ['DEPLOY_SCENARIO'] = 'deploy_scenario'
-            self.tempestcommon.apply_tempest_blacklist()
-            obj = mock_open()
-            obj.write.assert_any_call('test1\n')
-            obj.write.assert_any_call('test2\n')
-
-    def test_apply_blacklist_default(self):
-        item_dict = {'scenarios': ['deploy_scenario'],
-                     'installers': ['installer_type'],
-                     'tests': ['test2']}
-        with mock.patch('__builtin__.open', mock.mock_open()) as mock_open, \
-            mock.patch.object(self.tempestcommon, 'read_file',
-                              return_value=['test1', 'test2']), \
-            mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                       'yaml.safe_load', return_value=item_dict):
-            os.environ['INSTALLER_TYPE'] = 'installer_type'
-            os.environ['DEPLOY_SCENARIO'] = 'deploy_scenario'
-            self.tempestcommon.apply_tempest_blacklist()
-            obj = mock_open()
-            obj.write.assert_any_call('test1\n')
-            self.assertFalse(obj.write.assert_any_call('test2\n'))
-
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.LOGGER.info')
-    def test_run_verifier_tests_default(self, mock_logger_info):
-        with mock.patch('__builtin__.open', mock.mock_open()), \
-            mock.patch('__builtin__.iter', return_value=[r'\} tempest\.']), \
-            mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                       'subprocess.Popen'):
-            conf_utils.TEMPEST_LIST = 'test_tempest_list'
-            cmd = ["rally", "verify", "start", "--load-list",
-                   conf_utils.TEMPEST_LIST]
-            with self.assertRaises(Exception):
-                self.tempestcommon.run_verifier_tests()
-                mock_logger_info. \
-                    assert_any_call("Starting Tempest test suite: '%s'.", cmd)
-
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                'subprocess.Popen')
-    def test_generate_report(self, mock_popen):
-        self.tempestcommon.verification_id = "1234"
-        html_file = os.path.join(conf_utils.TEMPEST_RESULTS_DIR,
-                                 "tempest-report.html")
-        cmd = ["rally", "verify", "report", "--type", "html", "--uuid",
-               "1234", "--to", html_file]
-        self.tempestcommon.generate_report()
-        mock_popen.assert_called_once_with(cmd, stdout=mock.ANY,
-                                           stderr=mock.ANY)
-
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                'os.path.exists', return_value=False)
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.os.makedirs',
-                side_effect=Exception)
-    def test_run_makedirs_ko(self, *args):
-        # pylint: disable=unused-argument
-        self.assertEqual(self.tempestcommon.run(),
-                         testcase.TestCase.EX_RUN_ERROR)
-
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                'os.path.exists', return_value=False)
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.os.makedirs')
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                'TempestResourcesManager.create', side_effect=Exception)
-    def test_run_create_resources_ko(self, *args):
-        # pylint: disable=unused-argument
-        self.assertEqual(self.tempestcommon.run(),
-                         testcase.TestCase.EX_RUN_ERROR)
-
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                'os.path.exists', return_value=False)
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.os.makedirs')
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                'TempestResourcesManager.create', return_value={})
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
-                'get_active_compute_cnt', side_effect=Exception)
-    def test_run_get_active_comp_cnt_ko(self, *args):
-        # pylint: disable=unused-argument
-        self.assertEqual(self.tempestcommon.run(),
-                         testcase.TestCase.EX_RUN_ERROR)
-
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                'os.path.exists', return_value=False)
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.os.makedirs')
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                'TempestResourcesManager.create', return_value={})
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
-                'get_active_compute_cnt', return_value=2)
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                'conf_utils.configure_tempest', side_effect=Exception)
-    def test_run_configure_tempest_ko(self, *args):
-        # pylint: disable=unused-argument
-        self.assertEqual(self.tempestcommon.run(),
-                         testcase.TestCase.EX_RUN_ERROR)
-
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                'os.path.exists', return_value=False)
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.os.makedirs')
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                'TempestResourcesManager.create', return_value={})
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
-                'get_active_compute_cnt', return_value=2)
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                'conf_utils.configure_tempest')
-    def _test_run(self, status, *args):
-        # pylint: disable=unused-argument
-        self.assertEqual(self.tempestcommon.run(), status)
-
-    def test_run_missing_gen_test_list(self):
-        with mock.patch.object(self.tempestcommon, 'generate_test_list',
-                               side_effect=Exception):
-            self._test_run(testcase.TestCase.EX_RUN_ERROR)
-
-    def test_run_apply_blacklist_ko(self):
-        with mock.patch.object(self.tempestcommon, 'generate_test_list'), \
-                    mock.patch.object(self.tempestcommon,
-                                      'apply_tempest_blacklist',
-                                      side_effect=Exception()):
-            self._test_run(testcase.TestCase.EX_RUN_ERROR)
-
-    def test_run_verifier_tests_ko(self):
-        with mock.patch.object(self.tempestcommon, 'generate_test_list'), \
-                mock.patch.object(self.tempestcommon,
-                                  'apply_tempest_blacklist'), \
-                mock.patch.object(self.tempestcommon, 'run_verifier_tests',
-                                  side_effect=Exception()), \
-                mock.patch.object(self.tempestcommon, 'parse_verifier_result',
-                                  side_effect=Exception):
-            self._test_run(testcase.TestCase.EX_RUN_ERROR)
-
-    def test_run_verif_result_ko(self):
-        with mock.patch.object(self.tempestcommon, 'generate_test_list'), \
-                mock.patch.object(self.tempestcommon,
-                                  'apply_tempest_blacklist'), \
-                mock.patch.object(self.tempestcommon, 'run_verifier_tests'), \
-                mock.patch.object(self.tempestcommon, 'parse_verifier_result',
-                                  side_effect=Exception):
-            self._test_run(testcase.TestCase.EX_RUN_ERROR)
-
-    def test_run(self):
-        with mock.patch.object(self.tempestcommon, 'generate_test_list'), \
-                mock.patch.object(self.tempestcommon,
-                                  'apply_tempest_blacklist'), \
-                mock.patch.object(self.tempestcommon, 'run_verifier_tests'), \
-                mock.patch.object(self.tempestcommon,
-                                  'parse_verifier_result'), \
-                mock.patch.object(self.tempestcommon, 'generate_report'):
-            self._test_run(testcase.TestCase.EX_OK)
-
-
-if __name__ == "__main__":
-    logging.disable(logging.CRITICAL)
-    unittest.main(verbosity=2)
diff --git a/functest/tests/unit/openstack/vping/__init__.py b/functest/tests/unit/openstack/vping/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/functest/tests/unit/openstack/vping/__init__.py
+++ /dev/null
diff --git a/functest/tests/unit/openstack/vping/test_vping.py b/functest/tests/unit/openstack/vping/test_vping.py
deleted file mode 100644
index 91cf2259..00000000
--- a/functest/tests/unit/openstack/vping/test_vping.py
+++ /dev/null
@@ -1,174 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2017 Cable Television Laboratories, Inc. 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
-
-# pylint: disable=missing-docstring
-
-import logging
-import unittest
-
-import mock
-
-from snaps.config.keypair import KeypairConfig
-from snaps.config.network import NetworkConfig, PortConfig, SubnetConfig
-from snaps.config.router import RouterConfig
-from snaps.config.security_group import SecurityGroupConfig
-from snaps.config.vm_inst import VmInstanceConfig
-
-from snaps.openstack.create_image import OpenStackImage
-from snaps.openstack.create_instance import OpenStackVmInstance
-from snaps.openstack.create_keypairs import OpenStackKeypair
-from snaps.openstack.create_network import OpenStackNetwork
-from snaps.openstack.create_router import OpenStackRouter
-from snaps.openstack.create_security_group import OpenStackSecurityGroup
-
-from snaps.openstack.os_credentials import OSCreds
-
-from functest.core.testcase import TestCase
-from functest.opnfv_tests.openstack.vping import vping_userdata, vping_ssh
-
-
-class VPingUserdataTesting(unittest.TestCase):
-    """
-    Ensures the VPingUserdata class can run in Functest. This test does not
-    actually connect with an OpenStack pod.
-    """
-
-    def setUp(self):
-        self.os_creds = OSCreds(
-            username='user', password='pass',
-            auth_url='http://foo.com:5000/v3', project_name='bar')
-
-        self.vping_userdata = vping_userdata.VPingUserdata(
-            os_creds=self.os_creds)
-
-    @mock.patch('snaps.openstack.utils.deploy_utils.create_vm_instance')
-    @mock.patch('os.path.exists', return_value=True)
-    @mock.patch('snaps.openstack.utils.keystone_utils.keystone_client')
-    @mock.patch('snaps.openstack.utils.keystone_utils.get_project')
-    @mock.patch('snaps.openstack.create_flavor.OpenStackFlavor.create',
-                return_value=None)
-    @mock.patch('snaps.openstack.create_instance.OpenStackVmInstance.'
-                'get_port_ip', return_value='10.0.0.1')
-    @mock.patch('snaps.openstack.create_instance.OpenStackVmInstance.'
-                'vm_active', return_value=True)
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
-                'get_ext_net_name', return_value='foo')
-    def test_vping_userdata(self, *args):
-        # pylint: disable=unused-argument
-        with mock.patch('snaps.openstack.utils.deploy_utils.create_image',
-                        return_value=OpenStackImage(self.os_creds, None)), \
-                mock.patch('snaps.openstack.utils.deploy_utils.create_network',
-                           return_value=OpenStackNetwork(
-                               self.os_creds, NetworkConfig(name='foo'))), \
-                mock.patch('snaps.openstack.utils.deploy_utils.create_router',
-                           return_value=OpenStackRouter(
-                               self.os_creds, RouterConfig(name='foo'))), \
-                mock.patch('snaps.openstack.utils.deploy_utils.'
-                           'create_vm_instance',
-                           return_value=OpenStackVmInstance(
-                               self.os_creds,
-                               VmInstanceConfig(
-                                   name='foo', flavor='bar',
-                                   port_settings=[PortConfig(
-                                       name='foo', network_name='bar')]),
-                               None)), \
-                mock.patch('snaps.openstack.create_instance.'
-                           'OpenStackVmInstance.get_console_output',
-                           return_value='vPing OK'):
-            self.assertEquals(TestCase.EX_OK, self.vping_userdata.run())
-
-
-class VPingSSHTesting(unittest.TestCase):
-    """
-    Ensures the VPingUserdata class can run in Functest. This test does not
-    actually connect with an OpenStack pod.
-    """
-
-    def setUp(self):
-        self.os_creds = OSCreds(
-            username='user', password='pass',
-            auth_url='http://foo.com:5000/v3', project_name='bar')
-
-        self.vping_ssh = vping_ssh.VPingSSH(
-            os_creds=self.os_creds)
-
-    @mock.patch('snaps.openstack.utils.deploy_utils.create_vm_instance')
-    @mock.patch('os.path.exists', return_value=True)
-    @mock.patch('snaps.openstack.utils.keystone_utils.keystone_client')
-    @mock.patch('snaps.openstack.utils.keystone_utils.get_project')
-    @mock.patch('snaps.openstack.create_flavor.OpenStackFlavor.create',
-                return_value=None)
-    @mock.patch('snaps.openstack.create_instance.OpenStackVmInstance.'
-                'get_port_ip', return_value='10.0.0.1')
-    @mock.patch('snaps.openstack.create_instance.OpenStackVmInstance.'
-                'vm_active', return_value=True)
-    @mock.patch('snaps.openstack.create_instance.OpenStackVmInstance.'
-                'vm_ssh_active', return_value=True)
-    @mock.patch('snaps.openstack.create_instance.OpenStackVmInstance.'
-                'ssh_client', return_value=True)
-    @mock.patch('scp.SCPClient')
-    @mock.patch('functest.opnfv_tests.openstack.vping.vping_ssh.'
-                'VPingSSH._transfer_ping_script', return_value=True)
-    @mock.patch('functest.opnfv_tests.openstack.vping.vping_ssh.'
-                'VPingSSH._do_vping_ssh', return_value=TestCase.EX_OK)
-    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
-                'get_ext_net_name', return_value='foo')
-    def test_vping_ssh(self, *args):
-        # pylint: disable=unused-argument
-        os_vm_inst = mock.MagicMock(name='get_console_output')
-        os_vm_inst.get_console_output.return_value = 'vPing OK'
-        ssh_client = mock.MagicMock(name='get_transport')
-        ssh_client.get_transport.return_value = None
-        scp_client = mock.MagicMock(name='put')
-        scp_client.put.return_value = None
-
-        with mock.patch('snaps.openstack.utils.deploy_utils.create_image',
-                        return_value=OpenStackImage(self.os_creds, None)), \
-                mock.patch('snaps.openstack.utils.deploy_utils.create_network',
-                           return_value=OpenStackNetwork(
-                               self.os_creds,
-                               NetworkConfig(
-                                   name='foo',
-                                   subnet_settings=[
-                                       SubnetConfig(
-                                           name='bar',
-                                           cidr='10.0.0.1/24')]))), \
-                mock.patch('snaps.openstack.utils.deploy_utils.'
-                           'create_vm_instance',
-                           return_value=OpenStackVmInstance(
-                               self.os_creds,
-                               VmInstanceConfig(
-                                   name='foo', flavor='bar',
-                                   port_settings=[PortConfig(
-                                       name='foo', network_name='bar')]),
-                               None)), \
-                mock.patch('snaps.openstack.utils.deploy_utils.create_keypair',
-                           return_value=OpenStackKeypair(
-                               self.os_creds, KeypairConfig(name='foo'))), \
-                mock.patch('snaps.openstack.utils.deploy_utils.create_router',
-                           return_value=OpenStackRouter(
-                               self.os_creds, RouterConfig(name='foo'))), \
-                mock.patch('snaps.openstack.utils.deploy_utils.'
-                           'create_security_group',
-                           return_value=OpenStackSecurityGroup(
-                               self.os_creds,
-                               SecurityGroupConfig(name='foo'))), \
-                mock.patch('snaps.openstack.create_instance.'
-                           'OpenStackVmInstance.'
-                           'get_vm_inst', return_value=os_vm_inst), \
-                mock.patch('snaps.openstack.create_instance.'
-                           'OpenStackVmInstance.'
-                           'ssh_client', return_value=ssh_client):
-            self.assertEquals(TestCase.EX_OK, self.vping_ssh.run())
-
-
-if __name__ == "__main__":
-    logging.disable(logging.CRITICAL)
-    unittest.main(verbosity=2)
diff --git a/functest/tests/unit/utils/test_functest_utils.py b/functest/tests/unit/utils/test_functest_utils.py
deleted file mode 100644
index 9f8733bb..00000000
--- a/functest/tests/unit/utils/test_functest_utils.py
+++ /dev/null
@@ -1,305 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2016 Orange 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
-
-# pylint: disable=missing-docstring
-
-import logging
-import os
-import time
-import unittest
-
-import mock
-import pkg_resources
-from six.moves import urllib
-
-from functest.utils import functest_utils
-
-
-class FunctestUtilsTesting(unittest.TestCase):
-
-    readline = 0
-    test_ip = ['10.1.23.4', '10.1.14.15', '10.1.16.15']
-
-    def setUp(self):
-        self.url = 'http://www.opnfv.org/'
-        self.timeout = 5
-        self.dest_path = 'test_path'
-        self.repo_path = 'test_repo_path'
-        self.installer = 'test_installer'
-        self.scenario = 'test_scenario'
-        self.build_tag = 'jenkins-functest-fuel-opnfv-jump-2-daily-master-190'
-        self.build_tag_week = 'jenkins-functest-fuel-baremetal-weekly-master-8'
-        self.version = 'master'
-        self.node_name = 'test_node_name'
-        self.project = 'test_project'
-        self.case_name = 'test_case_name'
-        self.status = 'test_status'
-        self.details = 'test_details'
-        self.db_url = 'test_db_url'
-        self.criteria = 50
-        self.result = 75
-        self.start_date = 1482624000
-        self.stop_date = 1482624000
-        self.start_time = time.time()
-        self.stop_time = time.time()
-        self.readline = -1
-        self.test_ip = ['10.1.23.4', '10.1.14.15', '10.1.16.15']
-        self.test_file = 'test_file'
-        self.error_msg = 'test_error_msg'
-        self.cmd = 'test_cmd'
-        self.output_file = 'test_output_file'
-        self.testname = 'testname'
-        self.parameter = 'general.openstack.image_name'
-        self.config_yaml = pkg_resources.resource_filename(
-            'functest', 'ci/config_functest.yaml')
-        self.db_url_env = 'http://foo/testdb'
-        self.testcases_yaml = "test_testcases_yaml"
-        self.file_yaml = {'general': {'openstack': {'image_name':
-                                                    'test_image_name'}}}
-
-    @mock.patch('six.moves.urllib.request.urlopen',
-                side_effect=urllib.error.URLError('no host given'))
-    def test_check_internet_connectivity_failed(self, mock_method):
-        self.assertFalse(functest_utils.check_internet_connectivity())
-        mock_method.assert_called_once_with(self.url, timeout=self.timeout)
-
-    @mock.patch('six.moves.urllib.request.urlopen')
-    def test_check_internet_connectivity_default(self, mock_method):
-        self.assertTrue(functest_utils.check_internet_connectivity())
-        mock_method.assert_called_once_with(self.url, timeout=self.timeout)
-
-    @mock.patch('six.moves.urllib.request.urlopen')
-    def test_check_internet_connectivity_debian(self, mock_method):
-        self.url = "https://www.debian.org/"
-        self.assertTrue(functest_utils.check_internet_connectivity(self.url))
-        mock_method.assert_called_once_with(self.url, timeout=self.timeout)
-
-    @mock.patch('six.moves.urllib.request.urlopen',
-                side_effect=urllib.error.URLError('no host given'))
-    def test_download_url_failed(self, mock_url):
-        self.assertFalse(functest_utils.download_url(self.url, self.dest_path))
-
-    @mock.patch('six.moves.urllib.request.urlopen')
-    def test_download_url_default(self, mock_url):
-        with mock.patch("six.moves.builtins.open", mock.mock_open()) as m, \
-                mock.patch('functest.utils.functest_utils.shutil.copyfileobj')\
-                as mock_sh:
-            name = self.url.rsplit('/')[-1]
-            dest = self.dest_path + "/" + name
-            self.assertTrue(functest_utils.download_url(self.url,
-                                                        self.dest_path))
-            m.assert_called_once_with(dest, 'wb')
-            self.assertTrue(mock_sh.called)
-
-    def _get_env_dict(self, var):
-        dic = {'INSTALLER_TYPE': self.installer,
-               'DEPLOY_SCENARIO': self.scenario,
-               'NODE_NAME': self.node_name,
-               'BUILD_TAG': self.build_tag}
-        dic.pop(var, None)
-        return dic
-
-    @staticmethod
-    def readline_side():
-        if FunctestUtilsTesting.readline == \
-                len(FunctestUtilsTesting.test_ip) - 1:
-            return False
-        FunctestUtilsTesting.readline += 1
-        return FunctestUtilsTesting.test_ip[FunctestUtilsTesting.readline]
-
-    # TODO: get_resolvconf_ns
-    @mock.patch('functest.utils.functest_utils.dns.resolver.Resolver')
-    def test_get_resolvconf_ns_default(self, mock_dns_resolve):
-        attrs = {'query.return_value': ["test"]}
-        mock_dns_resolve.configure_mock(**attrs)
-
-        m = mock.Mock()
-        attrs = {'readline.side_effect': self.readline_side}
-        m.configure_mock(**attrs)
-
-        with mock.patch("six.moves.builtins.open") as mo:
-            mo.return_value = m
-            self.assertEqual(functest_utils.get_resolvconf_ns(),
-                             self.test_ip[1:])
-
-    def _get_environ(self, var, *args):  # pylint: disable=unused-argument
-        if var == 'INSTALLER_TYPE':
-            return self.installer
-        elif var == 'DEPLOY_SCENARIO':
-            return self.scenario
-        return var
-
-    def test_get_ci_envvars_default(self):
-        with mock.patch('os.environ.get',
-                        side_effect=self._get_environ):
-            dic = {"installer": self.installer,
-                   "scenario": self.scenario}
-            self.assertDictEqual(functest_utils.get_ci_envvars(), dic)
-
-    def cmd_readline(self):
-        return 'test_value\n'
-
-    @mock.patch('functest.utils.functest_utils.LOGGER.error')
-    @mock.patch('functest.utils.functest_utils.LOGGER.info')
-    def test_execute_command_args_present_with_error(self, mock_logger_info,
-                                                     mock_logger_error):
-        with mock.patch('functest.utils.functest_utils.subprocess.Popen') \
-                as mock_subproc_open, \
-                mock.patch('six.moves.builtins.open',
-                           mock.mock_open()) as mopen:
-
-            FunctestUtilsTesting.readline = 0
-
-            mock_obj = mock.Mock()
-            attrs = {'readline.side_effect': self.cmd_readline()}
-            mock_obj.configure_mock(**attrs)
-
-            mock_obj2 = mock.Mock()
-            attrs = {'stdout': mock_obj, 'wait.return_value': 1}
-            mock_obj2.configure_mock(**attrs)
-
-            mock_subproc_open.return_value = mock_obj2
-
-            resp = functest_utils.execute_command(self.cmd, info=True,
-                                                  error_msg=self.error_msg,
-                                                  verbose=True,
-                                                  output_file=self.output_file)
-            self.assertEqual(resp, 1)
-            msg_exec = ("Executing command: '%s'" % self.cmd)
-            mock_logger_info.assert_called_once_with(msg_exec)
-            mopen.assert_called_once_with(self.output_file, "w")
-            mock_logger_error.assert_called_once_with(self.error_msg)
-
-    @mock.patch('functest.utils.functest_utils.LOGGER.info')
-    def test_execute_command_args_present_with_success(self, mock_logger_info,
-                                                       ):
-        with mock.patch('functest.utils.functest_utils.subprocess.Popen') \
-                as mock_subproc_open, \
-                mock.patch('six.moves.builtins.open',
-                           mock.mock_open()) as mopen:
-
-            FunctestUtilsTesting.readline = 0
-
-            mock_obj = mock.Mock()
-            attrs = {'readline.side_effect': self.cmd_readline()}
-            mock_obj.configure_mock(**attrs)
-
-            mock_obj2 = mock.Mock()
-            attrs = {'stdout': mock_obj, 'wait.return_value': 0}
-            mock_obj2.configure_mock(**attrs)
-
-            mock_subproc_open.return_value = mock_obj2
-
-            resp = functest_utils.execute_command(self.cmd, info=True,
-                                                  error_msg=self.error_msg,
-                                                  verbose=True,
-                                                  output_file=self.output_file)
-            self.assertEqual(resp, 0)
-            msg_exec = ("Executing command: '%s'" % self.cmd)
-            mock_logger_info.assert_called_once_with(msg_exec)
-            mopen.assert_called_once_with(self.output_file, "w")
-
-    @mock.patch('sys.stdout')
-    def test_execute_command_args_missing_with_success(self, stdout=None):
-        with mock.patch('functest.utils.functest_utils.subprocess.Popen') \
-                as mock_subproc_open:
-
-            FunctestUtilsTesting.readline = 2
-
-            mock_obj = mock.Mock()
-            attrs = {'readline.side_effect': self.cmd_readline()}
-            mock_obj.configure_mock(**attrs)
-
-            mock_obj2 = mock.Mock()
-            attrs = {'stdout': mock_obj, 'wait.return_value': 0}
-            mock_obj2.configure_mock(**attrs)
-
-            mock_subproc_open.return_value = mock_obj2
-
-            resp = functest_utils.execute_command(self.cmd, info=False,
-                                                  error_msg="",
-                                                  verbose=False,
-                                                  output_file=None)
-            self.assertEqual(resp, 0)
-
-    @mock.patch('sys.stdout')
-    def test_execute_command_args_missing_with_error(self, stdout=None):
-        with mock.patch('functest.utils.functest_utils.subprocess.Popen') \
-                as mock_subproc_open:
-
-            FunctestUtilsTesting.readline = 2
-            mock_obj = mock.Mock()
-            attrs = {'readline.side_effect': self.cmd_readline()}
-            mock_obj.configure_mock(**attrs)
-
-            mock_obj2 = mock.Mock()
-            attrs = {'stdout': mock_obj, 'wait.return_value': 1}
-            mock_obj2.configure_mock(**attrs)
-
-            mock_subproc_open.return_value = mock_obj2
-
-            resp = functest_utils.execute_command(self.cmd, info=False,
-                                                  error_msg="",
-                                                  verbose=False,
-                                                  output_file=None)
-            self.assertEqual(resp, 1)
-
-    def _get_functest_config(self, var):
-        return var
-
-    def test_get_parameter_from_yaml_failed(self):
-        self.file_yaml['general'] = None
-        with mock.patch('six.moves.builtins.open', mock.mock_open()), \
-                mock.patch('functest.utils.functest_utils.yaml.safe_load') \
-                as mock_yaml, \
-                self.assertRaises(ValueError) as excep:
-            mock_yaml.return_value = self.file_yaml
-            functest_utils.get_parameter_from_yaml(self.parameter,
-                                                   self.test_file)
-            self.assertTrue(("The parameter %s is not"
-                             " defined in config_functest.yaml" %
-                             self.parameter) in excep.exception)
-
-    def test_get_parameter_from_yaml_default(self):
-        with mock.patch('six.moves.builtins.open', mock.mock_open()), \
-                mock.patch('functest.utils.functest_utils.yaml.safe_load') \
-                as mock_yaml:
-            mock_yaml.return_value = self.file_yaml
-            self.assertEqual(functest_utils.
-                             get_parameter_from_yaml(self.parameter,
-                                                     self.test_file),
-                             'test_image_name')
-
-    @mock.patch('functest.utils.functest_utils.get_parameter_from_yaml')
-    def test_get_functest_config_default(self, mock_get_parameter_from_yaml):
-        with mock.patch.dict(os.environ,
-                             {'CONFIG_FUNCTEST_YAML': self.config_yaml}):
-            functest_utils.get_functest_config(self.parameter)
-            mock_get_parameter_from_yaml. \
-                assert_called_once_with(self.parameter,
-                                        self.config_yaml)
-
-    def test_get_functest_yaml(self):
-        with mock.patch('six.moves.builtins.open', mock.mock_open()), \
-                mock.patch('functest.utils.functest_utils.yaml.safe_load') \
-                as mock_yaml:
-            mock_yaml.return_value = self.file_yaml
-            resp = functest_utils.get_functest_yaml()
-            self.assertEqual(resp, self.file_yaml)
-
-    @mock.patch('functest.utils.functest_utils.LOGGER.info')
-    def test_print_separator(self, mock_logger_info):
-        functest_utils.print_separator()
-        mock_logger_info.assert_called_once_with("======================="
-                                                 "=======================")
-
-
-if __name__ == "__main__":
-    logging.disable(logging.CRITICAL)
-    unittest.main(verbosity=2)
diff --git a/functest/tests/unit/vnf/__init__.py b/functest/tests/unit/vnf/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/functest/tests/unit/vnf/__init__.py
+++ /dev/null
diff --git a/functest/tests/unit/vnf/epc/__init__.py b/functest/tests/unit/vnf/epc/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/functest/tests/unit/vnf/epc/__init__.py
+++ /dev/null
diff --git a/functest/tests/unit/vnf/epc/test_juju_epc.py b/functest/tests/unit/vnf/epc/test_juju_epc.py
deleted file mode 100644
index 6b413706..00000000
--- a/functest/tests/unit/vnf/epc/test_juju_epc.py
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2017 Rebaca 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
-
-""" Unit test testcase for JuJu EPC Implementation"""
-
-import logging
-import unittest
-
-import mock
-
-from functest.opnfv_tests.vnf.epc import juju_epc
-
-
-class JujuEpcTesting(unittest.TestCase):
-    # pylint: disable=missing-docstring
-    """Unittest for ABoT EPC with juju orchestrator"""
-
-    def setUp(self):
-
-        self.tenant = 'juju_epc'
-        self.creds = {'username': 'user',
-                      'password': 'pwd'}
-        self.orchestrator = {'name': 'juju',
-                             'version': '2.0',
-                             'object': 'foo',
-                             'requirements': {'flavor': {'name': 'm1.small',
-                                                         'ram_min': 2048},
-                                              'pip': 'python3-pip',
-                                              'repo_link': 'ppa:juju/stable',
-                                              'dep_package': 'software-'
-                                                             'properties'
-                                                             '-common',
-                                              'pip3_packages': 'juju-wait'}}
-        self.vnf = {'name': 'juju_epc',
-                    'descriptor': {'version': '1',
-                                   'file_name': '/src/epc-test/'
-                                                'abot_charm/'
-                                                'functest-abot-'
-                                                'epc-bundle/bundle.yaml',
-                                   'name': 'abot-oai-epc',
-                                   'requirements': {'flavor':
-                                                    {'name': 'm1.medium',
-                                                     'ram_min': 4096}}}}
-        with mock.patch('functest.opnfv_tests.vnf.epc.juju_epc.os.makedirs'), \
-            mock.patch('functest.opnfv_tests.vnf.epc.juju_epc.get_config',
-                       return_value={'tenant_images': 'foo',
-                                     'orchestrator': self.orchestrator,
-                                     'vnf': self.vnf, 'vnf_test_suite': '',
-                                     'version': 'whatever'}):
-            self.epc_vnf = juju_epc.JujuEpc()
-
-        self.images = {'image1': 'url1',
-                       'image2': 'url2'}
-        self.details = {'orchestrator': {'status': 'PASS', 'duration': 120},
-                        'vnf': {},
-                        'test_vnf':  {}}
-
-    @unittest.skip("It must be fixed. Please see JIRA FUNCTEST-915")
-    @mock.patch('snaps.openstack.create_image.OpenStackImage.create')
-    @mock.patch('os.system')
-    def test_prepare_default(self, *args):
-        """ Unittest for Prepare testcase """
-        self.epc_vnf.orchestrator = self.orchestrator
-        self.assertIsNone(self.epc_vnf.prepare())
-        args[4].assert_called_once_with('test',
-                                        'debayan',
-                                        'OAI EPC deployed '
-                                        'with Juju')
-
-
-if __name__ == "__main__":
-    logging.disable(logging.CRITICAL)
-    unittest.main(verbosity=2)
diff --git a/functest/tests/unit/vnf/ims/__init__.py b/functest/tests/unit/vnf/ims/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/functest/tests/unit/vnf/ims/__init__.py
+++ /dev/null
diff --git a/functest/tests/unit/vnf/ims/test_cloudify_ims.py b/functest/tests/unit/vnf/ims/test_cloudify_ims.py
deleted file mode 100644
index 79069a5d..00000000
--- a/functest/tests/unit/vnf/ims/test_cloudify_ims.py
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/env python
-
-# 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
-
-# pylint: disable=missing-docstring
-
-import logging
-import unittest
-
-import mock
-
-from functest.core import vnf
-from functest.opnfv_tests.vnf.ims import cloudify_ims
-
-
-class CloudifyImsTesting(unittest.TestCase):
-
-    def setUp(self):
-
-        self.tenant = 'cloudify_ims'
-        self.creds = {'username': 'user',
-                      'password': 'pwd'}
-        self.orchestrator = {'name': 'cloudify',
-                             'version': '4.0',
-                             'object': 'foo',
-                             'requirements': {'flavor': {'name': 'm1.medium',
-                                                         'ram_min': 4096},
-                                              'os_image': 'manager_4.0'}}
-
-        self.vnf = {'name': 'clearwater',
-                    'descriptor': {'version': '108',
-                                   'file_name': 'openstack-blueprint.yaml',
-                                   'name': 'clearwater-opnfv',
-                                   'url': 'https://foo',
-                                   'requirements': {'flavor':
-                                                    {'name': 'm1.medium',
-                                                     'ram_min': 2048}}}}
-
-        with mock.patch('functest.opnfv_tests.vnf.ims.cloudify_ims.'
-                        'os.makedirs'), \
-            mock.patch('functest.opnfv_tests.vnf.ims.cloudify_ims.'
-                       'get_config', return_value={
-                           'tenant_images': 'foo',
-                           'orchestrator': self.orchestrator,
-                           'vnf': self.vnf,
-                           'vnf_test_suite': '',
-                           'version': 'whatever'}):
-
-            self.ims_vnf = cloudify_ims.CloudifyIms()
-
-        self.images = {'image1': 'url1',
-                       'image2': 'url2'}
-        self.details = {'orchestrator': {'status': 'PASS', 'duration': 120},
-                        'vnf': {},
-                        'test_vnf':  {}}
-
-    def test_prepare_missing_param(self):
-        with self.assertRaises(vnf.VnfPreparationException):
-            self.ims_vnf.prepare()
-
-
-if __name__ == "__main__":
-    logging.disable(logging.CRITICAL)
-    unittest.main(verbosity=2)
diff --git a/functest/tests/unit/vnf/ims/test_ims_base.py b/functest/tests/unit/vnf/ims/test_ims_base.py
deleted file mode 100644
index 97654748..00000000
--- a/functest/tests/unit/vnf/ims/test_ims_base.py
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env python
-
-# 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
-
-# pylint: disable=missing-docstring
-
-import logging
-import unittest
-
-import mock
-
-from functest.opnfv_tests.vnf.ims import clearwater_ims_base as ims_base
-
-
-class ClearwaterOnBoardingBaseTesting(unittest.TestCase):
-
-    def setUp(self):
-        with mock.patch('functest.opnfv_tests.vnf.ims.cloudify_ims.'
-                        'os.makedirs'):
-            self.ims_vnf = ims_base.ClearwaterOnBoardingBase()
-
-        self.mock_post = mock.Mock()
-        attrs = {'status_code': 201,
-                 'cookies': ""}
-        self.mock_post.configure_mock(**attrs)
-
-        self.mock_post_200 = mock.Mock()
-        attrs = {'status_code': 200,
-                 'cookies': ""}
-        self.mock_post_200.configure_mock(**attrs)
-
-        self.mock_post_500 = mock.Mock()
-        attrs = {'status_code': 500,
-                 'cookies': ""}
-        self.mock_post_200.configure_mock(**attrs)
-
-if __name__ == "__main__":
-    logging.disable(logging.CRITICAL)
-    unittest.main(verbosity=2)
diff --git a/functest/tests/unit/vnf/ims/test_orchestra_clearwaterims.py b/functest/tests/unit/vnf/ims/test_orchestra_clearwaterims.py
deleted file mode 100644
index 2e83f30a..00000000
--- a/functest/tests/unit/vnf/ims/test_orchestra_clearwaterims.py
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/usr/bin/env python
-
-# 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
-
-"""Test module for orchestra_clearwaterims"""
-
-import logging
-import unittest
-
-import mock
-
-from functest.core import vnf
-from functest.opnfv_tests.vnf.ims import orchestra_clearwaterims
-
-
-class OrchestraClearwaterImsTesting(unittest.TestCase):
-    """Test class for orchestra_clearwaterims"""
-    def setUp(self):
-
-        self.tenant = 'orchestra_clearwaterims'
-        self.creds = {'username': 'mocked_username',
-                      'password': 'mocked_password'}
-        self.tenant_images = {
-            'image1': 'mocked_image_url_1',
-            'image2': 'mocked_image_url_2'
-        }
-        self.mano = {
-            'name': 'openbaton',
-            'version': '3.2.0',
-            'object': 'foo',
-            'requirements': {
-                'flavor': {
-                    'name': 'mocked_flavor',
-                    'ram_min': 4096,
-                    'disk': 5,
-                    'vcpus': 2
-                },
-                'os_image': 'mocked_image'
-            },
-            'bootstrap': {
-                'url': 'mocked_bootstrap_url',
-                'config': {
-                    'url': 'mocked_config_url'}
-            },
-            'gvnfm': {
-                'userdata': {
-                    'url': 'mocked_userdata_url'
-                }
-            },
-            'credentials': {
-                'username': 'mocked_username',
-                'password': 'mocked_password'
-            }
-        }
-        self.vnf = {
-            'name': 'openims',
-            'descriptor': {
-                'url': 'mocked_descriptor_url'
-            },
-            'requirements': {
-                'flavor': {
-                    'name': 'mocked_flavor',
-                    'ram_min': 2048,
-                    'disk': 5,
-                    'vcpus': 2}
-            }
-        }
-        self.clearwaterims = {
-            'scscf': {
-                'ports': [3870, 6060]
-            },
-            'pcscf': {
-                'ports': [4060]
-            },
-            'icscf': {
-                'ports': [3869, 5060]
-            },
-            'fhoss': {
-                'ports': [3868]
-            },
-            'bind9': {
-                'ports': []
-            }
-        }
-        with mock.patch('functest.opnfv_tests.vnf.ims.orchestra_clearwaterims.'
-                        'os.makedirs'),\
-            mock.patch('functest.opnfv_tests.vnf.ims.orchestra_clearwaterims.'
-                       'get_config', return_value={
-                           'orchestrator': self.mano,
-                           'name': self.mano['name'],
-                           'version': self.mano['version'],
-                           'requirements': self.mano['requirements'],
-                           'credentials': self.mano['credentials'],
-                           'bootstrap': self.mano['bootstrap'],
-                           'gvnfm': self.mano['gvnfm'],
-                           'os_image': self.mano['requirements']['os_image'],
-                           'flavor': self.mano['requirements']['flavor'],
-                           'url': self.mano['bootstrap']['url'],
-                           'config': self.mano['bootstrap']['config'],
-                           'tenant_images': self.tenant_images,
-                           'vnf': self.vnf,
-                           'orchestra_clearwaterims': self.clearwaterims}):
-            self.ims_vnf = orchestra_clearwaterims.ClearwaterImsVnf()
-
-        self.details = {'orchestrator': {'status': 'PASS', 'duration': 120},
-                        'vnf': {},
-                        'test_vnf': {}}
-
-    def test_prepare_missing_param(self):
-        """Testing prepare function with missing param"""
-        with self.assertRaises(vnf.VnfPreparationException):
-            self.ims_vnf.prepare()
-
-
-if __name__ == "__main__":
-    logging.disable(logging.CRITICAL)
-    unittest.main(verbosity=2)
diff --git a/functest/tests/unit/vnf/ims/test_orchestra_openims.py b/functest/tests/unit/vnf/ims/test_orchestra_openims.py
deleted file mode 100644
index 47a8d033..00000000
--- a/functest/tests/unit/vnf/ims/test_orchestra_openims.py
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/usr/bin/env python
-
-# 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
-
-"""Test module for orchestra_openims"""
-
-import logging
-import unittest
-
-import mock
-
-from functest.core import vnf
-from functest.opnfv_tests.vnf.ims import orchestra_openims
-
-
-class OrchestraOpenImsTesting(unittest.TestCase):
-    """Test class for orchestra_openims"""
-    def setUp(self):
-
-        self.tenant = 'orchestra_openims'
-        self.creds = {'username': 'mocked_username',
-                      'password': 'mocked_password'}
-        self.tenant_images = {
-            'image1': 'mocked_image_url_1',
-            'image2': 'mocked_image_url_2'
-        }
-        self.mano = {
-            'name': 'openbaton',
-            'version': '3.2.0',
-            'object': 'foo',
-            'requirements': {
-                'flavor': {
-                    'name': 'mocked_flavor',
-                    'ram_min': 4096,
-                    'disk': 5,
-                    'vcpus': 2
-                },
-                'os_image': 'mocked_image'
-            },
-            'bootstrap': {
-                'url': 'mocked_bootstrap_url',
-                'config': {
-                    'url': 'mocked_config_url'}
-            },
-            'gvnfm': {
-                'userdata': {
-                    'url': 'mocked_userdata_url'
-                }
-            },
-            'credentials': {
-                'username': 'mocked_username',
-                'password': 'mocked_password'
-            }
-        }
-        self.vnf = {
-            'name': 'openims',
-            'descriptor': {
-                'url': 'mocked_descriptor_url'
-            },
-            'requirements': {
-                'flavor': {
-                    'name': 'mocked_flavor',
-                    'ram_min': 2048,
-                    'disk': 5,
-                    'vcpus': 2}
-            }
-        }
-        self.openims = {
-            'scscf': {
-                'ports': [3870, 6060]
-            },
-            'pcscf': {
-                'ports': [4060]
-            },
-            'icscf': {
-                'ports': [3869, 5060]
-            },
-            'fhoss': {
-                'ports': [3868]
-            },
-            'bind9': {
-                'ports': []
-            }
-        }
-        with mock.patch('functest.opnfv_tests.vnf.ims.orchestra_openims.'
-                        'os.makedirs'),\
-            mock.patch('functest.opnfv_tests.vnf.ims.orchestra_openims.'
-                       'get_config', return_value={
-                           'orchestrator': self.mano,
-                           'name': self.mano['name'],
-                           'version': self.mano['version'],
-                           'requirements': self.mano['requirements'],
-                           'credentials': self.mano['credentials'],
-                           'bootstrap': self.mano['bootstrap'],
-                           'gvnfm': self.mano['gvnfm'],
-                           'os_image':
-                               self.mano['requirements']['os_image'],
-                           'flavor':
-                               self.mano['requirements']['flavor'],
-                           'url': self.mano['bootstrap']['url'],
-                           'config': self.mano['bootstrap']['config'],
-                           'tenant_images': self.tenant_images,
-                           'vnf': self.vnf,
-                           'orchestra_openims': self.openims}):
-            self.ims_vnf = orchestra_openims.OpenImsVnf()
-
-        self.details = {'orchestrator': {'status': 'PASS', 'duration': 120},
-                        'vnf': {},
-                        'test_vnf': {}}
-
-    def test_prepare_missing_param(self):
-        """Testing prepare function with missing param"""
-        with self.assertRaises(vnf.VnfPreparationException):
-            self.ims_vnf.prepare()
-
-
-if __name__ == "__main__":
-    logging.disable(logging.CRITICAL)
-    unittest.main(verbosity=2)
diff --git a/functest/tests/unit/vnf/router/__init__.py b/functest/tests/unit/vnf/router/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/functest/tests/unit/vnf/router/__init__.py
+++ /dev/null
diff --git a/functest/tests/unit/vnf/router/test_cloudify_vrouter.py b/functest/tests/unit/vnf/router/test_cloudify_vrouter.py
deleted file mode 100644
index db03d716..00000000
--- a/functest/tests/unit/vnf/router/test_cloudify_vrouter.py
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2017 Okinawa Open Laboratory 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
-
-# pylint: disable=missing-docstring
-
-import logging
-import unittest
-
-import mock
-
-from functest.core import vnf
-from functest.opnfv_tests.vnf.router import cloudify_vrouter
-
-
-class CloudifyVrouterTesting(unittest.TestCase):
-
-    def setUp(self):
-
-        self.tenant = 'cloudify_vrouter'
-        self.creds = {'username': 'user',
-                      'password': 'pwd'}
-        self.orchestrator = {'name': 'cloudify',
-                             'version': '4.0',
-                             'object': 'foo',
-                             'requirements': {'flavor': {'name': 'm1.medium',
-                                                         'ram_min': 4096},
-                                              'os_image': 'manager_4.0'}}
-
-        self.vnf = {'name': 'vrouter',
-                    'descriptor': {'version': '100',
-                                   'file_name': 'function-test-' +
-                                                'openstack-blueprint.yaml',
-                                   'name': 'vrouter-opnfv',
-                                   'url': 'https://foo',
-                                   'requirements': {'flavor':
-                                                    {'name': 'm1.medium',
-                                                     'ram_min': 2048}}}}
-
-        # pylint: disable=bad-continuation
-        with mock.patch(
-                'functest.opnfv_tests.vnf.router.cloudify_vrouter.Utilvnf'), \
-                mock.patch('functest.opnfv_tests.vnf.router.'
-                           'cloudify_vrouter.vrouter_base.Utilvnf'), \
-                mock.patch('os.makedirs'), \
-                mock.patch(
-                    'functest.utils.functest_utils.get_parameter_from_yaml',
-                    return_value={
-                        'tenant_images': 'foo',
-                        'orchestrator': self.orchestrator,
-                        'vnf': self.vnf, 'vnf_test_suite': '',
-                        'version': 'whatever'}):
-
-            self.router_vnf = cloudify_vrouter.CloudifyVrouter()
-
-        self.images = {'image1': 'url1',
-                       'image2': 'url2'}
-        self.details = {'orchestrator': {'status': 'PASS', 'duration': 120},
-                        'vnf': {},
-                        'test_vnf':  {}}
-
-    def test_prepare_missing_param(self):
-        with self.assertRaises(vnf.VnfPreparationException):
-            self.router_vnf.prepare()
-
-
-if __name__ == "__main__":
-    logging.disable(logging.CRITICAL)
-    unittest.main(verbosity=2)
diff --git a/functest/tests/unit/vnf/router/test_vrouter_base.py b/functest/tests/unit/vnf/router/test_vrouter_base.py
deleted file mode 100644
index 1851b201..00000000
--- a/functest/tests/unit/vnf/router/test_vrouter_base.py
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2017 Okinawa Open Laboratory 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
-
-# pylint: disable=missing-docstring
-
-import logging
-import unittest
-
-import mock
-
-from functest.opnfv_tests.vnf.router import vrouter_base
-
-
-class VrouterOnBoardingBaseTesting(unittest.TestCase):
-
-    def setUp(self):
-        with mock.patch('functest.opnfv_tests.vnf.router.cloudify_vrouter.'
-                        'os.makedirs'):
-            self.vrouter_vnf = vrouter_base.VrouterOnBoardingBase()
-
-
-if __name__ == "__main__":
-    logging.disable(logging.CRITICAL)
-    unittest.main(verbosity=2)