diff --git a/awx/api/permissions.py b/awx/api/permissions.py index 9315e42c79..a6549082f2 100644 --- a/awx/api/permissions.py +++ b/awx/api/permissions.py @@ -117,7 +117,7 @@ class ModelAccessPermission(permissions.BasePermission): check_method = getattr(self, 'check_%s_permissions' % request.method.lower(), None) result = check_method and check_method(request, view, obj) if not result: - print('Yarr permission denied: %s %s' % (repr(obj), request.method)) # TODO: XXX: This shouldn't have been committed but anoek is sloppy, remove me after we're done fixing bugs + print('Yarr permission denied: %s %s %s' % (request.method, repr(view), repr(obj),)) # TODO: XXX: This shouldn't have been committed but anoek is sloppy, remove me after we're done fixing bugs raise PermissionDenied() return result diff --git a/awx/main/tests/old/licenses.py b/awx/main/tests/old/licenses.py index a236ee458f..136c3ce8a5 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.deprecated_admins.add(self.normal_django_user) + org.admin_role.members.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 c5b1569513..bee2d3182c 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.deprecated_admins.add(self.super_django_user) - x.deprecated_users.add(self.super_django_user) - x.deprecated_users.add(self.other_django_user) + x.admin_role.members.add(self.super_django_user) + x.member_role.members.add(self.super_django_user) + x.member_role.members.add(self.other_django_user) - self.organizations[0].deprecated_users.add(self.normal_django_user) - self.organizations[1].deprecated_admins.add(self.normal_django_user) + self.organizations[0].member_role.members.add(self.normal_django_user) + self.organizations[1].admin_role.members.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 04de530dad..254dd5216d 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.deprecated_users.add(self.super_django_user) + x.member_role.members.add(self.super_django_user) - self.organizations[0].deprecated_users.add(self.normal_django_user) - self.organizations[1].deprecated_admins.add(self.normal_django_user) + self.organizations[0].member_role.members.add(self.normal_django_user) + self.organizations[1].admin_role.members.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.deprecated_users.add(self.normal_django_user) - self.team2.deprecated_users.add(self.other_django_user) + self.team1.member_role.members.add(self.normal_django_user) + self.team2.member_role.members.add(self.other_django_user) def test_playbooks(self): def write_test_file(project, name, content): @@ -312,7 +312,7 @@ 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].deprecated_admins.add(self.other_django_user) + self.organizations[0].admin_role.members.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()) @@ -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.deprecated_users.add(User.objects.get(username='other')) + self.team1.member_role.members.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()) @@ -422,7 +422,7 @@ class ProjectsTest(BaseTransactionTest): team = Team.objects.filter( organization__pk=self.organizations[1].pk)[0] team_users = reverse('api:team_users_list', args=(team.pk,)) for x in team.deprecated_users.all(): - team.deprecated_users.remove(x) + team.member_role.members.remove(x) team.save() # can list uses on 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.deprecated_users.remove(self.other_django_user) + team.member_role.members.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.deprecated_admins.add(self.normal_django_user) + org.admin_role.members.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/users.py b/awx/main/tests/old/users.py index 75377037da..1068354349 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].deprecated_admins.add(self.normal_django_user) + self.organizations[0].admin_role.members.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].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) + self.organizations[0].admin_role.members.add(self.normal_django_user) + self.organizations[0].member_role.members.add(self.other_django_user) + self.organizations[0].member_role.members.add(self.normal_django_user) + self.organizations[1].member_role.members.add(self.other_django_user) def test_user_creation_fails_without_password(self): url = reverse('api:user_list')