X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=snaps%2Fopenstack%2Ftests%2Fcreate_project_tests.py;h=1e3a97223ce19298f3e4910c4d60fb4f8377e780;hb=4edc3d87392cf78c3f046217543fb76380413306;hp=f388ba514614e11f50fa5abb58184c6699e2bff8;hpb=80b70bdcc7a73e0050dae87e4d86159f2fd9b785;p=snaps.git diff --git a/snaps/openstack/tests/create_project_tests.py b/snaps/openstack/tests/create_project_tests.py index f388ba5..1e3a972 100644 --- a/snaps/openstack/tests/create_project_tests.py +++ b/snaps/openstack/tests/create_project_tests.py @@ -17,14 +17,16 @@ import uuid from keystoneclient.exceptions import BadRequest +from snaps.config.security_group import SecurityGroupConfig +from snaps.config.user import UserConfig +from snaps.config.project import ProjectConfigError, ProjectConfig +from snaps.domain.project import ComputeQuotas, NetworkQuotas from snaps.openstack.create_project import ( - OpenStackProject, ProjectSettings, ProjectSettingsError) + OpenStackProject, ProjectSettings) from snaps.openstack.create_security_group import OpenStackSecurityGroup -from snaps.openstack.create_security_group import SecurityGroupSettings from snaps.openstack.create_user import OpenStackUser -from snaps.openstack.create_user import UserSettings from snaps.openstack.tests.os_source_file_test import OSComponentTestCase -from snaps.openstack.utils import keystone_utils +from snaps.openstack.utils import keystone_utils, nova_utils, neutron_utils __author__ = 'spisarski' @@ -35,43 +37,50 @@ class ProjectSettingsUnitTests(unittest.TestCase): """ def test_no_params(self): - with self.assertRaises(ProjectSettingsError): + with self.assertRaises(ProjectConfigError): ProjectSettings() def test_empty_config(self): - with self.assertRaises(ProjectSettingsError): + with self.assertRaises(ProjectConfigError): ProjectSettings(**dict()) 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) + self.assertEqual(list(), settings.users) 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) + self.assertEqual(list(), settings.users) def test_all(self): - settings = ProjectSettings(name='foo', domain='bar', - description='foobar', enabled=False) + users = ['test1', 'test2'] + settings = ProjectSettings( + name='foo', domain='bar', description='foobar', enabled=False, + users=users) 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) + self.assertEqual(users, settings.users) def test_config_all(self): + users = ['test1', 'test2'] settings = ProjectSettings( **{'name': 'foo', 'domain': 'bar', 'description': 'foobar', - 'enabled': False}) + 'enabled': False, 'users': users}) 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) + self.assertEqual(users, settings.users) class CreateProjectSuccessTests(OSComponentTestCase): @@ -86,9 +95,12 @@ class CreateProjectSuccessTests(OSComponentTestCase): """ guid = str(uuid.uuid4())[:-19] guid = self.__class__.__name__ + '-' + guid - self.project_settings = ProjectSettings(name=guid + '-name') + self.project_settings = ProjectConfig( + name=guid + '-name', + domain=self.os_creds.project_domain_name) - self.keystone = keystone_utils.keystone_client(self.os_creds) + self.keystone = keystone_utils.keystone_client( + self.os_creds, self.os_session) # Initialize for cleanup self.project_creator = None @@ -100,13 +112,15 @@ class CreateProjectSuccessTests(OSComponentTestCase): if self.project_creator: self.project_creator.clean() + super(self.__class__, self).__clean__() + def test_create_project_bad_domain(self): """ Tests the creation of an OpenStack project with an invalid domain 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) @@ -123,12 +137,44 @@ class CreateProjectSuccessTests(OSComponentTestCase): self.assertIsNotNone(created_project) retrieved_project = keystone_utils.get_project( - keystone=self.keystone, project_name=self.project_settings.name) + keystone=self.keystone, project_settings=self.project_settings) + self.assertIsNotNone(retrieved_project) + self.assertEqual(created_project, retrieved_project) + self.assertTrue(validate_project(self.keystone, self.project_settings, + created_project)) + + def test_create_project_quota_override(self): + """ + Tests the creation of an OpenStack project with new quotas. + """ + quotas = { + 'cores': 4, 'instances': 5, 'injected_files': 6, + 'injected_file_content_bytes': 60000, 'ram': 70000, 'fixed_ips': 7, + 'key_pairs': 8} + self.project_settings.quotas = quotas + self.project_creator = OpenStackProject(self.os_creds, + self.project_settings) + created_project = self.project_creator.create() + self.assertIsNotNone(created_project) + + retrieved_project = keystone_utils.get_project( + keystone=self.keystone, project_settings=self.project_settings) self.assertIsNotNone(retrieved_project) self.assertEqual(created_project, retrieved_project) self.assertTrue(validate_project(self.keystone, self.project_settings, created_project)) + nova = nova_utils.nova_client(self.os_creds, self.os_session) + new_quotas = nova_utils.get_compute_quotas(nova, created_project.id) + + self.assertEqual(4, new_quotas.cores) + self.assertEqual(5, new_quotas.instances) + self.assertEqual(6, new_quotas.injected_files) + self.assertEqual(60000, new_quotas.injected_file_content_bytes) + self.assertEqual(70000, new_quotas.ram) + self.assertEqual(7, new_quotas.fixed_ips) + self.assertEqual(8, new_quotas.key_pairs) + def test_create_project_2x(self): """ Tests the creation of an OpenStack project twice to ensure it only @@ -140,7 +186,7 @@ class CreateProjectSuccessTests(OSComponentTestCase): self.assertIsNotNone(created_project) retrieved_project = keystone_utils.get_project( - keystone=self.keystone, project_name=self.project_settings.name) + keystone=self.keystone, project_settings=self.project_settings) self.assertIsNotNone(retrieved_project) self.assertEqual(created_project, retrieved_project) @@ -169,6 +215,50 @@ class CreateProjectSuccessTests(OSComponentTestCase): self.assertTrue(validate_project(self.keystone, self.project_settings, created_project)) + def test_update_quotas(self): + """ + Tests the creation of an OpenStack project where the quotas get + updated. + """ + self.project_creator = OpenStackProject(self.os_creds, + self.project_settings) + created_project = self.project_creator.create() + self.assertIsNotNone(created_project) + + retrieved_project = keystone_utils.get_project( + keystone=self.keystone, project_settings=self.project_settings) + self.assertIsNotNone(retrieved_project) + self.assertEqual(created_project, retrieved_project) + self.assertTrue(validate_project(self.keystone, self.project_settings, + created_project)) + + update_compute_quotas = ComputeQuotas( + **{'metadata_items': 64, 'cores': 5, 'instances': 5, + 'injected_files': 3, 'injected_file_content_bytes': 5120, + 'ram': 25600, 'fixed_ips': 100, 'key_pairs': 50}) + self.project_creator.update_compute_quotas(update_compute_quotas) + + update_network_quotas = NetworkQuotas( + **{'security_group': 5, 'security_group_rule': 50, + 'floatingip': 25, 'network': 5, 'port': 25, 'router': 6, + 'subnet': 7}) + self.project_creator.update_network_quotas(update_network_quotas) + + self.assertEqual(update_compute_quotas, + self.project_creator.get_compute_quotas()) + self.assertEqual(update_network_quotas, + self.project_creator.get_network_quotas()) + + nova = nova_utils.nova_client(self.os_creds, self.os_session) + new_compute_quotas = nova_utils.get_compute_quotas( + nova, self.project_creator.get_project().id) + self.assertEqual(update_compute_quotas, new_compute_quotas) + + neutron = neutron_utils.neutron_client(self.os_creds, self.os_session) + new_network_quotas = neutron_utils.get_network_quotas( + neutron, self.project_creator.get_project().id) + self.assertEqual(update_network_quotas, new_network_quotas) + class CreateProjectUserTests(OSComponentTestCase): """ @@ -182,9 +272,12 @@ 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 = ProjectConfig( + name=self.guid + '-name', + domain=self.os_creds.project_domain_name) - self.keystone = keystone_utils.keystone_client(self.os_creds) + self.keystone = keystone_utils.keystone_client( + self.os_creds, self.os_session) # Initialize for cleanup self.project_creator = None @@ -205,6 +298,8 @@ class CreateProjectUserTests(OSComponentTestCase): if self.project_creator: self.project_creator.clean() + super(self.__class__, self).__clean__() + def test_create_project_sec_grp_one_user(self): """ Tests the creation of an OpenStack object to a project with a new users @@ -216,17 +311,19 @@ class CreateProjectUserTests(OSComponentTestCase): self.assertIsNotNone(created_project) user_creator = OpenStackUser( - self.os_creds, UserSettings( + self.os_creds, UserConfig( name=self.guid + '-user', - password=self.guid, roles={'admin': 'admin'})) + password=self.guid, + roles={'admin': self.project_settings.name}, + domain_name=self.os_creds.user_domain_name)) self.project_creator.assoc_user(user_creator.create()) self.user_creators.append(user_creator) sec_grp_os_creds = user_creator.get_os_creds( self.project_creator.get_project().name) sec_grp_creator = OpenStackSecurityGroup( - sec_grp_os_creds, SecurityGroupSettings(name=self.guid + '-name', - description='hello group')) + sec_grp_os_creds, SecurityGroupConfig( + name=self.guid + '-name', description='hello group')) sec_grp = sec_grp_creator.create() self.assertIsNotNone(sec_grp) self.sec_grp_creators.append(sec_grp_creator) @@ -245,16 +342,18 @@ class CreateProjectUserTests(OSComponentTestCase): self.assertIsNotNone(created_project) user_creator_1 = OpenStackUser( - self.os_creds, UserSettings( + self.os_creds, UserConfig( name=self.guid + '-user1', password=self.guid, - roles={'admin': 'admin'})) + roles={'admin': self.project_settings.name}, + 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( + self.os_creds, UserConfig( name=self.guid + '-user2', password=self.guid, - roles={'admin': 'admin'})) + roles={'admin': self.project_settings.name}, + domain_name=self.os_creds.user_domain_name)) self.project_creator.assoc_user(user_creator_2.create()) self.user_creators.append(user_creator_2) @@ -266,8 +365,8 @@ class CreateProjectUserTests(OSComponentTestCase): sec_grp_creator = OpenStackSecurityGroup( sec_grp_os_creds, - SecurityGroupSettings(name=self.guid + '-name', - description='hello group')) + SecurityGroupConfig( + name=self.guid + '-name', description='hello group')) sec_grp = sec_grp_creator.create() self.assertIsNotNone(sec_grp) self.sec_grp_creators.append(sec_grp_creator) @@ -288,5 +387,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)