openstack/deb-sahara
Code Issues Proposed changes

Renamed Pending to PENDING

Browse Source 
fixes bug 1329526

Change-Id: I53750cd9bf23df06678d555e5c1fecfcc98edca3
This commit is contained in:
Susanne Balle 2014-07-15 09:18:34 -04:00
parent 7e250ecfa2
commit a6aea22d74
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/restapi/rest_api_v1.1_EDP.rst
View File

@ -1132,7 +1132,7 @@ This operation returns the created Job Execution object. Note that different job
"job_execution": { "job_execution": {
"output_id": "b63780f3-13d7-4286-b731-88270fb204de", "output_id": "b63780f3-13d7-4286-b731-88270fb204de",
"info": { "info": {
"status": "Pending" "status": "PENDING"
}, },
"job_id": "65afed9c-dad7-4658-9554-b7b4e1ca908f", "job_id": "65afed9c-dad7-4658-9554-b7b4e1ca908f",
"tenant_id": "11587919cc534bcbb1027a161c82cf58", "tenant_id": "11587919cc534bcbb1027a161c82cf58",
@ -1191,7 +1191,7 @@ This operation returns the created Job Execution object. Note that different job
"job_execution": { "job_execution": {
"output_id": null, "output_id": null,
"info": { "info": {
"status": "Pending" "status": "PENDING"
}, },
"job_id": "8236b1b4-e1b8-46ef-9174-355cd4234b62", "job_id": "8236b1b4-e1b8-46ef-9174-355cd4234b62",
"tenant_id": "a4e4599e87e04bf1996862ae295f6f53", "tenant_id": "a4e4599e87e04bf1996862ae295f6f53",
@ -1356,7 +1356,7 @@ This operation does not require a request body.
{ {
"output_id": "b63780f3-13d7-4286-b731-88270fb204de", "output_id": "b63780f3-13d7-4286-b731-88270fb204de",
"info": { "info": {
"status": "Pending" "status": "PENDING"
}, },
"job_id": "65afed9c-dad7-4658-9554-b7b4e1ca908f", "job_id": "65afed9c-dad7-4658-9554-b7b4e1ca908f",
"tenant_id": "11587919cc534bcbb1027a161c82cf58", "tenant_id": "11587919cc534bcbb1027a161c82cf58",

2
sahara/service/edp/api.py
View File

@ -54,7 +54,7 @@ def execute_job(job_id, data):
# a superset for all job types # a superset for all job types
job_ex_dict = {'input_id': input_id, 'output_id': output_id, job_ex_dict = {'input_id': input_id, 'output_id': output_id,
'job_id': job_id, 'cluster_id': cluster_id, 'job_id': job_id, 'cluster_id': cluster_id,
'info': {'status': 'Pending'}, 'job_configs': configs, 'info': {'status': 'PENDING'}, 'job_configs': configs,
'extra': {}} 'extra': {}}
job_execution = conductor.job_execution_create(context.ctx(), job_ex_dict) job_execution = conductor.job_execution_create(context.ctx(), job_ex_dict)

2
sahara/tests/unit/conductor/test_resource.py
View File

@ -103,7 +103,7 @@ SAMPLE_JOB_EXECUTION = {
"info": { "info": {
"actions": [{"conf": "some stuff"}, "actions": [{"conf": "some stuff"},
{"conf": "more stuff"}], {"conf": "more stuff"}],
"status": "Pending" "status": "PENDING"
}, },
"input_id": "b5ddde55-594e-428f-9040-028be81eb3c2", "input_id": "b5ddde55-594e-428f-9040-028be81eb3c2",
"job_configs": { "job_configs": {