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>

12 files changed, 0 insertions, 1620 deletions

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)