diff --git a/awx/main/tests/old/inventory.py b/awx/main/tests/old/inventory.py index 5c48f30bb6..a3f3b63794 100644 --- a/awx/main/tests/old/inventory.py +++ b/awx/main/tests/old/inventory.py @@ -47,9 +47,9 @@ class InventoryTest(BaseTest): self.setup_instances() self.setup_users() self.organizations = self.make_organizations(self.super_django_user, 3) - self.organizations[0].admins.add(self.normal_django_user) - self.organizations[0].users.add(self.other_django_user) - self.organizations[0].users.add(self.normal_django_user) + self.organizations[0].deprecated_admins.add(self.normal_django_user) + self.organizations[0].deprecated_users.add(self.other_django_user) + self.organizations[0].deprecated_users.add(self.normal_django_user) self.inventory_a = Inventory.objects.create(name='inventory-a', description='foo', organization=self.organizations[0]) self.inventory_b = Inventory.objects.create(name='inventory-b', description='bar', organization=self.organizations[1]) @@ -78,7 +78,7 @@ class InventoryTest(BaseTest): self.check_get_list(url, self.super_django_user, qs) # an org admin can list inventories but is filtered to what he adminsters - normal_qs = qs.filter(organization__admins__in=[self.normal_django_user]) + normal_qs = qs.filter(organization__deprecated_admins__in=[self.normal_django_user]) self.check_get_list(url, self.normal_django_user, normal_qs) # a user who is on a team who has a read permissions on an inventory can see filtered inventories @@ -269,9 +269,9 @@ class InventoryTest(BaseTest): def test_inventory_access_deleted_permissions(self): temp_org = self.make_organizations(self.super_django_user, 1)[0] - temp_org.admins.add(self.normal_django_user) - temp_org.users.add(self.other_django_user) - temp_org.users.add(self.normal_django_user) + temp_org.deprecated_admins.add(self.normal_django_user) + temp_org.deprecated_users.add(self.other_django_user) + temp_org.deprecated_users.add(self.normal_django_user) temp_inv = temp_org.inventories.create(name='Delete Org Inventory') temp_inv.groups.create(name='Delete Org Inventory Group') @@ -1195,9 +1195,9 @@ class InventoryUpdatesTest(BaseTransactionTest): self.setup_instances() self.setup_users() self.organization = self.make_organizations(self.super_django_user, 1)[0] - self.organization.admins.add(self.normal_django_user) - self.organization.users.add(self.other_django_user) - self.organization.users.add(self.normal_django_user) + self.organization.deprecated_admins.add(self.normal_django_user) + self.organization.deprecated_users.add(self.other_django_user) + self.organization.deprecated_users.add(self.normal_django_user) self.inventory = self.organization.inventories.create(name='Cloud Inventory') self.group = self.inventory.groups.create(name='Cloud Group') self.inventory2 = self.organization.inventories.create(name='Cloud Inventory 2') diff --git a/awx/main/tests/old/licenses.py b/awx/main/tests/old/licenses.py index d6cde2a0a4..a236ee458f 100644 --- a/awx/main/tests/old/licenses.py +++ b/awx/main/tests/old/licenses.py @@ -19,7 +19,7 @@ class LicenseTests(BaseTest): self.setup_users() u = self.super_django_user org = Organization.objects.create(name='o1', created_by=u) - org.admins.add(self.normal_django_user) + org.deprecated_admins.add(self.normal_django_user) self.inventory = Inventory.objects.create(name='hi', organization=org, created_by=u) Host.objects.create(name='a1', inventory=self.inventory, created_by=u) Host.objects.create(name='a2', inventory=self.inventory, created_by=u) diff --git a/awx/main/tests/old/organizations.py b/awx/main/tests/old/organizations.py index b3d84a5da4..ef3b3ac77f 100644 --- a/awx/main/tests/old/organizations.py +++ b/awx/main/tests/old/organizations.py @@ -88,12 +88,12 @@ class OrganizationsTest(BaseTest): # nobody_user is a user not a member of any organizations for x in self.organizations: - x.admins.add(self.super_django_user) - x.users.add(self.super_django_user) - x.users.add(self.other_django_user) + x.deprecated_admins.add(self.super_django_user) + x.deprecated_users.add(self.super_django_user) + x.deprecated_users.add(self.other_django_user) - self.organizations[0].users.add(self.normal_django_user) - self.organizations[1].admins.add(self.normal_django_user) + self.organizations[0].deprecated_users.add(self.normal_django_user) + self.organizations[1].deprecated_admins.add(self.normal_django_user) def test_get_organization_list(self): url = reverse('api:organization_list') diff --git a/awx/main/tests/old/projects.py b/awx/main/tests/old/projects.py index 427f3da55f..9834356860 100644 --- a/awx/main/tests/old/projects.py +++ b/awx/main/tests/old/projects.py @@ -75,10 +75,10 @@ class ProjectsTest(BaseTransactionTest): for x in self.organizations: # NOTE: superuser does not have to be explicitly added to admin group # x.admins.add(self.super_django_user) - x.users.add(self.super_django_user) + x.deprecated_users.add(self.super_django_user) - self.organizations[0].users.add(self.normal_django_user) - self.organizations[1].admins.add(self.normal_django_user) + self.organizations[0].deprecated_users.add(self.normal_django_user) + self.organizations[1].deprecated_admins.add(self.normal_django_user) self.team1 = Team.objects.create( name = 'team1', organization = self.organizations[0] @@ -97,8 +97,8 @@ class ProjectsTest(BaseTransactionTest): self.team2.projects.add(self.projects[5]) self.team1.save() self.team2.save() - self.team1.users.add(self.normal_django_user) - self.team2.users.add(self.other_django_user) + self.team1.deprecated_users.add(self.normal_django_user) + self.team2.deprecated_users.add(self.other_django_user) def test_playbooks(self): def write_test_file(project, name, content): @@ -312,11 +312,11 @@ class ProjectsTest(BaseTransactionTest): # Verify that creatorship doesn't imply access if access is removed a_new_proj = self.make_project(created_by=self.other_django_user, playbook_content=TEST_PLAYBOOK) - self.organizations[0].admins.add(self.other_django_user) + self.organizations[0].deprecated_admins.add(self.other_django_user) self.organizations[0].projects.add(a_new_proj) proj_detail = reverse('api:project_detail', args=(a_new_proj.pk,)) self.patch(proj_detail, data=dict(description="test"), expect=200, auth=self.get_other_credentials()) - self.organizations[0].admins.remove(self.other_django_user) + self.organizations[0].deprecated_admins.remove(self.other_django_user) self.patch(proj_detail, data=dict(description="test_now"), expect=403, auth=self.get_other_credentials()) self.delete(proj_detail, expect=403, auth=self.get_other_credentials()) a_new_proj.delete() @@ -337,7 +337,7 @@ class ProjectsTest(BaseTransactionTest): self.assertEquals(got['url'], reverse('api:team_detail', args=(self.team1.pk,))) got = self.get(team1, expect=200, auth=self.get_normal_credentials()) got = self.get(team1, expect=403, auth=self.get_other_credentials()) - self.team1.users.add(User.objects.get(username='other')) + self.team1.deprecated_users.add(User.objects.get(username='other')) self.team1.save() got = self.get(team1, expect=200, auth=self.get_other_credentials()) got = self.get(team1, expect=403, auth=self.get_nobody_credentials()) @@ -421,8 +421,8 @@ class ProjectsTest(BaseTransactionTest): team = Team.objects.filter(active=True, organization__pk=self.organizations[1].pk)[0] team_users = reverse('api:team_users_list', args=(team.pk,)) - for x in team.users.all(): - team.users.remove(x) + for x in team.deprecated_users.all(): + team.deprecated_users.remove(x) team.save() # can list uses on teams @@ -454,7 +454,7 @@ class ProjectsTest(BaseTransactionTest): self.post(team_users, data=y, expect=403, auth=self.get_nobody_credentials()) self.post(team_users, data=y, expect=204, auth=self.get_normal_credentials()) - self.assertEquals(Team.objects.get(pk=team.pk).users.count(), 1) # Leaving just the super user we created + self.assertEquals(Team.objects.get(pk=team.pk).deprecated_users.count(), 1) # Leaving just the super user we created # ===================================================================== # USER TEAMS @@ -787,7 +787,7 @@ class ProjectsTest(BaseTransactionTest): # User is still a team member self.get(reverse('api:project_detail', args=(project.pk,)), expect=200, auth=self.get_other_credentials()) - team.users.remove(self.other_django_user) + team.deprecated_users.remove(self.other_django_user) # User is no longer a team member and has no permissions self.get(reverse('api:project_detail', args=(project.pk,)), expect=403, auth=self.get_other_credentials()) @@ -1351,7 +1351,7 @@ class ProjectUpdatesTest(BaseTransactionTest): 'scm_url': scm_url, } org = self.make_organizations(self.super_django_user, 1)[0] - org.admins.add(self.normal_django_user) + org.deprecated_admins.add(self.normal_django_user) with self.current_user(self.super_django_user): del_proj = self.post(projects_url, project_data, expect=201) del_proj = Project.objects.get(pk=del_proj["id"]) diff --git a/awx/main/tests/old/schedules.py b/awx/main/tests/old/schedules.py index 4a4a0bcee3..fa95892eb8 100644 --- a/awx/main/tests/old/schedules.py +++ b/awx/main/tests/old/schedules.py @@ -54,12 +54,12 @@ class ScheduleTest(BaseTest): self.setup_instances() self.setup_users() self.organizations = self.make_organizations(self.super_django_user, 2) - self.organizations[0].admins.add(self.normal_django_user) - self.organizations[0].users.add(self.other_django_user) - self.organizations[0].users.add(self.normal_django_user) + self.organizations[0].deprecated_admins.add(self.normal_django_user) + self.organizations[0].deprecated_users.add(self.other_django_user) + self.organizations[0].deprecated_users.add(self.normal_django_user) self.diff_org_user = self.make_user('fred') - self.organizations[1].users.add(self.diff_org_user) + self.organizations[1].deprecated_users.add(self.diff_org_user) self.cloud_source = Credential.objects.create(kind='awx', user=self.super_django_user, username='Dummy', password='Dummy') diff --git a/awx/main/tests/old/users.py b/awx/main/tests/old/users.py index 42285ff588..2fa89402f9 100644 --- a/awx/main/tests/old/users.py +++ b/awx/main/tests/old/users.py @@ -100,7 +100,7 @@ class AuthTokenProxyTest(BaseTest): self.setup_users() self.setup_instances() self.organizations = self.make_organizations(self.super_django_user, 2) - self.organizations[0].admins.add(self.normal_django_user) + self.organizations[0].deprecated_admins.add(self.normal_django_user) self.assertIn('REMOTE_ADDR', settings.REMOTE_HOST_HEADERS) self.assertIn('REMOTE_HOST', settings.REMOTE_HOST_HEADERS) @@ -174,10 +174,10 @@ class UsersTest(BaseTest): super(UsersTest, self).setUp() self.setup_users() self.organizations = self.make_organizations(self.super_django_user, 2) - self.organizations[0].admins.add(self.normal_django_user) - self.organizations[0].users.add(self.other_django_user) - self.organizations[0].users.add(self.normal_django_user) - self.organizations[1].users.add(self.other_django_user) + self.organizations[0].deprecated_admins.add(self.normal_django_user) + self.organizations[0].deprecated_users.add(self.other_django_user) + self.organizations[0].deprecated_users.add(self.normal_django_user) + self.organizations[1].deprecated_users.add(self.other_django_user) def test_user_creation_fails_without_password(self): url = reverse('api:user_list') @@ -790,8 +790,8 @@ class UsersTest(BaseTest): self.check_get_list(url, self.super_django_user, qs) # Filter by related organizations admins username. - url = '%s?organizations__admins__username__startswith=norm' % base_url - qs = base_qs.filter(organizations__admins__username__startswith='norm') + url = '%s?organizations__deprecated_admins__username__startswith=norm' % base_url + qs = base_qs.filter(organizations__deprecated_admins__username__startswith='norm') self.assertTrue(qs.count()) self.check_get_list(url, self.super_django_user, qs) @@ -839,11 +839,11 @@ class UsersTest(BaseTest): self.check_get_list(url, self.super_django_user, base_qs, expect=400) # Filter by invalid field across lookups. - url = '%s?organizations__users__teams__laser=green' % base_url + url = '%s?organizations__deprecated_users__teams__laser=green' % base_url self.check_get_list(url, self.super_django_user, base_qs, expect=400) # Filter by invalid relation within lookups. - url = '%s?organizations__users__llamas__name=freddie' % base_url + url = '%s?organizations__deprecated_users__llamas__name=freddie' % base_url self.check_get_list(url, self.super_django_user, base_qs, expect=400) # Filter by invalid query string field names. @@ -1020,13 +1020,13 @@ class LdapTest(BaseTest): for org_name, org_result in settings.AUTH_LDAP_ORGANIZATION_MAP_RESULT.items(): org = Organization.objects.get(name=org_name) if org_result.get('admins', False): - self.assertTrue(user in org.admins.all()) + self.assertTrue(user in org.deprecated_admins.all()) else: - self.assertFalse(user in org.admins.all()) + self.assertFalse(user in org.deprecated_admins.all()) if org_result.get('users', False): - self.assertTrue(user in org.users.all()) + self.assertTrue(user in org.deprecated_users.all()) else: - self.assertFalse(user in org.users.all()) + self.assertFalse(user in org.deprecated_users.all()) # Try again with different test mapping. self.use_test_setting('ORGANIZATION_MAP', {}, from_name='ORGANIZATION_MAP_2') @@ -1038,13 +1038,13 @@ class LdapTest(BaseTest): for org_name, org_result in settings.AUTH_LDAP_ORGANIZATION_MAP_RESULT.items(): org = Organization.objects.get(name=org_name) if org_result.get('admins', False): - self.assertTrue(user in org.admins.all()) + self.assertTrue(user in org.deprecated_admins.all()) else: - self.assertFalse(user in org.admins.all()) + self.assertFalse(user in org.deprecated_admins.all()) if org_result.get('users', False): - self.assertTrue(user in org.users.all()) + self.assertTrue(user in org.deprecated_users.all()) else: - self.assertFalse(user in org.users.all()) + self.assertFalse(user in org.deprecated_users.all()) def test_ldap_team_mapping(self): for name in ('USER_SEARCH', 'ALWAYS_UPDATE_USER', 'USER_ATTR_MAP', @@ -1062,9 +1062,9 @@ class LdapTest(BaseTest): for team_name, team_result in settings.AUTH_LDAP_TEAM_MAP_RESULT.items(): team = Team.objects.get(name=team_name) if team_result.get('users', False): - self.assertTrue(user in team.users.all()) + self.assertTrue(user in team.deprecated_users.all()) else: - self.assertFalse(user in team.users.all()) + self.assertFalse(user in team.deprecated_users.all()) # Try again with different test mapping. self.use_test_setting('TEAM_MAP', {}, from_name='TEAM_MAP_2') self.use_test_setting('TEAM_MAP_RESULT', {}, @@ -1075,9 +1075,9 @@ class LdapTest(BaseTest): for team_name, team_result in settings.AUTH_LDAP_TEAM_MAP_RESULT.items(): team = Team.objects.get(name=team_name) if team_result.get('users', False): - self.assertTrue(user in team.users.all()) + self.assertTrue(user in team.deprecated_users.all()) else: - self.assertFalse(user in team.users.all()) + self.assertFalse(user in team.deprecated_users.all()) def test_prevent_changing_ldap_user_fields(self): for name in ('USER_SEARCH', 'ALWAYS_UPDATE_USER', 'USER_ATTR_MAP',