From 09dff99340d9acaa56f03d94cafcd999eec314a9 Mon Sep 17 00:00:00 2001 From: chris meyers Date: Wed, 28 Nov 2018 16:57:50 -0500 Subject: [PATCH] enforce 1 edge between 2 nodes constraint --- awx/api/views/__init__.py | 6 ++++ .../functional/api/test_workflow_node.py | 36 +++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/awx/api/views/__init__.py b/awx/api/views/__init__.py index ac65ce9247..663c3892a9 100644 --- a/awx/api/views/__init__.py +++ b/awx/api/views/__init__.py @@ -2957,6 +2957,12 @@ class WorkflowJobTemplateNodeChildrenBaseList(WorkflowsEnforcementMixin, Enforce if parent.id == sub.id: return {"Error": _("Cycle detected.")} + if WorkflowJobTemplateNode.objects.filter(Q(pk=parent.id) & + Q(success_nodes__in=[sub.id]) | + Q(failure_nodes__in=[sub.id]) | + Q(always_nodes__in=[sub.id])).exists(): + return {"Error": _("Relationship not allowed.")} + parent_node_type_relationship = getattr(parent, self.relationship) parent_node_type_relationship.add(sub) diff --git a/awx/main/tests/functional/api/test_workflow_node.py b/awx/main/tests/functional/api/test_workflow_node.py index 01cb29edc4..d902d3546b 100644 --- a/awx/main/tests/functional/api/test_workflow_node.py +++ b/awx/main/tests/functional/api/test_workflow_node.py @@ -1,4 +1,5 @@ import pytest +import json from awx.api.versioning import reverse @@ -75,6 +76,41 @@ def test_node_accepts_prompted_fields(inventory, project, workflow_job_template, user=admin_user, expect=201) +@pytest.mark.django_db +class TestExclusivePathEnforcement(): + @pytest.fixture + def n1(self, workflow_job_template): + return WorkflowJobTemplateNode.objects.create(workflow_job_template=workflow_job_template) + + @pytest.fixture + def n2(self, workflow_job_template): + return WorkflowJobTemplateNode.objects.create(workflow_job_template=workflow_job_template) + + def generate_url(self, path, id): + return reverse('api:workflow_job_template_node_{}_nodes_list'.format(path), + kwargs={'pk': id}) + + path_permutations = [ + ['success', 'failure', 'always'], + ['success', 'always', 'failure'], + ['failure', 'always', 'success'], + ['failure', 'success', 'always'], + ['always', 'success', 'failure'], + ['always', 'failure', 'success'], + ] + + @pytest.mark.parametrize("paths", path_permutations, ids=["-".join(item) for item in path_permutations]) + def test_multi_connections_same_parent_disallowed(self, post, admin_user, n1, n2, paths): + for index, path in enumerate(paths): + r = post(self.generate_url(path, n1.id), + data={'associate': True, 'id': n2.id}, + user=admin_user, + expect=204 if index == 0 else 400) + + if index != 0: + assert {'Error': 'Relationship not allowed.'} == json.loads(r.content) + + @pytest.mark.django_db class TestNodeCredentials: '''