openstack
/
keystone
Code Issues Proposed changes

Merge "Minor cleanups for usage of group refs"

This commit is contained in:
Jenkins 2015-11-20 22:15:05 +00:00 committed by Gerrit Code Review
parent cdaa4b65ec 8e28213714
commit 5de11025f4
3 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
keystone/tests/unit/test_backend.py
View File

@ -3971,9 +3971,7 @@ class IdentityTests(AssignmentTestHelperMixin):
orig_member_assignments = get_member_assignments()
# Create a group.
new_group = unit.new_group_ref(
domain_id=DEFAULT_DOMAIN_ID,
name=self.getUniqueString(prefix='tdgrra'))
new_group = unit.new_group_ref(domain_id=DEFAULT_DOMAIN_ID)
new_group = self.identity_api.create_group(new_group)
# Create a project.

4
keystone/tests/unit/test_backend_ldap.py
View File

@ -805,9 +805,7 @@ class BaseLDAPIdentity(test_backend.IdentityTests):
break
# Create a group
group = unit.new_group_ref(name=self.getUniqueString(prefix='tuidc'),
description=self.getUniqueString(),
domain_id=CONF.identity.default_domain_id)
group = unit.new_group_ref(domain_id=CONF.identity.default_domain_id)
group_id = group['id']
group = self.identity_api.driver.create_group(group_id, group)
# Now we'll use the manager to discover it, which will create a

26
keystone/tests/unit/test_v3_assignment.py
View File

@ -216,8 +216,8 @@ class AssignmentTestCase(test_v3.RestfulTestCase,
project_id=self.project2['id'])
user2 = self.identity_api.create_user(user2)
self.group2 = unit.new_group_ref(domain_id=self.domain2['id'])
self.group2 = self.identity_api.create_group(self.group2)
group2 = unit.new_group_ref(domain_id=self.domain2['id'])
group2 = self.identity_api.create_group(group2)
self.credential2 = self.new_credential_ref(
user_id=user2['id'],
@ -244,7 +244,7 @@ class AssignmentTestCase(test_v3.RestfulTestCase,
self.project2['id'])
self.assertRaises(exception.GroupNotFound,
self.identity_api.get_group,
self.group2['id'])
group2['id'])
self.assertRaises(exception.UserNotFound,
self.identity_api.get_user,
user2['id'])
@ -1642,12 +1642,10 @@ class AssignmentTestCase(test_v3.RestfulTestCase,
user2 = unit.create_user(self.identity_api,
domain_id=self.domain['id'])
self.group1 = unit.new_group_ref(domain_id=self.domain['id'])
self.group1 = self.identity_api.create_group(self.group1)
self.identity_api.add_user_to_group(user1['id'],
self.group1['id'])
self.identity_api.add_user_to_group(user2['id'],
self.group1['id'])
group1 = unit.new_group_ref(domain_id=self.domain['id'])
group1 = self.identity_api.create_group(group1)
self.identity_api.add_user_to_group(user1['id'], group1['id'])
self.identity_api.add_user_to_group(user2['id'], group1['id'])
self.project1 = self.new_project_ref(
domain_id=self.domain['id'])
self.resource_api.create_project(self.project1['id'], self.project1)
@ -1659,7 +1657,7 @@ class AssignmentTestCase(test_v3.RestfulTestCase,
# Now add one of each of the four types of assignment
gd_entity = self.build_role_assignment_entity(
domain_id=self.domain_id, group_id=self.group1['id'],
domain_id=self.domain_id, group_id=group1['id'],
role_id=self.role1['id'])
self.put(gd_entity['links']['assignment'])
@ -1669,7 +1667,7 @@ class AssignmentTestCase(test_v3.RestfulTestCase,
self.put(ud_entity['links']['assignment'])
gp_entity = self.build_role_assignment_entity(
project_id=self.project1['id'], group_id=self.group1['id'],
project_id=self.project1['id'], group_id=group1['id'],
role_id=self.role1['id'])
self.put(gp_entity['links']['assignment'])
@ -1706,7 +1704,7 @@ class AssignmentTestCase(test_v3.RestfulTestCase,
self.assertRoleAssignmentInListResponse(r, up_entity)
self.assertRoleAssignmentInListResponse(r, ud_entity)
collection_url = '/role_assignments?group.id=%s' % self.group1['id']
collection_url = '/role_assignments?group.id=%s' % group1['id']
r = self.get(collection_url)
self.assertValidRoleAssignmentListResponse(r,
expected_length=2,
@ -1750,10 +1748,10 @@ class AssignmentTestCase(test_v3.RestfulTestCase,
self.assertRoleAssignmentInListResponse(r, ud_entity)
# ...and the two via group membership...
gp1_link = self.build_role_assignment_link(
project_id=self.project1['id'], group_id=self.group1['id'],
project_id=self.project1['id'], group_id=group1['id'],
role_id=self.role1['id'])
gd1_link = self.build_role_assignment_link(domain_id=self.domain_id,
group_id=self.group1['id'],
group_id=group1['id'],
role_id=self.role1['id'])
up1_entity = self.build_role_assignment_entity(