openstack
/
adjutant
Code Issues Proposed changes

rename identity cache for consistency 

Change-Id: I3bfcf19df5f89b79afe84a5d010b510756c65f36
This commit is contained in:
Adrian Turjak 2017-12-05 22:14:53 +13:00
parent bfef179935
commit e5f55c66c1
5 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
adjutant/actions/v1/tests/test_project_actions.py
View File

@ -61,10 +61,10 @@ class ProjectActionTests(TestCase):
action.post_approve()
self.assertEquals(action.valid, True)
new_project = fake_clients.identity_temp_cache['new_projects'][0]
new_project = fake_clients.identity_cache['new_projects'][0]
self.assertEquals(new_project.name, 'test_project')
new_user = fake_clients.identity_temp_cache['new_users'][0]
new_user = fake_clients.identity_cache['new_users'][0]
self.assertEquals(new_user.name, 'test@example.com')
self.assertEquals(new_user.email, 'test@example.com')
@ -114,10 +114,10 @@ class ProjectActionTests(TestCase):
action.post_approve()
self.assertEquals(action.valid, True)
new_project = fake_clients.identity_temp_cache['new_projects'][0]
new_project = fake_clients.identity_cache['new_projects'][0]
self.assertEquals(new_project.name, 'test_project')
new_user = fake_clients.identity_temp_cache['new_users'][0]
new_user = fake_clients.identity_cache['new_users'][0]
self.assertEquals(new_user.name, 'test@example.com')
self.assertEquals(new_user.email, 'test@example.com')
@ -129,9 +129,9 @@ class ProjectActionTests(TestCase):
action.post_approve()
self.assertEquals(action.valid, True)
self.assertEqual(
len(fake_clients.identity_temp_cache['new_projects']), 1)
len(fake_clients.identity_cache['new_projects']), 1)
self.assertEqual(
len(fake_clients.identity_temp_cache['new_users']), 1)
len(fake_clients.identity_cache['new_users']), 1)
self.assertEquals(
task.cache,
{'project_id': new_project.id, 'user_id': new_user.id,
@ -194,14 +194,14 @@ class ProjectActionTests(TestCase):
# No roles_granted yet, but user created
self.assertTrue("user_id" in action.action.cache)
self.assertFalse("roles_granted" in action.action.cache)
new_project = fake_clients.identity_temp_cache['new_projects'][0]
new_project = fake_clients.identity_cache['new_projects'][0]
self.assertEquals(new_project.name, 'test_project')
new_user = fake_clients.identity_temp_cache['new_users'][0]
new_user = fake_clients.identity_cache['new_users'][0]
self.assertEquals(new_user.name, 'test@example.com')
self.assertEquals(new_user.email, 'test@example.com')
self.assertEquals(
len(fake_clients.identity_temp_cache['role_assignments']), 0)
len(fake_clients.identity_cache['role_assignments']), 0)
# And then swap back the correct function
action.grant_roles = old_grant_function
@ -254,11 +254,11 @@ class ProjectActionTests(TestCase):
action.post_approve()
self.assertEquals(action.valid, True)
new_project = fake_clients.identity_temp_cache['new_projects'][0]
new_project = fake_clients.identity_cache['new_projects'][0]
self.assertEquals(new_project.name, 'test_project')
self.assertEqual(
len(fake_clients.identity_temp_cache['new_users']), 0)
len(fake_clients.identity_cache['new_users']), 0)
self.assertEquals(
task.cache,
@ -312,7 +312,7 @@ class ProjectActionTests(TestCase):
self.assertEquals(action.valid, False)
self.assertEquals(
fake_clients.identity_temp_cache['projects'].get('test_project'),
fake_clients.identity_cache['projects'].get('test_project'),
None)
token_data = {'password': '123456'}
@ -346,10 +346,10 @@ class ProjectActionTests(TestCase):
action.post_approve()
self.assertEquals(action.valid, True)
new_project = fake_clients.identity_temp_cache['new_projects'][0]
new_project = fake_clients.identity_cache['new_projects'][0]
self.assertEquals(new_project.name, 'test_project')
fake_clients.identity_temp_cache['projects'] = {}
fake_clients.identity_cache['projects'] = {}
token_data = {'password': '123456'}
action.submit(token_data)
@ -382,11 +382,11 @@ class ProjectActionTests(TestCase):
action.post_approve()
self.assertEquals(action.valid, True)
new_user = fake_clients.identity_temp_cache['new_users'][0]
new_user = fake_clients.identity_cache['new_users'][0]
self.assertEquals(new_user.name, 'test@example.com')
self.assertEquals(new_user.email, 'test@example.com')
fake_clients.identity_temp_cache['users'] = {}
fake_clients.identity_cache['users'] = {}
token_data = {'password': '123456'}
action.submit(token_data)
@ -424,11 +424,11 @@ class ProjectActionTests(TestCase):
action.post_approve()
self.assertEquals(action.valid, True)
new_project = fake_clients.identity_temp_cache['new_projects'][0]
new_project = fake_clients.identity_cache['new_projects'][0]
self.assertEquals(new_project.name, 'test_project')
self.assertEqual(
len(fake_clients.identity_temp_cache['new_users']), 0)
len(fake_clients.identity_cache['new_users']), 0)
self.assertEquals(
task.cache,
@ -503,11 +503,11 @@ class ProjectActionTests(TestCase):
action.post_approve()
self.assertEquals(action.valid, True)
new_project = fake_clients.identity_temp_cache['new_projects'][0]
new_project = fake_clients.identity_cache['new_projects'][0]
self.assertEquals(new_project.name, 'test_project')
self.assertEqual(
len(fake_clients.identity_temp_cache['new_users']), 1)
len(fake_clients.identity_cache['new_users']), 1)
self.assertEquals(
task.cache,
@ -626,10 +626,10 @@ class ProjectActionTests(TestCase):
action.post_approve()
self.assertEquals(action.valid, True)
new_project = fake_clients.identity_temp_cache['new_projects'][0]
new_project = fake_clients.identity_cache['new_projects'][0]
self.assertEquals(new_project.name, 'test_project')
new_user = fake_clients.identity_temp_cache['new_users'][0]
new_user = fake_clients.identity_cache['new_users'][0]
self.assertEquals(new_user.name, 'test_user')
self.assertEquals(new_user.email, 'test@example.com')
@ -782,7 +782,7 @@ class ProjectActionTests(TestCase):
action.post_approve()
self.assertEquals(action.valid, True)
new_project = fake_clients.identity_temp_cache['new_projects'][0]
new_project = fake_clients.identity_cache['new_projects'][0]
self.assertEquals(new_project.name, 'test_project')
self.assertEquals(new_project.parent_id, project.id)
@ -830,7 +830,7 @@ class ProjectActionTests(TestCase):
action.post_approve()
self.assertEquals(action.valid, True)
new_project = fake_clients.identity_temp_cache['new_projects'][0]
new_project = fake_clients.identity_cache['new_projects'][0]
self.assertEquals(new_project.name, 'test_project')
self.assertEquals(new_project.parent_id, project.id)
@ -964,7 +964,7 @@ class ProjectActionTests(TestCase):
action.post_approve()
self.assertEquals(action.valid, True)
new_project = fake_clients.identity_temp_cache['new_projects'][0]
new_project = fake_clients.identity_cache['new_projects'][0]
self.assertEquals(new_project.name, 'test_project')
self.assertEquals(new_project.parent_id, None)

22
adjutant/actions/v1/tests/test_user_actions.py
View File

@ -66,7 +66,7 @@ class UserActionTests(AdjutantTestCase):
action.submit(token_data)
self.assertEquals(action.valid, True)
self.assertEquals(
len(fake_clients.identity_temp_cache['new_users']), 1)
len(fake_clients.identity_cache['new_users']), 1)
fake_client = fake_clients.FakeManager()
@ -162,7 +162,7 @@ class UserActionTests(AdjutantTestCase):
token_data = {'password': '123456'}
action.submit(token_data)
self.assertEquals(action.valid, True)
self.assertEquals(len(fake_clients.identity_temp_cache['users']), 2)
self.assertEquals(len(fake_clients.identity_cache['users']), 2)
fake_client = fake_clients.FakeManager()
@ -415,7 +415,7 @@ class UserActionTests(AdjutantTestCase):
self.assertEquals(action.valid, True)
self.assertEquals(
fake_clients.identity_temp_cache['users'][user.id].password,
fake_clients.identity_cache['users'][user.id].password,
'123456')
def test_reset_user_password_case_insensitive(self):
@ -457,7 +457,7 @@ class UserActionTests(AdjutantTestCase):
self.assertEquals(action.valid, True)
self.assertEquals(
fake_clients.identity_temp_cache['users'][user.id].password,
fake_clients.identity_cache['users'][user.id].password,
'123456')
def test_reset_user_password_no_user(self):
@ -854,7 +854,7 @@ class UserActionTests(AdjutantTestCase):
new_role = fake_clients.FakeRole("new_role")
fake_clients.identity_temp_cache['roles'][new_role.id] = new_role
fake_clients.identity_cache['roles'][new_role.id] = new_role
task = Task.objects.create(
ip_address="0.0.0.0",
@ -930,7 +930,7 @@ class UserActionTests(AdjutantTestCase):
token_data = {'password': '123456'}
action.submit(token_data)
self.assertEquals(action.valid, True)
self.assertEquals(len(fake_clients.identity_temp_cache['users']), 2)
self.assertEquals(len(fake_clients.identity_cache['users']), 2)
fake_client = fake_clients.FakeManager()
@ -1028,7 +1028,7 @@ class UserActionTests(AdjutantTestCase):
self.assertEquals(action.valid, True)
self.assertEquals(
fake_clients.identity_temp_cache['users'][user.id].password,
fake_clients.identity_cache['users'][user.id].password,
'123456')
@override_settings(USERNAME_IS_EMAIL=True)
@ -1069,11 +1069,11 @@ class UserActionTests(AdjutantTestCase):
self.assertEquals(action.valid, True)
self.assertEquals(
fake_clients.identity_temp_cache['users'][user.id].email,
fake_clients.identity_cache['users'][user.id].email,
'new_test@example.com')
self.assertEquals(
fake_clients.identity_temp_cache['users'][user.id].name,
fake_clients.identity_cache['users'][user.id].name,
'new_test@example.com')
@override_settings(USERNAME_IS_EMAIL=True)
@ -1145,9 +1145,9 @@ class UserActionTests(AdjutantTestCase):
self.assertEquals(action.valid, True)
self.assertEquals(
fake_clients.identity_temp_cache['users'][user.id].email,
fake_clients.identity_cache['users'][user.id].email,
'new_testexample.com')
self.assertEquals(
fake_clients.identity_temp_cache['users'][user.id].name,
fake_clients.identity_cache['users'][user.id].name,
'test_user')

8
adjutant/api/v1/tests/test_api_taskview.py
View File

@ -105,7 +105,7 @@ class TaskViewTests(AdjutantAPITestCase):
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(len(mail.outbox), 2)
self.assertEquals(
fake_clients.identity_temp_cache['new_users'][0].name,
fake_clients.identity_cache['new_users'][0].name,
'test@example.com')
def test_new_user_no_project(self):
@ -268,7 +268,7 @@ class TaskViewTests(AdjutantAPITestCase):
{'notes': ['created token']}
)
new_project = fake_clients.identity_temp_cache['new_projects'][0]
new_project = fake_clients.identity_cache['new_projects'][0]
self.assertEquals(new_project.name, 'test_project')
new_token = Token.objects.all()[0]
@ -309,7 +309,7 @@ class TaskViewTests(AdjutantAPITestCase):
)
self.assertEqual(len(mail.outbox), 3)
fake_clients.identity_temp_cache['projects'] = {}
fake_clients.identity_cache['projects'] = {}
new_token = Token.objects.all()[0]
url = "/v1/tokens/" + new_token.token
@ -997,7 +997,7 @@ class TaskViewTests(AdjutantAPITestCase):
self.assertEqual(len(mail.outbox), 2)
self.assertEquals(
fake_clients.identity_temp_cache['new_users'][0].name,
fake_clients.identity_cache['new_users'][0].name,
'new_user')
@override_settings(USERNAME_IS_EMAIL=False)

84
adjutant/common/tests/fake_clients.py
View File

@ -19,7 +19,7 @@ from django.conf import settings
import mock
identity_temp_cache = {}
identity_cache = {}
neutron_cache = {}
nova_cache = {}
cinder_cache = {}
@ -121,9 +121,9 @@ def setup_identity_cache(projects=None, users=None, role_assignments=None,
region_two = mock.Mock()
region_two.id = 'RegionTwo'
global identity_temp_cache
global identity_cache
identity_temp_cache = {
identity_cache = {
'users': {u.id: u for u in users},
'new_users': [],
'projects': {p.id: p for p in projects},
@ -169,23 +169,23 @@ class FakeManager(object):
def find_user(self, name, domain):
domain = self._domain_from_id(domain)
global identity_temp_cache
for user in identity_temp_cache['users'].values():
global identity_cache
for user in identity_cache['users'].values():
if (user.name.lower() == name.lower() and
user.domain_id == domain.id):
return user
return None
def get_user(self, user_id):
global identity_temp_cache
return identity_temp_cache['users'].get(user_id, None)
global identity_cache
return identity_cache['users'].get(user_id, None)
def list_users(self, project):
project = self._project_from_id(project)
global identity_temp_cache
global identity_cache
users = {}
for assignment in identity_temp_cache['role_assignments']:
for assignment in identity_cache['role_assignments']:
if assignment.scope['project']['id'] == project.id:
user = users.get(assignment.user['id'])
@ -206,12 +206,12 @@ class FakeManager(object):
def list_inherited_users(self, project):
project = self._project_from_id(project)
global identity_temp_cache
global identity_cache
users = {}
while project.parent_id:
project = self._project_from_id(project.parent_id)
for assignment in identity_temp_cache['role_assignments']:
for assignment in identity_cache['role_assignments']:
if assignment.scope['project']['id'] == project.id:
if not assignment.scope.get('OS-INHERIT:inherited_to'):
continue
@ -233,12 +233,12 @@ class FakeManager(object):
domain='default', default_project=None):
domain = self._domain_from_id(domain)
default_project = self._project_from_id(default_project)
global identity_temp_cache
global identity_cache
user = FakeUser(
name=name, password=password, email=email,
domain_id=domain.id, default_project=default_project)
identity_temp_cache['users'][user.id] = user
identity_temp_cache['new_users'].append(user)
identity_cache['users'][user.id] = user
identity_cache['new_users'].append(user)
return user
def update_user_password(self, user, password):
@ -262,8 +262,8 @@ class FakeManager(object):
user.enabled = False
def find_role(self, name):
global identity_temp_cache
for role in identity_temp_cache['roles'].values():
global identity_cache
for role in identity_cache['roles'].values():
if role.name == name:
return role
return None
@ -271,11 +271,11 @@ class FakeManager(object):
def get_roles(self, user, project, inherited=False):
user = self._user_from_id(user)
project = self._project_from_id(project)
global identity_temp_cache
global identity_cache
roles = []
for assignment in identity_temp_cache['role_assignments']:
for assignment in identity_cache['role_assignments']:
if (assignment.user['id'] == user.id and
assignment.scope['project']['id'] == project.id):
@ -295,9 +295,9 @@ class FakeManager(object):
def get_all_roles(self, user):
user = self._user_from_id(user)
global identity_temp_cache
global identity_cache
projects = {}
for assignment in identity_temp_cache['role_assignments']:
for assignment in identity_cache['role_assignments']:
if assignment.user['id'] == user.id:
r = self.find_role(assignment.role['name'])
try:
@ -326,11 +326,11 @@ class FakeManager(object):
role_assignment = self._make_role_assignment(user, role, project)
global identity_temp_cache
global identity_cache
if role_assignment not in identity_temp_cache['role_assignments']:
identity_temp_cache['role_assignments'].append(role_assignment)
identity_temp_cache['new_role_assignments'].append(role_assignment)
if role_assignment not in identity_cache['role_assignments']:
identity_cache['role_assignments'].append(role_assignment)
identity_cache['new_role_assignments'].append(role_assignment)
def remove_user_role(self, user, role, project, inherited=False):
user = self._user_from_id(user)
@ -339,15 +339,15 @@ class FakeManager(object):
role_assignment = self._make_role_assignment(user, role, project)
global identity_temp_cache
global identity_cache
if role_assignment in identity_temp_cache['role_assignments']:
identity_temp_cache['role_assignments'].remove(role_assignment)
if role_assignment in identity_cache['role_assignments']:
identity_cache['role_assignments'].remove(role_assignment)
def find_project(self, project_name, domain):
domain = self._domain_from_id(domain)
global identity_temp_cache
for project in identity_temp_cache['projects'].values():
global identity_cache
for project in identity_cache['projects'].values():
if (project.name.lower() == project_name.lower() and
project.domain_id == domain.id):
return project
@ -355,14 +355,14 @@ class FakeManager(object):
def get_project(self, project_id, subtree_as_ids=False,
parents_as_ids=False):
global identity_temp_cache
return identity_temp_cache['projects'].get(project_id, None)
global identity_cache
return identity_cache['projects'].get(project_id, None)
def create_project(self, project_name, created_on, parent=None,
domain='default', description=""):
parent = self._project_from_id(parent)
domain = self._domain_from_id(domain)
global identity_temp_cache
global identity_cache
project = FakeProject(
name=project_name, created_on=created_on, description=description,
@ -370,8 +370,8 @@ class FakeManager(object):
)
if parent:
project.parent_id = parent.id
identity_temp_cache['projects'][project.id] = project
identity_temp_cache['new_projects'].append(project)
identity_cache['projects'][project.id] = project
identity_cache['new_projects'].append(project)
return project
def update_project(self, project, **kwargs):
@ -382,23 +382,23 @@ class FakeManager(object):
return project
def find_domain(self, domain_name):
global identity_temp_cache
for domain in identity_temp_cache['domains'].values():
global identity_cache
for domain in identity_cache['domains'].values():
if domain.name.lower() == domain_name.lower():
return domain
return None
def get_domain(self, domain_id):
global identity_temp_cache
return identity_temp_cache['domains'].get(domain_id, None)
global identity_cache
return identity_cache['domains'].get(domain_id, None)
def get_region(self, region_id):
global identity_temp_cache
return identity_temp_cache['regions'].get(region_id, None)
global identity_cache
return identity_cache['regions'].get(region_id, None)
def list_regions(self):
global identity_temp_cache
return identity_temp_cache['regions'].values()
global identity_cache
return identity_cache['regions'].values()
class FakeOpenstackClient(object):

4
adjutant/common/tests/utils.py
View File

@ -202,7 +202,7 @@ class AdjutantTestCase(TestCase, TestCaseMixin):
super(AdjutantTestCase, cls).tearDownClass()
def tearDown(self):
fake_clients.identity_temp_cache.clear()
fake_clients.identity_cache.clear()
fake_clients.neutron_cache.clear()
fake_clients.nova_cache.clear()
fake_clients.cinder_cache.clear()
@ -224,7 +224,7 @@ class AdjutantAPITestCase(APITestCase, TestCaseMixin):
super(AdjutantAPITestCase, cls).tearDownClass()
def tearDown(self):
fake_clients.identity_temp_cache.clear()
fake_clients.identity_cache.clear()
fake_clients.neutron_cache.clear()
fake_clients.nova_cache.clear()
fake_clients.cinder_cache.clear()