External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix an issue where we weren't properly dealing with extra data passed as

Browse Source 
survey answers when launching a job template
This commit is contained in:
Matthew Jones
2014-12-04 11:16:58 -05:00
parent d9e69fc2c3
commit 3164c6d356
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
awx/main/models/jobs.py
View File

@@ -445,16 +445,17 @@ class Job(UnifiedJob, JobOptions):
return dependencies return dependencies
def handle_extra_data(self, extra_data): def handle_extra_data(self, extra_data):
if extra_data == "": print("Extra data: " + str(extra_data))
return if type(extra_data) == dict:
try:
evars = json.loads(self.extra_vars)
except Exception, e:
return
if evars is None:
evars = extra_data evars = extra_data
else: else:
evars.update(extra_data) if extra_data == "":
return
try:
evars = json.loads(self.extra_vars)
except Exception, e:
logger.warn("Exception deserializing extra vars: " + str(e))
print("Evars: " + str(evars))
self.update_fields(extra_vars=json.dumps(evars)) self.update_fields(extra_vars=json.dumps(evars))
def copy(self): def copy(self):

4
awx/main/models/unified_jobs.py
View File

@@ -695,12 +695,14 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
self.job_explanation = u'Missing needed fields: %s.' % missing_fields self.job_explanation = u'Missing needed fields: %s.' % missing_fields
self.save(update_fields=['job_explanation']) self.save(update_fields=['job_explanation'])
return False return False
extra_data = dict([(field, kwargs[field]) for field in kwargs
if field not in needed])
self.handle_extra_data(extra_data)
task_class().apply_async((self.pk,), opts, link_error=error_callback) task_class().apply_async((self.pk,), opts, link_error=error_callback)
return True return True
def signal_start(self, **kwargs): def signal_start(self, **kwargs):
"""Notify the task runner system to begin work on this task.""" """Notify the task runner system to begin work on this task."""
# Sanity check: If we are running unit tests, then run synchronously. # Sanity check: If we are running unit tests, then run synchronously.
if getattr(settings, 'CELERY_UNIT_TEST', False): if getattr(settings, 'CELERY_UNIT_TEST', False):
return self.start(None, **kwargs) return self.start(None, **kwargs)

4
awx/main/tests/jobs.py
View File

@@ -961,6 +961,10 @@ class JobTemplateTest(BaseJobTestMixin, django.test.TestCase):
launch_url = reverse('api:job_template_launch', args=(new_jt_id,)) launch_url = reverse('api:job_template_launch', args=(new_jt_id,))
response = self.get(launch_url) response = self.get(launch_url)
self.assertTrue('favorite_color' in response['variables_needed_to_start']) self.assertTrue('favorite_color' in response['variables_needed_to_start'])
response = self.post(launch_url, dict(favorite_color="green"), expect=202)
job = Job.objects.get(pk=response["job"])
job_extra = json.loads(job.extra_vars)
self.assertTrue("favorite_color" in job_extra)
with self.current_user(self.user_sue): with self.current_user(self.user_sue):
response = self.post(url, json.loads(TEST_SIMPLE_NONREQUIRED_SURVEY), expect=200) response = self.post(url, json.loads(TEST_SIMPLE_NONREQUIRED_SURVEY), expect=200)