diff options
author | Linda Wang <wangwulin@huawei.com> | 2017-08-02 02:41:15 +0000 |
---|---|---|
committer | Linda Wang <wangwulin@huawei.com> | 2017-08-03 02:20:50 +0000 |
commit | a4f8adbb935737122b4800efbb19b9d9b75c7e01 (patch) | |
tree | 3531fe4394cfdb0821dae356e06b22a007b299ab /snaps/openstack/tests | |
parent | 13e17646bccbcafbac13b144e24eee14125d33e3 (diff) |
Add domain name when creating projects and users
(spisarski)
Also clarified the difference between domain ID and name
Added helper methods and domain object for Domains
JIRA: FUNCTEST-858
Change-Id: Iccd7eef56713a4ad0c23232073f52bc71168bf5c
Signed-off-by: Linda Wang <wangwulin@huawei.com>
Diffstat (limited to 'snaps/openstack/tests')
-rw-r--r-- | snaps/openstack/tests/conf/os_credentials_tests.py | 48 | ||||
-rw-r--r-- | snaps/openstack/tests/create_project_tests.py | 30 | ||||
-rw-r--r-- | snaps/openstack/tests/create_user_tests.py | 8 | ||||
-rw-r--r-- | snaps/openstack/tests/openstack_tests.py | 2 |
4 files changed, 50 insertions, 38 deletions
diff --git a/snaps/openstack/tests/conf/os_credentials_tests.py b/snaps/openstack/tests/conf/os_credentials_tests.py index 9c6fcdc..333de59 100644 --- a/snaps/openstack/tests/conf/os_credentials_tests.py +++ b/snaps/openstack/tests/conf/os_credentials_tests.py @@ -157,10 +157,10 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual(2, os_creds.image_api_version) self.assertEqual(2, os_creds.compute_api_version) self.assertEqual(1, os_creds.heat_api_version) - self.assertIsNone(os_creds.user_domain_id) - self.assertEqual('default', os_creds.user_domain_name) - self.assertIsNone(os_creds.project_domain_id) - self.assertEqual('default', os_creds.project_domain_name) + self.assertEqual('default', os_creds.user_domain_id) + self.assertEqual('Default', os_creds.user_domain_name) + self.assertEqual('default', os_creds.project_domain_id) + self.assertEqual('Default', os_creds.project_domain_name) self.assertEqual('admin', os_creds.interface) self.assertFalse(os_creds.cacert) self.assertIsNone(os_creds.proxy_settings) @@ -178,10 +178,10 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual(2, os_creds.image_api_version) self.assertEqual(2, os_creds.compute_api_version) self.assertEqual(1, os_creds.heat_api_version) - self.assertIsNone(os_creds.user_domain_id) - self.assertEqual('default', os_creds.user_domain_name) - self.assertIsNone(os_creds.project_domain_id) - self.assertEqual('default', os_creds.project_domain_name) + self.assertEqual('default', os_creds.user_domain_id) + self.assertEqual('Default', os_creds.user_domain_name) + self.assertEqual('default', os_creds.project_domain_id) + self.assertEqual('Default', os_creds.project_domain_name) self.assertEqual('admin', os_creds.interface) self.assertFalse(os_creds.cacert) self.assertIsNone(os_creds.proxy_settings) @@ -202,10 +202,10 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual(6, os_creds.image_api_version) self.assertEqual(7, os_creds.compute_api_version) self.assertEqual(8.0, os_creds.heat_api_version) - self.assertIsNone(os_creds.user_domain_id) - self.assertEqual('default', os_creds.user_domain_name) - self.assertIsNone(os_creds.project_domain_id) - self.assertEqual('default', os_creds.project_domain_name) + self.assertEqual('default', os_creds.user_domain_id) + self.assertEqual('Default', os_creds.user_domain_name) + self.assertEqual('default', os_creds.project_domain_id) + self.assertEqual('Default', os_creds.project_domain_name) self.assertEqual('admin', os_creds.interface) self.assertTrue(os_creds.cacert) self.assertIsNone(os_creds.proxy_settings) @@ -226,10 +226,10 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual(6, os_creds.image_api_version) self.assertEqual(7, os_creds.compute_api_version) self.assertEqual(8.0, os_creds.heat_api_version) - self.assertIsNone(os_creds.user_domain_id) - self.assertEqual('default', os_creds.user_domain_name) - self.assertIsNone(os_creds.project_domain_id) - self.assertEqual('default', os_creds.project_domain_name) + self.assertEqual('default', os_creds.user_domain_id) + self.assertEqual('Default', os_creds.user_domain_name) + self.assertEqual('default', os_creds.project_domain_id) + self.assertEqual('Default', os_creds.project_domain_name) self.assertEqual('admin', os_creds.interface) self.assertTrue(os_creds.cacert) self.assertIsNone(os_creds.proxy_settings) @@ -248,10 +248,10 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual(2, os_creds.image_api_version) self.assertEqual(2, os_creds.compute_api_version) self.assertEqual(1, os_creds.heat_api_version) - self.assertIsNone(os_creds.user_domain_id) - self.assertEqual('default', os_creds.user_domain_name) - self.assertIsNone(os_creds.project_domain_id) - self.assertEqual('default', os_creds.project_domain_name) + self.assertEqual('default', os_creds.user_domain_id) + self.assertEqual('Default', os_creds.user_domain_name) + self.assertEqual('default', os_creds.project_domain_id) + self.assertEqual('Default', os_creds.project_domain_name) self.assertEqual('admin', os_creds.interface) self.assertFalse(os_creds.cacert) self.assertEqual('foo', os_creds.proxy_settings.host) @@ -325,10 +325,10 @@ class OSCredsUnitTests(unittest.TestCase): self.assertEqual(2, os_creds.image_api_version) self.assertEqual(2, os_creds.compute_api_version) self.assertEqual(1, os_creds.heat_api_version) - self.assertIsNone(os_creds.user_domain_id) - self.assertEqual('default', os_creds.user_domain_name) - self.assertIsNone(os_creds.project_domain_id) - self.assertEqual('default', os_creds.project_domain_name) + self.assertEqual('default', os_creds.user_domain_id) + self.assertEqual('Default', os_creds.user_domain_name) + self.assertEqual('default', os_creds.project_domain_id) + self.assertEqual('Default', os_creds.project_domain_name) self.assertEqual('admin', os_creds.interface) self.assertFalse(os_creds.cacert) self.assertEqual('foo', os_creds.proxy_settings.host) diff --git a/snaps/openstack/tests/create_project_tests.py b/snaps/openstack/tests/create_project_tests.py index 96d71f2..b225e3d 100644 --- a/snaps/openstack/tests/create_project_tests.py +++ b/snaps/openstack/tests/create_project_tests.py @@ -45,14 +45,14 @@ class ProjectSettingsUnitTests(unittest.TestCase): def test_name_only(self): settings = ProjectSettings(name='foo') self.assertEqual('foo', settings.name) - self.assertEqual('default', settings.domain) + self.assertEqual('Default', settings.domain_name) self.assertIsNone(settings.description) self.assertTrue(settings.enabled) def test_config_with_name_only(self): settings = ProjectSettings(**{'name': 'foo'}) self.assertEqual('foo', settings.name) - self.assertEqual('default', settings.domain) + self.assertEqual('Default', settings.domain_name) self.assertIsNone(settings.description) self.assertTrue(settings.enabled) @@ -60,7 +60,7 @@ class ProjectSettingsUnitTests(unittest.TestCase): settings = ProjectSettings(name='foo', domain='bar', description='foobar', enabled=False) self.assertEqual('foo', settings.name) - self.assertEqual('bar', settings.domain) + self.assertEqual('bar', settings.domain_name) self.assertEqual('foobar', settings.description) self.assertFalse(settings.enabled) @@ -69,7 +69,7 @@ class ProjectSettingsUnitTests(unittest.TestCase): **{'name': 'foo', 'domain': 'bar', 'description': 'foobar', 'enabled': False}) self.assertEqual('foo', settings.name) - self.assertEqual('bar', settings.domain) + self.assertEqual('bar', settings.domain_name) self.assertEqual('foobar', settings.description) self.assertFalse(settings.enabled) @@ -86,7 +86,9 @@ class CreateProjectSuccessTests(OSComponentTestCase): """ guid = str(uuid.uuid4())[:-19] guid = self.__class__.__name__ + '-' + guid - self.project_settings = ProjectSettings(name=guid + '-name') + self.project_settings = ProjectSettings( + name=guid + '-name', + domain=self.os_creds.project_domain_name) self.keystone = keystone_utils.keystone_client(self.os_creds) @@ -106,7 +108,7 @@ class CreateProjectSuccessTests(OSComponentTestCase): value. This test will not do anything with a keystone v2.0 client. """ if self.keystone.version != keystone_utils.V2_VERSION_STR: - self.project_settings.domain = 'foo' + self.project_settings.domain_name = 'foo' self.project_creator = OpenStackProject(self.os_creds, self.project_settings) @@ -182,7 +184,9 @@ class CreateProjectUserTests(OSComponentTestCase): """ guid = str(uuid.uuid4())[:-19] self.guid = self.__class__.__name__ + '-' + guid - self.project_settings = ProjectSettings(name=self.guid + '-name') + self.project_settings = ProjectSettings( + name=self.guid + '-name', + domain=self.os_creds.project_domain_name) self.keystone = keystone_utils.keystone_client(self.os_creds) @@ -218,7 +222,8 @@ class CreateProjectUserTests(OSComponentTestCase): user_creator = OpenStackUser( self.os_creds, UserSettings( name=self.guid + '-user', - password=self.guid, roles={'admin': 'admin'})) + password=self.guid, roles={'admin': 'admin'}, + domain_name=self.os_creds.user_domain_name)) self.project_creator.assoc_user(user_creator.create()) self.user_creators.append(user_creator) @@ -247,14 +252,16 @@ class CreateProjectUserTests(OSComponentTestCase): user_creator_1 = OpenStackUser( self.os_creds, UserSettings( name=self.guid + '-user1', password=self.guid, - roles={'admin': 'admin'})) + roles={'admin': 'admin'}, + domain_name=self.os_creds.user_domain_name)) self.project_creator.assoc_user(user_creator_1.create()) self.user_creators.append(user_creator_1) user_creator_2 = OpenStackUser( self.os_creds, UserSettings( name=self.guid + '-user2', password=self.guid, - roles={'admin': 'admin'})) + roles={'admin': 'admin'}, + domain_name=self.os_creds.user_domain_name)) self.project_creator.assoc_user(user_creator_2.create()) self.user_creators.append(user_creator_2) @@ -288,5 +295,6 @@ def validate_project(keystone, project_settings, project): if keystone.version == keystone_utils.V2_VERSION_STR: return project_settings.name == project.name else: + domain = keystone_utils.get_domain_by_id(keystone, project.domain_id) return (project_settings.name == project.name and - project_settings.domain == project.domain_id) + project_settings.domain_name == domain.name) diff --git a/snaps/openstack/tests/create_user_tests.py b/snaps/openstack/tests/create_user_tests.py index 7519700..9f08a32 100644 --- a/snaps/openstack/tests/create_user_tests.py +++ b/snaps/openstack/tests/create_user_tests.py @@ -102,9 +102,11 @@ class CreateUserSuccessTests(OSComponentTestCase): """ guid = str(uuid.uuid4())[:-19] guid = self.__class__.__name__ + '-' + guid - self.user_settings = UserSettings(name=guid + '-name', - password=guid + '-password', - roles={'admin': 'admin'}) + self.user_settings = UserSettings( + name=guid + '-name', + password=guid + '-password', + roles={'admin': 'admin'}, + domain_name=self.os_creds.user_domain_name) self.keystone = keystone_utils.keystone_client(self.os_creds) diff --git a/snaps/openstack/tests/openstack_tests.py b/snaps/openstack/tests/openstack_tests.py index 71d2dc2..9c53bbd 100644 --- a/snaps/openstack/tests/openstack_tests.py +++ b/snaps/openstack/tests/openstack_tests.py @@ -126,7 +126,9 @@ def get_credentials(os_env_file=None, proxy_settings_str=None, 'compute_api_version': config.get('compute_api_version'), 'heat_api_version': config.get('heat_api_version'), 'user_domain_id': config.get('user_domain_id'), + 'user_domain_name': config.get('user_domain_name'), 'project_domain_id': config.get('project_domain_id'), + 'project_domain_name': config.get('project_domain_name'), 'interface': config.get('interface'), 'proxy_settings': proxy_settings, 'cacert': config.get('cacert'), |