X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=snaps%2Fopenstack%2Ftests%2Fcreate_project_tests.py;h=178d3fee6b4f1e197a110f7a00bd12541e5c8639;hb=2e8f0c27a1a9e16778f83dba7ca9489664bd92f2;hp=96d71f248e0c2d8cb5e8300e492162977efcd071;hpb=67a93f77ca3a060ba584976d530dcd069a3e4fe8;p=snaps.git diff --git a/snaps/openstack/tests/create_project_tests.py b/snaps/openstack/tests/create_project_tests.py index 96d71f2..178d3fe 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.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,7 +95,9 @@ 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) @@ -106,7 +117,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) @@ -169,6 +180,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) + 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) + 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,7 +237,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 = ProjectConfig( + name=self.guid + '-name', + domain=self.os_creds.project_domain_name) self.keystone = keystone_utils.keystone_client(self.os_creds) @@ -218,15 +275,17 @@ 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': 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, SecurityGroupSettings( + 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) @@ -247,14 +306,16 @@ class CreateProjectUserTests(OSComponentTestCase): user_creator_1 = OpenStackUser( self.os_creds, UserSettings( 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( 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) @@ -288,5 +349,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)