Refactor resource creation and cleanup in Tempest

Use Snaps to create resources before running a testcase and to clean up
afterwards.
Use Tempest Cleanup utility to clean other resources.

Change-Id: Ic0f69d3bafb60dfb283d18ac507e9f5992e9ae38
Signed-off-by: Martin Kulhavy <martin.kulhavy@nokia.com>

3 files changed, 126 insertions, 142 deletions

diff --git a/functest/tests/unit/openstack/refstack_client/test_refstack_client.py b/functest/tests/unit/openstack/refstack_client/test_refstack_client.py
index c5601075e..5a2013181 100644
--- a/functest/tests/unit/openstack/refstack_client/test_refstack_client.py
+++ b/functest/tests/unit/openstack/refstack_client/test_refstack_client.py
@@ -12,9 +12,12 @@ import pkg_resources
 import unittest
 
 from functest.core import testcase
-from functest.opnfv_tests.openstack.refstack_client import refstack_client
+from functest.opnfv_tests.openstack.refstack_client.refstack_client import \
+    RefstackClient, RefstackClientParser
 from functest.utils.constants import CONST
 
+from snaps.openstack.os_credentials import OSCreds
+
 
 class OSRefstackClientTesting(unittest.TestCase):
 
@@ -25,34 +28,42 @@ class OSRefstackClientTesting(unittest.TestCase):
         'functest', 'opnfv_tests/openstack/refstack_client/defcore.txt')
 
     def setUp(self):
-        self.defaultargs = {'config': self._config,
-                            'testlist': self._testlist}
+        self.default_args = {'config': self._config,
+                             'testlist': self._testlist}
         CONST.__setattr__('OS_AUTH_URL', 'https://ip:5000/v3')
         CONST.__setattr__('OS_INSECURE', 'true')
-        self.refstackclient = refstack_client.RefstackClient()
+        self.os_creds = OSCreds(
+            username='user', password='pass',
+            auth_url='http://foo.com:5000/v3', project_name='bar')
+
+    def _create_client(self):
+        with mock.patch('snaps.openstack.tests.openstack_tests.'
+                        'get_credentials', return_value=self.os_creds):
+            return RefstackClient()
 
     def test_run_defcore_insecure(self):
         insecure = '-k'
         config = 'tempest.conf'
         testlist = 'testlist'
+        client = self._create_client()
         with mock.patch('functest.opnfv_tests.openstack.refstack_client.'
                         'refstack_client.ft_utils.execute_command') as m:
             cmd = ("refstack-client test {0} -c {1} -v --test-list {2}"
                    .format(insecure, config, testlist))
-            self.refstackclient.run_defcore(config, testlist)
+            client.run_defcore(config, testlist)
             m.assert_any_call(cmd)
 
     def test_run_defcore(self):
         CONST.__setattr__('OS_AUTH_URL', 'http://ip:5000/v3')
-        refstackclient = refstack_client.RefstackClient()
         insecure = ''
         config = 'tempest.conf'
         testlist = 'testlist'
+        client = self._create_client()
         with mock.patch('functest.opnfv_tests.openstack.refstack_client.'
                         'refstack_client.ft_utils.execute_command') as m:
             cmd = ("refstack-client test {0} -c {1} -v --test-list {2}"
                    .format(insecure, config, testlist))
-            refstackclient.run_defcore(config, testlist)
+            client.run_defcore(config, testlist)
             m.assert_any_call(cmd)
 
     @mock.patch('functest.opnfv_tests.openstack.refstack_client.'
@@ -62,7 +73,7 @@ class OSRefstackClientTesting(unittest.TestCase):
                                                     mock_logger_info):
         self.case_name = 'refstack_defcore'
         self.result = 0
-        self.refstackclient.parse_refstack_result()
+        self._create_client().parse_refstack_result()
         mock_logger_info.assert_called_once_with(
             "Testcase %s success_rate is %s%%",
             self.case_name, self.result)
@@ -82,10 +93,11 @@ class OSRefstackClientTesting(unittest.TestCase):
                         "success": ['tempest.api.compute [18.464988s]'],
                         "errors": ['tempest.api.volume [0.230334s]'],
                         "skipped": ['tempest.api.network [1.265828s]']}
+        client = self._create_client()
         with mock.patch('__builtin__.open',
                         mock.mock_open(read_data=log_file)):
-            self.refstackclient.parse_refstack_result()
-            self.assertEqual(self.refstackclient.details, self.details)
+            client.parse_refstack_result()
+            self.assertEqual(client.details, self.details)
 
     def _get_main_kwargs(self, key=None):
         kwargs = {'config': self._config,
@@ -96,16 +108,18 @@ class OSRefstackClientTesting(unittest.TestCase):
 
     def _test_main(self, status, *args):
         kwargs = self._get_main_kwargs()
-        self.assertEqual(self.refstackclient.main(**kwargs), status)
+        client = self._create_client()
+        self.assertEqual(client.main(**kwargs), status)
         if len(args) > 0:
             args[0].assert_called_once_with(
-                refstack_client.RefstackClient.result_dir)
+                RefstackClient.result_dir)
         if len(args) > 1:
             args
 
     def _test_main_missing_keyword(self, key):
         kwargs = self._get_main_kwargs(key)
-        self.assertEqual(self.refstackclient.main(**kwargs),
+        client = self._create_client()
+        self.assertEqual(client.main(**kwargs),
                          testcase.TestCase.EX_RUN_ERROR)
 
     def test_main_missing_conf(self):
@@ -115,10 +129,10 @@ class OSRefstackClientTesting(unittest.TestCase):
         self._test_main_missing_keyword('testlist')
 
     def _test_argparser(self, arg, value):
-        self.defaultargs[arg] = value
-        parser = refstack_client.RefstackClientParser()
+        self.default_args[arg] = value
+        parser = RefstackClientParser()
         self.assertEqual(parser.parse_args(["--{}={}".format(arg, value)]),
-                         self.defaultargs)
+                         self.default_args)
 
     def test_argparser_conf(self):
         self._test_argparser('config', self._config)
@@ -127,13 +141,13 @@ class OSRefstackClientTesting(unittest.TestCase):
         self._test_argparser('testlist', self._testlist)
 
     def test_argparser_multiple_args(self):
-        self.defaultargs['config'] = self._config
-        self.defaultargs['testlist'] = self._testlist
-        parser = refstack_client.RefstackClientParser()
+        self.default_args['config'] = self._config
+        self.default_args['testlist'] = self._testlist
+        parser = RefstackClientParser()
         self.assertEqual(parser.parse_args(
             ["--config={}".format(self._config),
              "--testlist={}".format(self._testlist)
-             ]), self.defaultargs)
+             ]), self.default_args)
 
 
 if __name__ == "__main__":
diff --git a/functest/tests/unit/openstack/tempest/test_conf_utils.py b/functest/tests/unit/openstack/tempest/test_conf_utils.py
index e2937a180..22017a7a2 100644
--- a/functest/tests/unit/openstack/tempest/test_conf_utils.py
+++ b/functest/tests/unit/openstack/tempest/test_conf_utils.py
@@ -10,114 +10,83 @@ import unittest
 
 import mock
 
-from functest.opnfv_tests.openstack.tempest import conf_utils
+from functest.opnfv_tests.openstack.tempest import tempest, conf_utils
 from functest.utils.constants import CONST
+from snaps.openstack.os_credentials import OSCreds
 
 
 class OSTempestConfUtilsTesting(unittest.TestCase):
 
-    def test_create_tempest_resources_missing_network_dic(self):
-        with mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                        'os_utils.create_shared_network_full',
-                        return_value=None), \
-                self.assertRaises(Exception) as context:
-            conf_utils.create_tempest_resources()
-            msg = 'Failed to create private network'
-            self.assertTrue(msg in context)
-
-    def test_create_tempest_resources_missing_image(self):
-        with mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                        'os_utils.create_shared_network_full',
-                        return_value=mock.Mock()), \
-            mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                       'os_utils.get_or_create_image',
-                       return_value=(mock.Mock(), None)), \
-                self.assertRaises(Exception) as context:
-
-            CONST.__setattr__('tempest_use_custom_images', True)
-            conf_utils.create_tempest_resources()
-            msg = 'Failed to create image'
-            self.assertTrue(msg in context)
-
-            CONST.__setattr__('tempest_use_custom_images', False)
-            conf_utils.create_tempest_resources(use_custom_images=True)
-            msg = 'Failed to create image'
-            self.assertTrue(msg in context)
-
-    def test_create_tempest_resources_missing_flavor(self):
-        with mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                        'os_utils.create_shared_network_full',
-                        return_value=mock.Mock()), \
-            mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                       'os_utils.get_or_create_image',
-                       return_value=(mock.Mock(), 'image_id')), \
-            mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                       'os_utils.get_or_create_flavor',
-                       return_value=(mock.Mock(), None)), \
-                self.assertRaises(Exception) as context:
-            CONST.__setattr__('tempest_use_custom_images', True)
-            CONST.__setattr__('tempest_use_custom_flavors', True)
-            conf_utils.create_tempest_resources()
-            msg = 'Failed to create flavor'
-            self.assertTrue(msg in context)
-
-            CONST.__setattr__('tempest_use_custom_images', True)
-            CONST.__setattr__('tempest_use_custom_flavors', False)
-            conf_utils.create_tempest_resources(use_custom_flavors=False)
-            msg = 'Failed to create flavor'
-            self.assertTrue(msg in context)
-
-    @mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                'logger.error')
-    def create_tenant_user_and_tenant_ok(self, mock_logger_error):
-        with mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                        'os_utils.get_keystone_client',
-                        return_value=mock.Mock()), \
-            mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                       'os_utils.create_tenant',
-                       return_value='test_tenant_id'):
-            conf_utils.create_tenant_user()
-            mock_logger_error.assert_not_called()
-
-    @mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                'logger.error')
-    def create_tenant_user_and_user_ok(self, mock_logger_error):
-        with mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                        'os_utils.get_keystone_client',
-                        return_value=mock.Mock()), \
-            mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                       'os_utils.create_user',
-                       return_value='test_user_id'):
-            conf_utils.create_tenant_user()
-            mock_logger_error.assert_not_called()
-
-    @mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                'logger.error')
-    def create_tenant_user_and_tenant_failed(self, mock_logger_error):
-        with mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                        'os_utils.get_keystone_client',
-                        return_value=mock.Mock()), \
-            mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                       'os_utils.create_tenant',
-                       return_value=None):
-            conf_utils.create_tenant_user()
-            msg = ("Failed to create %s tenant"
-                   % CONST.__getattribute__('tempest_identity_tenant_name'))
-            mock_logger_error.assert_any_call(msg)
-
-    @mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                'logger.error')
-    def create_tenant_user_and_user_failed(self, mock_logger_error):
-        with mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                        'os_utils.get_keystone_client',
-                        return_value=mock.Mock()), \
-            mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                       'os_utils.create_user',
-                       return_value=None):
-            conf_utils.create_tenant_user()
-            msg = ("Failed to create %s user"
-                   % CONST.__getattribute__('tempest_identity_user_name'))
-            mock_logger_error.assert_any_call(msg)
+    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_tempest_resources_missing_network_dic(self, *mock_args):
+        tempest_resources = tempest.TempestResourcesManager(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_tempest_resources_missing_image(self, *mock_args):
+        tempest_resources = tempest.TempestResourcesManager(os_creds={})
+
+        CONST.__setattr__('tempest_use_custom_imagess', True)
+        with self.assertRaises(Exception) as context:
+            tempest_resources.create()
+        msg = 'Failed to create image'
+        self.assertTrue(msg in context.exception, msg=str(context.exception))
+
+        CONST.__setattr__('tempest_use_custom_imagess', False)
+        with self.assertRaises(Exception) as context:
+            tempest_resources.create(use_custom_images=True)
+        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.create_flavor.OpenStackFlavor.create',
+                return_value=None)
+    def test_create_tempest_resources_missing_flavor(self, *mock_args):
+        tempest_resources = tempest.TempestResourcesManager(
+            os_creds=self.os_creds)
+
+        CONST.__setattr__('tempest_use_custom_images', True)
+        CONST.__setattr__('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))
+
+        CONST.__setattr__('tempest_use_custom_images', True)
+        CONST.__setattr__('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))
 
     def test_get_verifier_id_missing_verifier(self):
         CONST.__setattr__('tempest_deployment_name', 'test_deploy_name')
@@ -229,10 +198,6 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
             self.assertTrue(m1.called)
 
     def test_configure_tempest_defcore_default(self):
-        img_flavor_dict = {'image_id': 'test_image_id',
-                           'flavor_id': 'test_flavor_id',
-                           'image_id_alt': 'test_image_alt_id',
-                           'flavor_id_alt': 'test_flavor_alt_id'}
         with mock.patch('functest.opnfv_tests.openstack.tempest.'
                         'conf_utils.configure_verifier',
                         return_value='test_conf_file'), \
@@ -252,8 +217,9 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
                        'conf_utils.generate_test_accounts_file'), \
             mock.patch('functest.opnfv_tests.openstack.tempest.'
                        'conf_utils.shutil.copyfile'):
-            conf_utils.configure_tempest_defcore('test_dep_dir',
-                                                 img_flavor_dict)
+            conf_utils.configure_tempest_defcore(
+                'test_dep_dir', 'test_image_id', 'test_flavor_id',
+                'test_image_alt_id', 'test_flavor_alt_id', 'test_tenant_id')
             mset.assert_any_call('compute', 'image_ref', 'test_image_id')
             mset.assert_any_call('compute', 'image_ref_alt',
                                  'test_image_alt_id')
@@ -264,14 +230,10 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
             self.assertTrue(mwrite.called)
 
     def test_generate_test_accounts_file_default(self):
-        with mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
-                        'create_tenant_user',
-                        return_value='test_tenant_id') as mock_create, \
-            mock.patch("__builtin__.open", mock.mock_open()), \
+        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()
-            self.assertTrue(mock_create.called)
+            conf_utils.generate_test_accounts_file('test_tenant_id')
             self.assertTrue(mock_dump.called)
 
     def _test_missing_param(self, params, image_id, flavor_id):
@@ -292,8 +254,8 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
             CONST.__setattr__('OS_ENDPOINT_TYPE', None)
             conf_utils.\
                 configure_tempest_update_params('test_conf_file',
-                                                IMAGE_ID=image_id,
-                                                FLAVOR_ID=flavor_id)
+                                                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)
diff --git a/functest/tests/unit/openstack/tempest/test_tempest.py b/functest/tests/unit/openstack/tempest/test_tempest.py
index d5016f71b..54d7d49bb 100644
--- a/functest/tests/unit/openstack/tempest/test_tempest.py
+++ b/functest/tests/unit/openstack/tempest/test_tempest.py
@@ -15,10 +15,16 @@ from functest.opnfv_tests.openstack.tempest import tempest
 from functest.opnfv_tests.openstack.tempest import conf_utils
 from functest.utils.constants import CONST
 
+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'), \
@@ -30,7 +36,9 @@ class OSTempestTesting(unittest.TestCase):
                        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'):
+                       return_value='test_verifier_deploy_dir'), \
+            mock.patch('snaps.openstack.tests.openstack_tests.get_credentials',
+                       return_value=os_creds):
             self.tempestcommon = tempest.TempestCommon()
             self.tempestsmoke_serial = tempest.TempestSmokeSerial()
             self.tempestsmoke_parallel = tempest.TempestSmokeParallel()
@@ -153,8 +161,8 @@ class OSTempestTesting(unittest.TestCase):
                 'os.path.exists', return_value=False)
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.os.makedirs')
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                'conf_utils.create_tempest_resources', side_effect=Exception)
-    def test_run_create_tempest_resources_ko(self, *args):
+                'TempestResourcesManager.create', side_effect=Exception)
+    def test_run_tempest_create_resources_ko(self, *args):
         self.assertEqual(self.tempestcommon.run(),
                          testcase.TestCase.EX_RUN_ERROR)
 
@@ -162,7 +170,7 @@ class OSTempestTesting(unittest.TestCase):
                 'os.path.exists', return_value=False)
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.os.makedirs')
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                'conf_utils.create_tempest_resources', return_value={})
+                'TempestResourcesManager.create', return_value={})
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
                 'conf_utils.configure_tempest', side_effect=Exception)
     def test_run_configure_tempest_ko(self, *args):
@@ -173,7 +181,7 @@ class OSTempestTesting(unittest.TestCase):
                 'os.path.exists', return_value=False)
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.os.makedirs')
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                'conf_utils.create_tempest_resources', return_value={})
+                'TempestResourcesManager.create', return_value={})
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
                 'conf_utils.configure_tempest')
     def _test_run(self, status, *args):