From 19e865e9a5e26e3917deae036bf481d8806af3c1 Mon Sep 17 00:00:00 2001 From: chris meyers Date: Fri, 6 Jul 2018 15:34:26 -0400 Subject: [PATCH] prevent remove iso instance from iso instance groups --- awx/api/views.py | 10 +++++++++- awx/main/tests/functional/api/test_instance_group.py | 11 ++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/awx/api/views.py b/awx/api/views.py index f031eb8611..9222b4dd57 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -194,9 +194,17 @@ class InstanceGroupMembershipMixin(object): return {'error': _('Isolated instances may not be added or removed from instances groups via the API.')} return None + def unattach_validate(self, request): + (sub_id, res) = super(InstanceGroupMembershipMixin, self).unattach_validate(request) + if res: + return res + sub = get_object_or_400(self.model, pk=sub_id) + attach_errors = self.is_valid_relation(None, sub) + if attach_errors: + return (sub_id, Response(attach_errors, status=status.HTTP_400_BAD_REQUEST)) + def unattach(self, request, *args, **kwargs): response = super(InstanceGroupMembershipMixin, self).unattach(request, *args, **kwargs) - sub_id, res = self.unattach_validate(request) if status.is_success(response.status_code): if self.parent_model is Instance: ig_obj = get_object_or_400(self.model, pk=sub_id) diff --git a/awx/main/tests/functional/api/test_instance_group.py b/awx/main/tests/functional/api/test_instance_group.py index 4d91a888e9..50c033b69b 100644 --- a/awx/main/tests/functional/api/test_instance_group.py +++ b/awx/main/tests/functional/api/test_instance_group.py @@ -125,10 +125,19 @@ def test_prevent_delete_iso_and_control_groups(delete, isolated_instance_group, @pytest.mark.django_db -def test_prevent_isolated_instance_in_non_isolated_instance_group(post, admin, instance, instance_group, isolated_instance_group): +def test_prevent_isolated_instance_added_to_non_isolated_instance_group(post, admin, instance, instance_group, isolated_instance_group): url = reverse("api:instance_group_instance_list", kwargs={'pk': instance_group.pk}) assert True is instance.is_isolated() resp = post(url, {'associate': True, 'id': instance.id}, admin, expect=400) assert u"Isolated instances may not be added or removed from instances groups via the API." == resp.data['error'] + +@pytest.mark.django_db +def test_prevent_isolated_instance_removal_from_isolated_instance_group(post, admin, instance, instance_group, isolated_instance_group): + url = reverse("api:instance_group_instance_list", kwargs={'pk': isolated_instance_group.pk}) + + assert True is instance.is_isolated() + resp = post(url, {'disassociate': True, 'id': instance.id}, admin, expect=400) + assert u"Isolated instances may not be added or removed from instances groups via the API." == resp.data['error'] +