shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 23:51:09 +03:00
Code Releases Activity

Take survey title and description into account

Browse Source
This commit is contained in:
Matthew Jones 2014-09-10 15:19:53 -04:00
parent 59f3321b13
commit 9119b40966
2 changed files with 50 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,7 +215,7 @@ class JobTemplate(UnifiedJobTemplate, JobOptions):
def variables_needed_to_start(self):
vars = []
if self.survey_enabled:
for survey_element in self.survey_spec:
for survey_element in self.survey_spec["spec"]:
if survey_element['required']:
vars.append(survey_element['variable'])
return vars
@ -224,7 +224,11 @@ class JobTemplate(UnifiedJobTemplate, JobOptions):
errors = []
if not self.survey_enabled:
return errors
for survey_element in self.survey_spec:
if 'title' not in self.survey_spec:
errors.append("'title' missing from survey spec")
if 'description' not in self.survey_spec:
errors.append("'description' missing from survey spec")
for survey_element in self.survey_spec["spec"]:
if survey_element['variable'] not in data and \
survey_element['required']:
errors.append("'%s' value missing" % survey_element['variable'])

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

@ -49,24 +49,31 @@ TEST_ASYNC_PLAYBOOK = '''
'''
TEST_SIMPLE_REQUIRED_SURVEY = '''
[
{
"type": "text",
"question_name": "favorite color",
"question_description": "What is your favorite color?",
"variable": "favorite_color",
"choices": "",
"min": "",
{
"title": "Simple",
"description": "Description",
"spec": [
{
"type": "text",
"question_name": "favorite color",
"question_description": "What is your favorite color?",
"variable": "favorite_color",
"choices": "",
"min": "",
"max": "",
"required": true,
"default": "blue"
}
]
}
]
}
'''
TEST_SIMPLE_NONREQUIRED_SURVEY = '''
[
{
{
"title": "Simple",
"description": "Description",
"spec": [
{
"type": "text",
"question_name": "unladen swallow",
"question_description": "What is the airspeed velocity of an unladen swallow?",
@ -76,13 +83,17 @@ TEST_SIMPLE_NONREQUIRED_SURVEY = '''
"max": "",
"required": false,
"default": "european"
}
]
}
]
}
'''
TEST_SURVEY_REQUIREMENTS = '''
[
{
{
"title": "Simple",
"description": "Description",
"spec": [
{
"type": "text",
"question_name": "cantbeshort",
"question_description": "What is a long answer",
@ -92,8 +103,8 @@ TEST_SURVEY_REQUIREMENTS = '''
"max": "",
"required": false,
"default": "yes"
},
{
},
{
"type": "text",
"question_name": "cantbelong",
"question_description": "What is a short answer",
@ -103,8 +114,8 @@ TEST_SURVEY_REQUIREMENTS = '''
"max": 5,
"required": false,
"default": "yes"
},
{
},
{
"type": "text",
"question_name": "reqd",
"question_description": "I should be required",
@ -114,8 +125,8 @@ TEST_SURVEY_REQUIREMENTS = '''
"max": "",
"required": true,
"default": "yes"
},
{
},
{
"type": "multiplechoice",
"question_name": "achoice",
"question_description": "Need one of these",
@ -125,8 +136,8 @@ TEST_SURVEY_REQUIREMENTS = '''
"max": "",
"required": false,
"default": "yes"
},
{
},
{
"type": "multiselect",
"question_name": "mchoice",
"question_description": "Can have multiples of these",
@ -136,8 +147,8 @@ TEST_SURVEY_REQUIREMENTS = '''
"max": "",
"required": false,
"default": "yes"
},
{
},
{
"type": "integer",
"question_name": "integerchoice",
"question_description": "I need an int here",
@ -147,8 +158,8 @@ TEST_SURVEY_REQUIREMENTS = '''
"max": 5,
"required": false,
"default": ""
},
{
},
{
"type": "float",
"question_name": "float",
"question_description": "I need a float here",
@ -158,8 +169,8 @@ TEST_SURVEY_REQUIREMENTS = '''
"max": 5,
"required": false,
"default": ""
},
{
},
{
"type": "json",
"question_name": "jsonanswer",
"question_description": "This answer should validate as json",
@ -169,8 +180,9 @@ TEST_SURVEY_REQUIREMENTS = '''
"max": "",
"required": false,
"default": ""
}
]
}
]
}
'''
class BaseJobTestMixin(BaseTestMixin):