External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-28 08:18:43 -03:30
Code Issues Packages Projects Releases Wiki Activity

expose handle_extra_data to workflow model

Browse Source
This commit is contained in:
AlanCoding
2017-01-19 10:30:55 -05:00
parent f419fb9bed
commit cf34eef1eb
2 changed files with 16 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,6 @@
# Python # Python
import datetime import datetime
import hmac import hmac
import json
import logging import logging
import time import time
from urlparse import urljoin from urlparse import urljoin
@@ -589,23 +588,6 @@ class Job(UnifiedJob, JobOptions, SurveyJobMixin, JobNotificationMixin):
hosts=all_hosts)) hosts=all_hosts))
return data return data
def handle_extra_data(self, extra_data):
extra_vars = {}
if isinstance(extra_data, dict):
extra_vars = extra_data
elif extra_data is None:
return
else:
if extra_data == "":
return
try:
extra_vars = json.loads(extra_data)
except Exception as e:
logger.warn("Exception deserializing extra vars: " + str(e))
evars = self.extra_vars_dict
evars.update(extra_vars)
self.update_fields(extra_vars=json.dumps(evars))
def _resources_sufficient_for_launch(self): def _resources_sufficient_for_launch(self):
if self.job_type == PERM_INVENTORY_SCAN: if self.job_type == PERM_INVENTORY_SCAN:
return self.inventory_id is not None return self.inventory_id is not None
@@ -1356,23 +1338,6 @@ class SystemJob(UnifiedJob, SystemJobOptions, JobNotificationMixin):
def get_ui_url(self): def get_ui_url(self):
return urljoin(settings.TOWER_URL_BASE, "/#/management_jobs/{}".format(self.pk)) return urljoin(settings.TOWER_URL_BASE, "/#/management_jobs/{}".format(self.pk))
def handle_extra_data(self, extra_data):
extra_vars = {}
if isinstance(extra_data, dict):
extra_vars = extra_data
elif extra_data is None:
return
else:
if extra_data == "":
return
try:
extra_vars = json.loads(extra_data)
except Exception as e:
logger.warn("Exception deserializing extra vars: " + str(e))
evars = self.extra_vars_dict
evars.update(extra_vars)
self.update_fields(extra_vars=json.dumps(evars))
@property @property
def task_impact(self): def task_impact(self):
return 150 return 150

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

@@ -818,7 +818,22 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
return [] return []
def handle_extra_data(self, extra_data): def handle_extra_data(self, extra_data):
return if hasattr(self, 'extra_vars'):
extra_vars = {}
if isinstance(extra_data, dict):
extra_vars = extra_data
elif extra_data is None:
return
else:
if extra_data == "":
return
try:
extra_vars = json.loads(extra_data)
except Exception as e:
logger.warn("Exception deserializing extra vars: " + str(e))
evars = self.extra_vars_dict
evars.update(extra_vars)
self.update_fields(extra_vars=json.dumps(evars))
@property @property
def can_start(self): def can_start(self):