refactored to use is_valid_relation instead of post

awx/api/views/inventory.py

@@ -14,6 +14,7 @@ from django.utils.translation import gettext_lazy as _
 from rest_framework.exceptions import PermissionDenied
 from rest_framework.response import Response
 from rest_framework import status
+from rest_framework import serializers
 
 # AWX
 from awx.main.models import ActivityStream, Inventory, JobTemplate, Role, User, InstanceGroup, InventoryUpdateEvent, InventoryUpdate
@@ -115,14 +116,9 @@ class InventoryInputInventoriesList(SubListAttachDetachAPIView):
     parent_model = Inventory
     relationship = 'input_inventories'
 
-    # Specifically overriding the post method on this view to disallow constructed inventories as input inventories
+    def is_valid_relation(self, parent, sub, created=False):
-    def post(self, request, *args, **kwargs):
+        if sub.kind == 'constructed':
-        obj = Inventory.objects.get(id=request.data.get('id'))
+            raise serializers.ValidationError({'error': 'You cannot add a constructed inventory to another constructed inventory.'})
-        if obj.kind == 'constructed':
-            return Response(
-                dict(error=_('You cannot add a constructed inventory to another constructed inventory.')), status=status.HTTP_405_METHOD_NOT_ALLOWED
-            )
-        return super(InventoryInputInventoriesList, self).post(request, *args, **kwargs)
 
 
 class InventoryActivityStreamList(SubListAPIView):

awx/main/tests/functional/conftest.py

@@ -511,6 +511,14 @@ def group(inventory):
     return inventory.groups.create(name='single-group')
 
 
+@pytest.fixture
+def constructed_inventory(organization):
+    """
+    creates a new constructed inventory source
+    """
+    return Inventory.objects.create(name='dummy1', kind='constructed', organization=organization)
+
+
 @pytest.fixture
 def inventory_source(inventory):
     # by making it ec2, the credential is not required

awx/main/tests/functional/test_inventory_input_constructed.py

@@ -3,25 +3,17 @@ from awx.main.models import Inventory
 from awx.api.versioning import reverse
 
 
-@pytest.fixture
-def constructed_inventory(organization):
-    """
-    creates a new constructed inventory source
-    """
-    return Inventory.objects.create(name='dummy2', kind='constructed', organization=organization)
-
-
 @pytest.mark.django_db
-def test_constructed_inventory_post(post, organization, admin_user):
+def test_constructed_inventory_post(post, admin_user, organization):
-    inventory1 = Inventory.objects.create(name='dummy1', kind='constructed', organization=organization)
+    inv1 = Inventory.objects.create(name='dummy1', kind='constructed', organization=organization)
-    inventory2 = Inventory.objects.create(name='dummy2', kind='constructed', organization=organization)
+    inv2 = Inventory.objects.create(name='dummy2', kind='constructed', organization=organization)
     resp = post(
-        url=reverse('api:inventory_input_inventories', kwargs={'pk': inventory1.pk}),
+        url=reverse('api:inventory_input_inventories', kwargs={'pk': inv1.pk}),
-        data={'id': inventory2.pk},
+        data={'id': inv2.pk},
         user=admin_user,
-        expect=405,
+        expect=400,
     )
-    assert resp.status_code == 405
+    assert resp.status_code == 400
 
 
 @pytest.mark.django_db
@@ -58,12 +50,11 @@ def test_add_constructed_inventory_group(post, admin_user, constructed_inventory
 
 
 @pytest.mark.django_db
-def test_edit_constructed_inventory_source(patch, admin_user, inventory):
+def test_edit_constructed_inventory_source(patch, admin_user, inventory_source_factory):
-    inventory.inventory_sources.create(name="dummysrc", source="constructed")
+    inv_src = inventory_source_factory(name='dummy1', source='constructed')
-    inv_id = inventory.inventory_sources.get(name='dummysrc').id
     resp = patch(
-        reverse('api:inventory_source_detail', kwargs={'pk': inv_id}),
+        reverse('api:inventory_source_detail', kwargs={'pk': inv_src.pk}),
-        data={'description': inventory.name},
+        data={'description': inv_src.name},
         user=admin_user,
         expect=400,
     )