diff --git a/contrib/heat_keystone/heat_keystone/tests/test_group.py b/contrib/heat_keystone/heat_keystone/tests/test_group.py index 220ed006b..77e1b165f 100644 --- a/contrib/heat_keystone/heat_keystone/tests/test_group.py +++ b/contrib/heat_keystone/heat_keystone/tests/test_group.py @@ -21,8 +21,7 @@ from heat.engine import template from heat.tests import common from heat.tests import utils -from ..resources.group import KeystoneGroup # noqa -from ..resources.group import resource_mapping # noqa +from ..resources import group # noqa keystone_group_template = { 'heat_template_version': '2013-05-23', @@ -48,7 +47,7 @@ class KeystoneGroupTest(common.HeatTestCase): self.ctx = utils.dummy_context() # For unit testing purpose. Register resource provider explicitly. - resource._register_class(RESOURCE_TYPE, KeystoneGroup) + resource._register_class(RESOURCE_TYPE, group.KeystoneGroup) self.stack = stack.Stack( self.ctx, 'test_stack_keystone', @@ -82,16 +81,16 @@ class KeystoneGroupTest(common.HeatTestCase): return value def test_resource_mapping(self): - mapping = resource_mapping() + mapping = group.resource_mapping() self.assertEqual(1, len(mapping)) - self.assertEqual(KeystoneGroup, mapping[RESOURCE_TYPE]) - self.assertIsInstance(self.test_group, KeystoneGroup) + self.assertEqual(group.KeystoneGroup, mapping[RESOURCE_TYPE]) + self.assertIsInstance(self.test_group, group.KeystoneGroup) def test_properties_title(self): property_title_map = { - KeystoneGroup.NAME: 'name', - KeystoneGroup.DESCRIPTION: 'description', - KeystoneGroup.DOMAIN: 'domain' + group.KeystoneGroup.NAME: 'name', + group.KeystoneGroup.DESCRIPTION: 'description', + group.KeystoneGroup.DOMAIN: 'domain' } for actual_title, expected_title in property_title_map.items(): @@ -102,78 +101,81 @@ class KeystoneGroupTest(common.HeatTestCase): actual_title) def test_property_name_validate_schema(self): - schema = KeystoneGroup.properties_schema[KeystoneGroup.NAME] + schema = group.KeystoneGroup.properties_schema[ + group.KeystoneGroup.NAME] self.assertEqual( True, schema.update_allowed, 'update_allowed for property %s is modified' % - KeystoneGroup.NAME) + group.KeystoneGroup.NAME) self.assertEqual(properties.Schema.STRING, schema.type, 'type for property %s is modified' % - KeystoneGroup.NAME) + group.KeystoneGroup.NAME) self.assertEqual('Name of keystone group.', schema.description, 'description for property %s is modified' % - KeystoneGroup.NAME) + group.KeystoneGroup.NAME) def test_property_description_validate_schema(self): - schema = KeystoneGroup.properties_schema[KeystoneGroup.DESCRIPTION] + schema = group.KeystoneGroup.properties_schema[ + group.KeystoneGroup.DESCRIPTION] self.assertEqual( True, schema.update_allowed, 'update_allowed for property %s is modified' % - KeystoneGroup.DESCRIPTION) + group.KeystoneGroup.DESCRIPTION) self.assertEqual(properties.Schema.STRING, schema.type, 'type for property %s is modified' % - KeystoneGroup.DESCRIPTION) + group.KeystoneGroup.DESCRIPTION) self.assertEqual('Description of keystone group.', schema.description, 'description for property %s is modified' % - KeystoneGroup.DESCRIPTION) + group.KeystoneGroup.DESCRIPTION) self.assertEqual( '', schema.default, 'default for property %s is modified' % - KeystoneGroup.DESCRIPTION) + group.KeystoneGroup.DESCRIPTION) def test_property_domain_validate_schema(self): - schema = KeystoneGroup.properties_schema[KeystoneGroup.DOMAIN] + schema = group.KeystoneGroup.properties_schema[ + group.KeystoneGroup.DOMAIN] self.assertEqual( True, schema.update_allowed, 'update_allowed for property %s is modified' % - KeystoneGroup.DOMAIN) + group.KeystoneGroup.DOMAIN) self.assertEqual(properties.Schema.STRING, schema.type, 'type for property %s is modified' % - KeystoneGroup.DOMAIN) + group.KeystoneGroup.DOMAIN) self.assertEqual('Name or id of keystone domain.', schema.description, 'description for property %s is modified' % - KeystoneGroup.DOMAIN) + group.KeystoneGroup.DOMAIN) self.assertEqual([constraints.CustomConstraint('keystone.domain')], schema.constraints, 'constrains for property %s is modified' % - KeystoneGroup.DOMAIN) + group.KeystoneGroup.DOMAIN) self.assertEqual( 'default', schema.default, 'default for property %s is modified' % - KeystoneGroup.DOMAIN) + group.KeystoneGroup.DOMAIN) def _get_property_schema_value_default(self, name): - schema = KeystoneGroup.properties_schema[name] + schema = group.KeystoneGroup.properties_schema[name] return schema.default def test_group_handle_create(self): @@ -183,13 +185,13 @@ class KeystoneGroupTest(common.HeatTestCase): # validate the properties self.assertEqual( 'test_group_1', - self.test_group.properties.get(KeystoneGroup.NAME)) + self.test_group.properties.get(group.KeystoneGroup.NAME)) self.assertEqual( 'Test group', - self.test_group.properties.get(KeystoneGroup.DESCRIPTION)) + self.test_group.properties.get(group.KeystoneGroup.DESCRIPTION)) self.assertEqual( 'default', - self.test_group.properties.get(KeystoneGroup.DOMAIN)) + self.test_group.properties.get(group.KeystoneGroup.DOMAIN)) self.test_group.handle_create() @@ -204,14 +206,14 @@ class KeystoneGroupTest(common.HeatTestCase): def test_group_handle_create_default(self): values = { - KeystoneGroup.NAME: None, - KeystoneGroup.DESCRIPTION: + group.KeystoneGroup.NAME: None, + group.KeystoneGroup.DESCRIPTION: (self._get_property_schema_value_default( - KeystoneGroup.DESCRIPTION)), - KeystoneGroup.DOMAIN: + group.KeystoneGroup.DESCRIPTION)), + group.KeystoneGroup.DOMAIN: (self._get_property_schema_value_default( - KeystoneGroup.DOMAIN)), - KeystoneGroup.ROLES: None + group.KeystoneGroup.DOMAIN)), + group.KeystoneGroup.ROLES: None } def _side_effect(key): @@ -228,13 +230,13 @@ class KeystoneGroupTest(common.HeatTestCase): # validate the properties self.assertEqual( None, - self.test_group.properties.get(KeystoneGroup.NAME)) + self.test_group.properties.get(group.KeystoneGroup.NAME)) self.assertEqual( '', - self.test_group.properties.get(KeystoneGroup.DESCRIPTION)) + self.test_group.properties.get(group.KeystoneGroup.DESCRIPTION)) self.assertEqual( 'default', - self.test_group.properties.get(KeystoneGroup.DOMAIN)) + self.test_group.properties.get(group.KeystoneGroup.DOMAIN)) self.test_group.handle_create() @@ -248,9 +250,9 @@ class KeystoneGroupTest(common.HeatTestCase): self.test_group.resource_id = '477e8273-60a7-4c41-b683-fdb0bc7cd151' self.test_group._stored_properties_data = dict(roles=None) - prop_diff = {KeystoneGroup.NAME: 'test_group_1_updated', - KeystoneGroup.DESCRIPTION: 'Test Group updated', - KeystoneGroup.DOMAIN: 'test_domain'} + prop_diff = {group.KeystoneGroup.NAME: 'test_group_1_updated', + group.KeystoneGroup.DESCRIPTION: 'Test Group updated', + group.KeystoneGroup.DOMAIN: 'test_domain'} self.test_group.handle_update(json_snippet=None, tmpl_diff=None, @@ -258,8 +260,8 @@ class KeystoneGroupTest(common.HeatTestCase): self.groups.update.assert_called_once_with( group=self.test_group.resource_id, - name=prop_diff[KeystoneGroup.NAME], - description=prop_diff[KeystoneGroup.DESCRIPTION], + name=prop_diff[group.KeystoneGroup.NAME], + description=prop_diff[group.KeystoneGroup.DESCRIPTION], domain_id='test_domain' ) @@ -269,7 +271,7 @@ class KeystoneGroupTest(common.HeatTestCase): self.test_group.physical_resource_name = mock.MagicMock() self.test_group.physical_resource_name.return_value = 'foo' - prop_diff = {KeystoneGroup.DESCRIPTION: 'Test Project updated'} + prop_diff = {group.KeystoneGroup.DESCRIPTION: 'Test Project updated'} self.test_group.handle_update(json_snippet=None, tmpl_diff=None, @@ -280,7 +282,7 @@ class KeystoneGroupTest(common.HeatTestCase): self.groups.update.assert_called_once_with( group=self.test_group.resource_id, name='foo', - description=prop_diff[KeystoneGroup.DESCRIPTION], + description=prop_diff[group.KeystoneGroup.DESCRIPTION], domain_id='default' ) diff --git a/contrib/heat_keystone/heat_keystone/tests/test_project.py b/contrib/heat_keystone/heat_keystone/tests/test_project.py index 990947f40..f898c6ce8 100644 --- a/contrib/heat_keystone/heat_keystone/tests/test_project.py +++ b/contrib/heat_keystone/heat_keystone/tests/test_project.py @@ -21,8 +21,7 @@ from heat.engine import template from heat.tests import common from heat.tests import utils -from ..resources.project import KeystoneProject # noqa -from ..resources.project import resource_mapping # noqa +from ..resources import project # noqa keystone_project_template = { 'heat_template_version': '2013-05-23', @@ -49,7 +48,7 @@ class KeystoneProjectTest(common.HeatTestCase): self.ctx = utils.dummy_context() # For unit testing purpose. Register resource provider explicitly. - resource._register_class(RESOURCE_TYPE, KeystoneProject) + resource._register_class(RESOURCE_TYPE, project.KeystoneProject) self.stack = stack.Stack( self.ctx, 'test_stack_keystone', @@ -81,10 +80,10 @@ class KeystoneProjectTest(common.HeatTestCase): return value def test_resource_mapping(self): - mapping = resource_mapping() + mapping = project.resource_mapping() self.assertEqual(1, len(mapping)) - self.assertEqual(KeystoneProject, mapping[RESOURCE_TYPE]) - self.assertIsInstance(self.test_project, KeystoneProject) + self.assertEqual(project.KeystoneProject, mapping[RESOURCE_TYPE]) + self.assertIsInstance(self.test_project, project.KeystoneProject) def test_project_handle_create(self): mock_project = self._get_mock_project() @@ -93,16 +92,17 @@ class KeystoneProjectTest(common.HeatTestCase): # validate the properties self.assertEqual( 'test_project_1', - self.test_project.properties.get(KeystoneProject.NAME)) + self.test_project.properties.get(project.KeystoneProject.NAME)) self.assertEqual( 'Test project', - self.test_project.properties.get(KeystoneProject.DESCRIPTION)) + self.test_project.properties.get( + project.KeystoneProject.DESCRIPTION)) self.assertEqual( 'default', - self.test_project.properties.get(KeystoneProject.DOMAIN)) + self.test_project.properties.get(project.KeystoneProject.DOMAIN)) self.assertEqual( True, - self.test_project.properties.get(KeystoneProject.ENABLED)) + self.test_project.properties.get(project.KeystoneProject.ENABLED)) self.test_project.handle_create() @@ -118,10 +118,10 @@ class KeystoneProjectTest(common.HeatTestCase): def test_properties_title(self): property_title_map = { - KeystoneProject.NAME: 'name', - KeystoneProject.DESCRIPTION: 'description', - KeystoneProject.DOMAIN: 'domain', - KeystoneProject.ENABLED: 'enabled' + project.KeystoneProject.NAME: 'name', + project.KeystoneProject.DESCRIPTION: 'description', + project.KeystoneProject.DOMAIN: 'domain', + project.KeystoneProject.ENABLED: 'enabled' } for actual_title, expected_title in property_title_map.items(): @@ -132,117 +132,121 @@ class KeystoneProjectTest(common.HeatTestCase): actual_title) def test_property_name_validate_schema(self): - schema = KeystoneProject.properties_schema[KeystoneProject.NAME] + schema = project.KeystoneProject.properties_schema[ + project.KeystoneProject.NAME] self.assertEqual( True, schema.update_allowed, 'update_allowed for property %s is modified' % - KeystoneProject.NAME) + project.KeystoneProject.NAME) self.assertEqual(properties.Schema.STRING, schema.type, 'type for property %s is modified' % - KeystoneProject.NAME) + project.KeystoneProject.NAME) self.assertEqual('Name of keystone project.', schema.description, 'description for property %s is modified' % - KeystoneProject.NAME) + project.KeystoneProject.NAME) def test_property_description_validate_schema(self): - schema = KeystoneProject.properties_schema[KeystoneProject.DESCRIPTION] + schema = project.KeystoneProject.properties_schema[ + project.KeystoneProject.DESCRIPTION] self.assertEqual( True, schema.update_allowed, 'update_allowed for property %s is modified' % - KeystoneProject.DESCRIPTION) + project.KeystoneProject.DESCRIPTION) self.assertEqual(properties.Schema.STRING, schema.type, 'type for property %s is modified' % - KeystoneProject.DESCRIPTION) + project.KeystoneProject.DESCRIPTION) self.assertEqual('Description of keystone project.', schema.description, 'description for property %s is modified' % - KeystoneProject.DESCRIPTION) + project.KeystoneProject.DESCRIPTION) self.assertEqual( '', schema.default, 'default for property %s is modified' % - KeystoneProject.DESCRIPTION) + project.KeystoneProject.DESCRIPTION) def test_property_domain_validate_schema(self): - schema = KeystoneProject.properties_schema[KeystoneProject.DOMAIN] + schema = project.KeystoneProject.properties_schema[ + project.KeystoneProject.DOMAIN] self.assertEqual( True, schema.update_allowed, 'update_allowed for property %s is modified' % - KeystoneProject.DOMAIN) + project.KeystoneProject.DOMAIN) self.assertEqual(properties.Schema.STRING, schema.type, 'type for property %s is modified' % - KeystoneProject.DOMAIN) + project.KeystoneProject.DOMAIN) self.assertEqual('Name or id of keystone domain.', schema.description, 'description for property %s is modified' % - KeystoneProject.DOMAIN) + project.KeystoneProject.DOMAIN) self.assertEqual( [constraints.CustomConstraint('keystone.domain')], schema.constraints, 'constrains for property %s is modified' % - KeystoneProject.DOMAIN) + project.KeystoneProject.DOMAIN) self.assertEqual( 'default', schema.default, 'default for property %s is modified' % - KeystoneProject.DOMAIN) + project.KeystoneProject.DOMAIN) def test_property_enabled_validate_schema(self): - schema = KeystoneProject.properties_schema[KeystoneProject.ENABLED] + schema = project.KeystoneProject.properties_schema[ + project.KeystoneProject.ENABLED] self.assertEqual( True, schema.update_allowed, 'update_allowed for property %s is modified' % - KeystoneProject.DOMAIN) + project.KeystoneProject.DOMAIN) self.assertEqual(properties.Schema.BOOLEAN, schema.type, 'type for property %s is modified' % - KeystoneProject.ENABLED) + project.KeystoneProject.ENABLED) self.assertEqual('This project is enabled or disabled.', schema.description, 'description for property %s is modified' % - KeystoneProject.ENABLED) + project.KeystoneProject.ENABLED) self.assertEqual( True, schema.default, 'default for property %s is modified' % - KeystoneProject.ENABLED) + project.KeystoneProject.ENABLED) def _get_property_schema_value_default(self, name): - schema = KeystoneProject.properties_schema[name] + schema = project.KeystoneProject.properties_schema[name] return schema.default def test_project_handle_create_default(self): values = { - KeystoneProject.NAME: None, - KeystoneProject.DESCRIPTION: + project.KeystoneProject.NAME: None, + project.KeystoneProject.DESCRIPTION: (self._get_property_schema_value_default( - KeystoneProject.DESCRIPTION)), - KeystoneProject.DOMAIN: + project.KeystoneProject.DESCRIPTION)), + project.KeystoneProject.DOMAIN: (self._get_property_schema_value_default( - KeystoneProject.DOMAIN)), - KeystoneProject.ENABLED: + project.KeystoneProject.DOMAIN)), + project.KeystoneProject.ENABLED: (self._get_property_schema_value_default( - KeystoneProject.ENABLED)) + project.KeystoneProject.ENABLED)) } def _side_effect(key): @@ -259,16 +263,17 @@ class KeystoneProjectTest(common.HeatTestCase): # validate the properties self.assertEqual( None, - self.test_project.properties.get(KeystoneProject.NAME)) + self.test_project.properties.get(project.KeystoneProject.NAME)) self.assertEqual( '', - self.test_project.properties.get(KeystoneProject.DESCRIPTION)) + self.test_project.properties.get( + project.KeystoneProject.DESCRIPTION)) self.assertEqual( 'default', - self.test_project.properties.get(KeystoneProject.DOMAIN)) + self.test_project.properties.get(project.KeystoneProject.DOMAIN)) self.assertEqual( True, - self.test_project.properties.get(KeystoneProject.ENABLED)) + self.test_project.properties.get(project.KeystoneProject.ENABLED)) self.test_project.handle_create() @@ -282,10 +287,11 @@ class KeystoneProjectTest(common.HeatTestCase): def test_project_handle_update(self): self.test_project.resource_id = '477e8273-60a7-4c41-b683-fdb0bc7cd151' - prop_diff = {KeystoneProject.NAME: 'test_project_1_updated', - KeystoneProject.DESCRIPTION: 'Test Project updated', - KeystoneProject.ENABLED: False, - KeystoneProject.DOMAIN: 'test_domain'} + prop_diff = {project.KeystoneProject.NAME: 'test_project_1_updated', + project.KeystoneProject.DESCRIPTION: + 'Test Project updated', + project.KeystoneProject.ENABLED: False, + project.KeystoneProject.DOMAIN: 'test_domain'} self.test_project.handle_update(json_snippet=None, tmpl_diff=None, @@ -293,9 +299,9 @@ class KeystoneProjectTest(common.HeatTestCase): self.projects.update.assert_called_once_with( project=self.test_project.resource_id, - name=prop_diff[KeystoneProject.NAME], - description=prop_diff[KeystoneProject.DESCRIPTION], - enabled=prop_diff[KeystoneProject.ENABLED], + name=prop_diff[project.KeystoneProject.NAME], + description=prop_diff[project.KeystoneProject.DESCRIPTION], + enabled=prop_diff[project.KeystoneProject.ENABLED], domain='test_domain' ) @@ -305,8 +311,9 @@ class KeystoneProjectTest(common.HeatTestCase): self.test_project.physical_resource_name = mock.MagicMock() self.test_project.physical_resource_name.return_value = 'foo' - prop_diff = {KeystoneProject.DESCRIPTION: 'Test Project updated', - KeystoneProject.ENABLED: False} + prop_diff = {project.KeystoneProject.DESCRIPTION: + 'Test Project updated', + project.KeystoneProject.ENABLED: False} self.test_project.handle_update(json_snippet=None, tmpl_diff=None, @@ -317,8 +324,8 @@ class KeystoneProjectTest(common.HeatTestCase): self.projects.update.assert_called_once_with( project=self.test_project.resource_id, name='foo', - description=prop_diff[KeystoneProject.DESCRIPTION], - enabled=prop_diff[KeystoneProject.ENABLED], + description=prop_diff[project.KeystoneProject.DESCRIPTION], + enabled=prop_diff[project.KeystoneProject.ENABLED], domain='default' ) diff --git a/contrib/heat_keystone/heat_keystone/tests/test_role.py b/contrib/heat_keystone/heat_keystone/tests/test_role.py index c40653196..a2e7b557b 100644 --- a/contrib/heat_keystone/heat_keystone/tests/test_role.py +++ b/contrib/heat_keystone/heat_keystone/tests/test_role.py @@ -19,8 +19,7 @@ from heat.engine import template from heat.tests import common from heat.tests import utils -from ..resources.role import KeystoneRole # noqa -from ..resources.role import resource_mapping # noqa +from ..resources import role # noqa keystone_role_template = { 'heat_template_version': '2013-05-23', @@ -44,7 +43,7 @@ class KeystoneRoleTest(common.HeatTestCase): self.ctx = utils.dummy_context() # For unit testing purpose. Register resource provider explicitly. - resource._register_class(RESOURCE_TYPE, KeystoneRole) + resource._register_class(RESOURCE_TYPE, role.KeystoneRole) self.stack = stack.Stack( self.ctx, 'test_stack_keystone', @@ -66,10 +65,10 @@ class KeystoneRoleTest(common.HeatTestCase): return value def test_resource_mapping(self): - mapping = resource_mapping() + mapping = role.resource_mapping() self.assertEqual(1, len(mapping)) - self.assertEqual(KeystoneRole, mapping[RESOURCE_TYPE]) - self.assertIsInstance(self.test_role, KeystoneRole) + self.assertEqual(role.KeystoneRole, mapping[RESOURCE_TYPE]) + self.assertIsInstance(self.test_role, role.KeystoneRole) def test_role_handle_create(self): mock_role = self._get_mock_role() @@ -77,7 +76,7 @@ class KeystoneRoleTest(common.HeatTestCase): # validate the properties self.assertEqual('test_role_1', - self.test_role.properties.get(KeystoneRole.NAME)) + self.test_role.properties.get(role.KeystoneRole.NAME)) self.test_role.handle_create() @@ -103,7 +102,7 @@ class KeystoneRoleTest(common.HeatTestCase): self.test_role.resource_id = '477e8273-60a7-4c41-b683-fdb0bc7cd151' # update the name property - prop_diff = {KeystoneRole.NAME: 'test_role_1_updated'} + prop_diff = {role.KeystoneRole.NAME: 'test_role_1_updated'} self.test_role.handle_update(json_snippet=None, tmpl_diff=None, @@ -111,7 +110,7 @@ class KeystoneRoleTest(common.HeatTestCase): self.roles.update.assert_called_once_with( role=self.test_role.resource_id, - name=prop_diff[KeystoneRole.NAME] + name=prop_diff[role.KeystoneRole.NAME] ) def test_role_handle_delete(self): diff --git a/contrib/heat_keystone/heat_keystone/tests/test_role_assignments.py b/contrib/heat_keystone/heat_keystone/tests/test_role_assignments.py index caa8b0568..8b3b086c5 100644 --- a/contrib/heat_keystone/heat_keystone/tests/test_role_assignments.py +++ b/contrib/heat_keystone/heat_keystone/tests/test_role_assignments.py @@ -21,7 +21,7 @@ from heat.engine import template from heat.tests import common from heat.tests import utils -from ..resources.role_assignments import KeystoneRoleAssignment # noqa +from ..resources import role_assignments # noqa RESOURCE_TYPE = 'OS::Keystone::DummyRoleAssignment' @@ -55,7 +55,8 @@ class KeystoneRoleAssignmentTest(common.HeatTestCase): self.ctx = utils.dummy_context() # For unit testing purpose. Register resource provider explicitly. - resource._register_class(RESOURCE_TYPE, KeystoneRoleAssignment) + resource._register_class(RESOURCE_TYPE, + role_assignments.KeystoneRoleAssignment) self.stack = stack.Stack( self.ctx, 'test_stack_keystone', @@ -96,7 +97,7 @@ class KeystoneRoleAssignmentTest(common.HeatTestCase): def test_properties_title(self): property_title_map = { - KeystoneRoleAssignment.ROLES: 'roles' + role_assignments.KeystoneRoleAssignment.ROLES: 'roles' } for actual_title, expected_title in property_title_map.items(): @@ -107,23 +108,24 @@ class KeystoneRoleAssignmentTest(common.HeatTestCase): actual_title) def test_property_roles_validate_schema(self): - schema = (KeystoneRoleAssignment. - properties_schema[KeystoneRoleAssignment.ROLES]) + schema = (role_assignments.KeystoneRoleAssignment. + properties_schema[ + role_assignments.KeystoneRoleAssignment.ROLES]) self.assertEqual( True, schema.update_allowed, 'update_allowed for property %s is modified' % - KeystoneRoleAssignment.ROLES) + role_assignments.KeystoneRoleAssignment.ROLES) self.assertEqual(properties.Schema.LIST, schema.type, 'type for property %s is modified' % - KeystoneRoleAssignment.ROLES) + role_assignments.KeystoneRoleAssignment.ROLES) self.assertEqual('List of role assignments.', schema.description, 'description for property %s is modified' % - KeystoneRoleAssignment.ROLES) + role_assignments.KeystoneRoleAssignment.ROLES) def test_role_assignment_handle_create_user(self): # validate the properties @@ -139,7 +141,7 @@ class KeystoneRoleAssignmentTest(common.HeatTestCase): 'domain': 'domain_1' }], (self.test_role_assignment.properties. - get(KeystoneRoleAssignment.ROLES))) + get(role_assignments.KeystoneRoleAssignment.ROLES))) self.test_role_assignment.handle_create(user_id='user_1', group_id=None) @@ -171,7 +173,7 @@ class KeystoneRoleAssignmentTest(common.HeatTestCase): 'domain': 'domain_1' }], (self.test_role_assignment.properties. - get(KeystoneRoleAssignment.ROLES))) + get(role_assignments.KeystoneRoleAssignment.ROLES))) self.test_role_assignment.handle_create(user_id=None, group_id='group_1') @@ -204,7 +206,7 @@ class KeystoneRoleAssignmentTest(common.HeatTestCase): } prop_diff = { - KeystoneRoleAssignment.ROLES: [ + role_assignments.KeystoneRoleAssignment.ROLES: [ { 'role': 'role_2', 'project': 'project_1' @@ -262,7 +264,7 @@ class KeystoneRoleAssignmentTest(common.HeatTestCase): } prop_diff = { - KeystoneRoleAssignment.ROLES: [ + role_assignments.KeystoneRoleAssignment.ROLES: [ { 'role': 'role_2', 'project': 'project_1' diff --git a/contrib/heat_keystone/heat_keystone/tests/test_user.py b/contrib/heat_keystone/heat_keystone/tests/test_user.py index 226c01f9b..7cd6a4272 100644 --- a/contrib/heat_keystone/heat_keystone/tests/test_user.py +++ b/contrib/heat_keystone/heat_keystone/tests/test_user.py @@ -19,8 +19,7 @@ from heat.engine import template from heat.tests import common from heat.tests import utils -from ..resources.user import KeystoneUser # noqa -from ..resources.user import resource_mapping # noqa +from ..resources import user # noqa keystone_user_template = { 'heat_template_version': '2013-05-23', @@ -52,7 +51,7 @@ class KeystoneUserTest(common.HeatTestCase): self.ctx = utils.dummy_context() # For unit testing purpose. Register resource provider explicitly. - resource._register_class(RESOURCE_TYPE, KeystoneUser) + resource._register_class(RESOURCE_TYPE, user.KeystoneUser) self.stack = stack.Stack( self.ctx, 'test_stack_keystone', @@ -90,10 +89,10 @@ class KeystoneUserTest(common.HeatTestCase): return value def test_resource_mapping(self): - mapping = resource_mapping() + mapping = user.resource_mapping() self.assertEqual(1, len(mapping)) - self.assertEqual(KeystoneUser, mapping[RESOURCE_TYPE]) - self.assertIsInstance(self.test_user, KeystoneUser) + self.assertEqual(user.KeystoneUser, mapping[RESOURCE_TYPE]) + self.assertIsInstance(self.test_user, user.KeystoneUser) def test_user_handle_create(self): mock_user = self._get_mock_user() @@ -103,28 +102,28 @@ class KeystoneUserTest(common.HeatTestCase): # validate the properties self.assertEqual( 'test_user_1', - self.test_user.properties.get(KeystoneUser.NAME)) + self.test_user.properties.get(user.KeystoneUser.NAME)) self.assertEqual( 'Test user', - self.test_user.properties.get(KeystoneUser.DESCRIPTION)) + self.test_user.properties.get(user.KeystoneUser.DESCRIPTION)) self.assertEqual( 'default', - self.test_user.properties.get(KeystoneUser.DOMAIN)) + self.test_user.properties.get(user.KeystoneUser.DOMAIN)) self.assertEqual( True, - self.test_user.properties.get(KeystoneUser.ENABLED)) + self.test_user.properties.get(user.KeystoneUser.ENABLED)) self.assertEqual( 'abc@xyz.com', - self.test_user.properties.get(KeystoneUser.EMAIL)) + self.test_user.properties.get(user.KeystoneUser.EMAIL)) self.assertEqual( 'password', - self.test_user.properties.get(KeystoneUser.PASSWORD)) + self.test_user.properties.get(user.KeystoneUser.PASSWORD)) self.assertEqual( 'project_1', - self.test_user.properties.get(KeystoneUser.DEFAULT_PROJECT)) + self.test_user.properties.get(user.KeystoneUser.DEFAULT_PROJECT)) self.assertEqual( ['group1', 'group2'], - self.test_user.properties.get(KeystoneUser.GROUPS)) + self.test_user.properties.get(user.KeystoneUser.GROUPS)) self.test_user.handle_create() @@ -148,26 +147,26 @@ class KeystoneUserTest(common.HeatTestCase): group) def _get_property_schema_value_default(self, name): - schema = KeystoneUser.properties_schema[name] + schema = user.KeystoneUser.properties_schema[name] return schema.default def test_user_handle_create_default(self): values = { - KeystoneUser.NAME: None, - KeystoneUser.DESCRIPTION: + user.KeystoneUser.NAME: None, + user.KeystoneUser.DESCRIPTION: (self._get_property_schema_value_default( - KeystoneUser.DESCRIPTION)), - KeystoneUser.DOMAIN: + user.KeystoneUser.DESCRIPTION)), + user.KeystoneUser.DOMAIN: (self._get_property_schema_value_default( - KeystoneUser.DOMAIN)), - KeystoneUser.ENABLED: + user.KeystoneUser.DOMAIN)), + user.KeystoneUser.ENABLED: (self._get_property_schema_value_default( - KeystoneUser.ENABLED)), - KeystoneUser.ROLES: None, - KeystoneUser.GROUPS: None, - KeystoneUser.PASSWORD: 'password', - KeystoneUser.EMAIL: 'abc@xyz.com', - KeystoneUser.DEFAULT_PROJECT: 'default_project' + user.KeystoneUser.ENABLED)), + user.KeystoneUser.ROLES: None, + user.KeystoneUser.GROUPS: None, + user.KeystoneUser.PASSWORD: 'password', + user.KeystoneUser.EMAIL: 'abc@xyz.com', + user.KeystoneUser.DEFAULT_PROJECT: 'default_project' } def _side_effect(key): @@ -203,13 +202,13 @@ class KeystoneUserTest(common.HeatTestCase): } # add new group group3 and remove group group2 - prop_diff = {KeystoneUser.NAME: 'test_user_1_updated', - KeystoneUser.DESCRIPTION: 'Test User updated', - KeystoneUser.ENABLED: False, - KeystoneUser.EMAIL: 'xyz@abc.com', - KeystoneUser.PASSWORD: 'passWORD', - KeystoneUser.DEFAULT_PROJECT: 'project_2', - KeystoneUser.GROUPS: ['group1', 'group3']} + prop_diff = {user.KeystoneUser.NAME: 'test_user_1_updated', + user.KeystoneUser.DESCRIPTION: 'Test User updated', + user.KeystoneUser.ENABLED: False, + user.KeystoneUser.EMAIL: 'xyz@abc.com', + user.KeystoneUser.PASSWORD: 'passWORD', + user.KeystoneUser.DEFAULT_PROJECT: 'project_2', + user.KeystoneUser.GROUPS: ['group1', 'group3']} self.test_user.handle_update(json_snippet=None, tmpl_diff=None, @@ -218,13 +217,14 @@ class KeystoneUserTest(common.HeatTestCase): # validate user update self.users.update.assert_called_once_with( user=self.test_user.resource_id, - domain=self.test_user._stored_properties_data[KeystoneUser.DOMAIN], - name=prop_diff[KeystoneUser.NAME], - description=prop_diff[KeystoneUser.DESCRIPTION], - email=prop_diff[KeystoneUser.EMAIL], - password=prop_diff[KeystoneUser.PASSWORD], - default_project=prop_diff[KeystoneUser.DEFAULT_PROJECT], - enabled=prop_diff[KeystoneUser.ENABLED] + domain=self.test_user._stored_properties_data[ + user.KeystoneUser.DOMAIN], + name=prop_diff[user.KeystoneUser.NAME], + description=prop_diff[user.KeystoneUser.DESCRIPTION], + email=prop_diff[user.KeystoneUser.EMAIL], + password=prop_diff[user.KeystoneUser.PASSWORD], + default_project=prop_diff[user.KeystoneUser.DEFAULT_PROJECT], + enabled=prop_diff[user.KeystoneUser.ENABLED] ) # validate the new groups added