From 7e0d2e67296c52f21e109eee1acfaf6e042518c1 Mon Sep 17 00:00:00 2001 From: Akita Noek Date: Tue, 15 Mar 2016 17:00:20 -0400 Subject: [PATCH] more .users -> member_role.members --- awx/main/tests/job_base.py | 50 +++++++++++++++++----------------- awx/main/tests/old/projects.py | 2 +- awx/sso/backends.py | 6 ++-- awx/sso/pipeline.py | 6 ++-- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/awx/main/tests/job_base.py b/awx/main/tests/job_base.py index 54c3462fbc..f48380f60b 100644 --- a/awx/main/tests/job_base.py +++ b/awx/main/tests/job_base.py @@ -66,68 +66,68 @@ class BaseJobTestMixin(BaseTestMixin): # Alex is Sue's IT assistant who can also administer all of the # organizations. self.user_alex = self.make_user('alex') - self.org_eng.admins.add(self.user_alex) - self.org_sup.admins.add(self.user_alex) - self.org_ops.admins.add(self.user_alex) + self.org_eng.admin_role.members.add(self.user_alex) + self.org_sup.admin_role.members.add(self.user_alex) + self.org_ops.admin_role.members.add(self.user_alex) # Bob is the head of engineering. He's an admin for engineering, but # also a user within the operations organization (so he can see the # results if things go wrong in production). self.user_bob = self.make_user('bob') - self.org_eng.admins.add(self.user_bob) - self.org_ops.users.add(self.user_bob) + self.org_eng.admin_role.members.add(self.user_bob) + self.org_ops.member_role.members.add(self.user_bob) # Chuck is the lead engineer. He has full reign over engineering, but # no other organizations. self.user_chuck = self.make_user('chuck') - self.org_eng.admins.add(self.user_chuck) + self.org_eng.admin_role.members.add(self.user_chuck) # Doug is the other engineer working under Chuck. He can write # playbooks and check them, but Chuck doesn't quite think he's ready to # run them yet. Poor Doug. self.user_doug = self.make_user('doug') - self.org_eng.users.add(self.user_doug) + self.org_eng.member_role.members.add(self.user_doug) # Juan is another engineer working under Chuck. He has a little more freedom # to run playbooks but can't create job templates self.user_juan = self.make_user('juan') - self.org_eng.users.add(self.user_juan) + self.org_eng.member_role.members.add(self.user_juan) # Hannibal is Chuck's right-hand man. Chuck usually has him create the job # templates that the rest of the team will use self.user_hannibal = self.make_user('hannibal') - self.org_eng.users.add(self.user_hannibal) + self.org_eng.member_role.members.add(self.user_hannibal) # Eve is the head of support. She can also see what goes on in # operations to help them troubleshoot problems. self.user_eve = self.make_user('eve') - self.org_sup.admins.add(self.user_eve) - self.org_ops.users.add(self.user_eve) + self.org_sup.admin_role.members.add(self.user_eve) + self.org_ops.member_role.members.add(self.user_eve) # Frank is the other support guy. self.user_frank = self.make_user('frank') - self.org_sup.users.add(self.user_frank) + self.org_sup.member_role.members.add(self.user_frank) # Greg is the head of operations. self.user_greg = self.make_user('greg') - self.org_ops.admins.add(self.user_greg) + self.org_ops.admin_role.members.add(self.user_greg) # Holly is an operations engineer. self.user_holly = self.make_user('holly') - self.org_ops.users.add(self.user_holly) + self.org_ops.member_role.members.add(self.user_holly) # Iris is another operations engineer. self.user_iris = self.make_user('iris') - self.org_ops.users.add(self.user_iris) + self.org_ops.member_role.members.add(self.user_iris) # Randall and Billybob are new ops interns that ops uses to test # their playbooks and inventory self.user_randall = self.make_user('randall') - self.org_ops.users.add(self.user_randall) + self.org_ops.member_role.members.add(self.user_randall) # He works with Randall self.user_billybob = self.make_user('billybob') - self.org_ops.users.add(self.user_billybob) + self.org_ops.member_role.members.add(self.user_billybob) # Jim is the newest intern. He can login, but can't do anything quite yet # except make everyone else fresh coffee. @@ -218,15 +218,15 @@ class BaseJobTestMixin(BaseTestMixin): created_by=self.user_sue) self.team_ops_east.projects.add(self.proj_prod) self.team_ops_east.projects.add(self.proj_prod_east) - self.team_ops_east.users.add(self.user_greg) - self.team_ops_east.users.add(self.user_holly) + self.team_ops_east.member_role.members.add(self.user_greg) + self.team_ops_east.member_role.members.add(self.user_holly) self.team_ops_west = self.org_ops.teams.create( name='westerners', created_by=self.user_sue) self.team_ops_west.projects.add(self.proj_prod) self.team_ops_west.projects.add(self.proj_prod_west) - self.team_ops_west.users.add(self.user_greg) - self.team_ops_west.users.add(self.user_iris) + self.team_ops_west.member_role.members.add(self.user_greg) + self.team_ops_west.member_role.members.add(self.user_iris) # The south team is no longer active having been folded into the east team # FIXME: This code can be removed (probably) @@ -240,7 +240,7 @@ class BaseJobTestMixin(BaseTestMixin): # active=False, #) #self.team_ops_south.projects.add(self.proj_prod) - #self.team_ops_south.users.add(self.user_greg) + #self.team_ops_south.member_role.members.add(self.user_greg) # The north team is going to be deleted self.team_ops_north = self.org_ops.teams.create( @@ -248,7 +248,7 @@ class BaseJobTestMixin(BaseTestMixin): created_by=self.user_sue, ) self.team_ops_north.projects.add(self.proj_prod) - self.team_ops_north.users.add(self.user_greg) + self.team_ops_north.member_role.members.add(self.user_greg) # The testers team are interns that can only check playbooks but can't # run them @@ -257,8 +257,8 @@ class BaseJobTestMixin(BaseTestMixin): created_by=self.user_sue, ) self.team_ops_testers.projects.add(self.proj_prod) - self.team_ops_testers.users.add(self.user_randall) - self.team_ops_testers.users.add(self.user_billybob) + self.team_ops_testers.member_role.members.add(self.user_randall) + self.team_ops_testers.member_role.members.add(self.user_billybob) # Each user has his/her own set of credentials. from awx.main.tests.data.ssh import (TEST_SSH_KEY_DATA, diff --git a/awx/main/tests/old/projects.py b/awx/main/tests/old/projects.py index 2c715e312a..04de530dad 100644 --- a/awx/main/tests/old/projects.py +++ b/awx/main/tests/old/projects.py @@ -446,7 +446,7 @@ class ProjectsTest(BaseTransactionTest): self.post(team_users, data=dict(username='attempted_superuser_create', password='thepassword', is_superuser=True), expect=201, auth=self.get_super_credentials()) - self.assertEqual(Team.objects.get(pk=team.pk).users.count(), 5) + self.assertEqual(Team.objects.get(pk=team.pk).member_role.members.count(), 5) # can remove users from teams for x in all_users['results']: diff --git a/awx/sso/backends.py b/awx/sso/backends.py index b2c11be2d6..9e227624ec 100644 --- a/awx/sso/backends.py +++ b/awx/sso/backends.py @@ -210,11 +210,11 @@ def on_populate_user(sender, **kwargs): remove = bool(org_opts.get('remove', False)) admins_opts = org_opts.get('admins', None) remove_admins = bool(org_opts.get('remove_admins', remove)) - _update_m2m_from_groups(user, ldap_user, org.admins, admins_opts, + _update_m2m_from_groups(user, ldap_user, org.admin_role.members, admins_opts, remove_admins) users_opts = org_opts.get('users', None) remove_users = bool(org_opts.get('remove_users', remove)) - _update_m2m_from_groups(user, ldap_user, org.users, users_opts, + _update_m2m_from_groups(user, ldap_user, org.member_role.members, users_opts, remove_users) # Update team membership based on group memberships. @@ -226,7 +226,7 @@ def on_populate_user(sender, **kwargs): team, created = Team.objects.get_or_create(name=team_name, organization=org) users_opts = team_opts.get('users', None) remove = bool(team_opts.get('remove', False)) - _update_m2m_from_groups(user, ldap_user, team.users, users_opts, + _update_m2m_from_groups(user, ldap_user, team.member_role.users, users_opts, remove) # Update user profile to store LDAP DN. diff --git a/awx/sso/pipeline.py b/awx/sso/pipeline.py index f3e8987d17..a79aecacb0 100644 --- a/awx/sso/pipeline.py +++ b/awx/sso/pipeline.py @@ -98,12 +98,12 @@ def update_user_orgs(backend, details, user=None, *args, **kwargs): remove = bool(org_opts.get('remove', False)) admins_expr = org_opts.get('admins', None) remove_admins = bool(org_opts.get('remove_admins', remove)) - _update_m2m_from_expression(user, org.admins, admins_expr, remove_admins) + _update_m2m_from_expression(user, org.admin_role.members, admins_expr, remove_admins) # Update org users from expression(s). users_expr = org_opts.get('users', None) remove_users = bool(org_opts.get('remove_users', remove)) - _update_m2m_from_expression(user, org.users, users_expr, remove_users) + _update_m2m_from_expression(user, org.member_role.members, users_expr, remove_users) def update_user_teams(backend, details, user=None, *args, **kwargs): @@ -134,4 +134,4 @@ def update_user_teams(backend, details, user=None, *args, **kwargs): team = Team.objects.get_or_create(name=team_name, organization=org)[0] users_expr = team_opts.get('users', None) remove = bool(team_opts.get('remove', False)) - _update_m2m_from_expression(user, team.users, users_expr, remove) + _update_m2m_from_expression(user, team.member_role.members, users_expr, remove)