Merge "Keystone REST handles default role incorrectly"
This commit is contained in:
commit
91875edeb0
@ -93,14 +93,6 @@ class Users(generic.View):
|
|||||||
domain=domain.id
|
domain=domain.id
|
||||||
)
|
)
|
||||||
|
|
||||||
# assign role to user
|
|
||||||
api.keystone.add_tenant_user_role(
|
|
||||||
request,
|
|
||||||
project=request.DATA.get('project_id'),
|
|
||||||
user=new_user.id,
|
|
||||||
role=request.DATA.get('role_id')
|
|
||||||
)
|
|
||||||
|
|
||||||
return rest_utils.CreatedResponse(
|
return rest_utils.CreatedResponse(
|
||||||
'/api/keystone/users/%s' % new_user.id,
|
'/api/keystone/users/%s' % new_user.id,
|
||||||
new_user.to_dict()
|
new_user.to_dict()
|
||||||
|
@ -136,7 +136,7 @@ class KeystoneRestTestCase(test.TestCase):
|
|||||||
)
|
)
|
||||||
|
|
||||||
@mock.patch.object(keystone.api, 'keystone')
|
@mock.patch.object(keystone.api, 'keystone')
|
||||||
def _test_user_create(self, supplied_body, expected_call, kc):
|
def _test_user_create(self, supplied_body, add_user_call, kc):
|
||||||
request = self.mock_rest_request(body=supplied_body)
|
request = self.mock_rest_request(body=supplied_body)
|
||||||
kc.get_default_domain.return_value = mock.Mock(**{'id': 'the_domain'})
|
kc.get_default_domain.return_value = mock.Mock(**{'id': 'the_domain'})
|
||||||
kc.user_create.return_value.id = 'user123'
|
kc.user_create.return_value.id = 'user123'
|
||||||
@ -151,7 +151,7 @@ class KeystoneRestTestCase(test.TestCase):
|
|||||||
'/api/keystone/users/user123')
|
'/api/keystone/users/user123')
|
||||||
self.assertEqual(response.content, '{"id": "user123", '
|
self.assertEqual(response.content, '{"id": "user123", '
|
||||||
'"name": "bob"}')
|
'"name": "bob"}')
|
||||||
kc.user_create.assert_called_once_with(request, **expected_call)
|
kc.user_create.assert_called_once_with(request, **add_user_call)
|
||||||
|
|
||||||
@mock.patch.object(keystone.api, 'keystone')
|
@mock.patch.object(keystone.api, 'keystone')
|
||||||
def test_user_delete_many(self, kc):
|
def test_user_delete_many(self, kc):
|
||||||
|
Loading…
Reference in New Issue
Block a user