From 0702692ca9179e2fa95dc27c4acb453cdd158a43 Mon Sep 17 00:00:00 2001 From: chris meyers Date: Wed, 6 Jun 2018 16:26:22 -0400 Subject: [PATCH] add controller_node to adhoc command job --- awx/api/serializers.py | 3 +-- awx/main/tests/functional/api/test_job.py | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 3f674dae7a..c6ce645c5a 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -3258,8 +3258,7 @@ class AdHocCommandSerializer(UnifiedJobSerializer): model = AdHocCommand fields = ('*', 'job_type', 'inventory', 'limit', 'credential', 'module_name', 'module_args', 'forks', 'verbosity', 'extra_vars', - 'become_enabled', 'diff_mode', '-unified_job_template', '-description', - '-controller_node',) + 'become_enabled', 'diff_mode', '-unified_job_template', '-description') extra_kwargs = { 'name': { 'read_only': True, diff --git a/awx/main/tests/functional/api/test_job.py b/awx/main/tests/functional/api/test_job.py index 00114e044d..fce3c6fb5a 100644 --- a/awx/main/tests/functional/api/test_job.py +++ b/awx/main/tests/functional/api/test_job.py @@ -192,10 +192,10 @@ class TestControllerNode(): r = get(job.get_absolute_url(), admin_user, expect=200) assert 'controller_node' in r.data - r = get(reverse('api:project_update_detail', kwargs={'pk': project_update.pk}), admin_user, expect=200) - assert 'controller_node' not in r.data - r = get(reverse('api:ad_hoc_command_detail', kwargs={'pk': adhoc.pk}), admin_user, expect=200) + assert 'controller_node' in r.data + + r = get(reverse('api:project_update_detail', kwargs={'pk': project_update.pk}), admin_user, expect=200) assert 'controller_node' not in r.data r = get(reverse('api:inventory_update_detail', kwargs={'pk': inventory_update.pk}), admin_user, expect=200)