External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-14 11:20:39 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix up some more issues with extra vars and unit tests

Browse Source
This commit is contained in:
Matthew Jones 2014-12-04 14:25:36 -05:00
parent a0bfe31847
commit d8c619554e
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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