Create new project/user for rally test

[functest.git] / functest / tests / unit / openstack / tempest / test_conf_utils.py

diff --git a/functest/tests/unit/openstack/tempest/test_conf_utils.py b/functest/tests/unit/openstack/tempest/test_conf_utils.py
index 8988e96..81febd8 100644 (file)
--- a/functest/tests/unit/openstack/tempest/test_conf_utils.py
+++ b/functest/tests/unit/openstack/tempest/test_conf_utils.py
@@ -14,73 +14,11 @@ import unittest
 import mock
 
 from functest.opnfv_tests.openstack.tempest import conf_utils
-from functest.opnfv_tests.openstack.tempest import tempest
 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)
-        with self.assertRaises(Exception) as context:
-            tempest_resources.create()
-        msg = 'Failed to create flavor'
-        self.assertTrue(msg in context.exception, msg=str(context.exception))
 
     @mock.patch('subprocess.check_output')
     def test_create_rally_deployment(self, mock_exec):
@@ -89,7 +27,8 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
             mock.call(['rally', 'deployment', 'destroy', '--deployment',
                        str(getattr(config.CONF, 'rally_deployment_name'))]),
             mock.call(['rally', 'deployment', 'create', '--fromenv', '--name',
-                       str(getattr(config.CONF, 'rally_deployment_name'))]),
+                       str(getattr(config.CONF, 'rally_deployment_name'))],
+                      env=None),
             mock.call(['rally', 'deployment', 'check'])]
         mock_exec.assert_has_calls(calls)
 
@@ -188,24 +127,27 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
             self.assertTrue(mock_get_vid.called)
             self.assertTrue(mock_get_did.called)
 
-    def _test_missing_param(self, params, image_id, flavor_id):
-        with mock.patch('functest.opnfv_tests.openstack.tempest.'
-                        'conf_utils.ConfigParser.RawConfigParser.'
+    def _test_missing_param(self, params, image_id, flavor_id, alt=False):
+        with mock.patch('six.moves.configparser.RawConfigParser.'
                         'set') as mset, \
-            mock.patch('functest.opnfv_tests.openstack.tempest.'
-                       'conf_utils.ConfigParser.RawConfigParser.'
+            mock.patch('six.moves.configparser.RawConfigParser.'
                        'read') as mread, \
-            mock.patch('functest.opnfv_tests.openstack.tempest.'
-                       'conf_utils.ConfigParser.RawConfigParser.'
+            mock.patch('six.moves.configparser.RawConfigParser.'
                        'write') as mwrite, \
-            mock.patch('__builtin__.open', mock.mock_open()), \
+            mock.patch('six.moves.builtins.open', mock.mock_open()), \
             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])
+            os.environ['OS_INTERFACE'] = ''
+            if not alt:
+                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])
+            else:
+                conf_utils.configure_tempest_update_params(
+                    'test_conf_file', image_alt_id=image_id,
+                    flavor_alt_id=flavor_id)
+                mset.assert_any_call(params[0], params[1], params[2])
             self.assertTrue(mread.called)
             self.assertTrue(mwrite.called)
 
@@ -214,20 +156,18 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
                                  '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)
+        self._test_missing_param(
+            ('compute', 'image_ref_alt', 'test_image_id_alt'),
+            'test_image_id_alt', None, alt=True)
 
     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)
+        self._test_missing_param(
+            ('compute', 'flavor_ref_alt', 'test_flavor_id_alt'),
+            None, 'test_flavor_id_alt', alt=True)
 
     def test_verif_missing_conf_file(self):
         with mock.patch('functest.opnfv_tests.openstack.tempest.'