From a6aea22d74b0e8b5a827ae5f273a2f071734fcd3 Mon Sep 17 00:00:00 2001 From: Susanne Balle Date: Tue, 15 Jul 2014 09:18:34 -0400 Subject: [PATCH] Renamed Pending to PENDING fixes bug 1329526 Change-Id: I53750cd9bf23df06678d555e5c1fecfcc98edca3 --- doc/source/restapi/rest_api_v1.1_EDP.rst | 6 +++--- sahara/service/edp/api.py | 2 +- sahara/tests/unit/conductor/test_resource.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/source/restapi/rest_api_v1.1_EDP.rst b/doc/source/restapi/rest_api_v1.1_EDP.rst index f9159036..b8ebe4a8 100644 --- a/doc/source/restapi/rest_api_v1.1_EDP.rst +++ b/doc/source/restapi/rest_api_v1.1_EDP.rst @@ -1132,7 +1132,7 @@ This operation returns the created Job Execution object. Note that different job "job_execution": { "output_id": "b63780f3-13d7-4286-b731-88270fb204de", "info": { - "status": "Pending" + "status": "PENDING" }, "job_id": "65afed9c-dad7-4658-9554-b7b4e1ca908f", "tenant_id": "11587919cc534bcbb1027a161c82cf58", @@ -1191,7 +1191,7 @@ This operation returns the created Job Execution object. Note that different job "job_execution": { "output_id": null, "info": { - "status": "Pending" + "status": "PENDING" }, "job_id": "8236b1b4-e1b8-46ef-9174-355cd4234b62", "tenant_id": "a4e4599e87e04bf1996862ae295f6f53", @@ -1356,7 +1356,7 @@ This operation does not require a request body. { "output_id": "b63780f3-13d7-4286-b731-88270fb204de", "info": { - "status": "Pending" + "status": "PENDING" }, "job_id": "65afed9c-dad7-4658-9554-b7b4e1ca908f", "tenant_id": "11587919cc534bcbb1027a161c82cf58", diff --git a/sahara/service/edp/api.py b/sahara/service/edp/api.py index bf38a934..44abe0ff 100644 --- a/sahara/service/edp/api.py +++ b/sahara/service/edp/api.py @@ -54,7 +54,7 @@ def execute_job(job_id, data): # a superset for all job types job_ex_dict = {'input_id': input_id, 'output_id': output_id, 'job_id': job_id, 'cluster_id': cluster_id, - 'info': {'status': 'Pending'}, 'job_configs': configs, + 'info': {'status': 'PENDING'}, 'job_configs': configs, 'extra': {}} job_execution = conductor.job_execution_create(context.ctx(), job_ex_dict) diff --git a/sahara/tests/unit/conductor/test_resource.py b/sahara/tests/unit/conductor/test_resource.py index f62faf8d..a3b82907 100644 --- a/sahara/tests/unit/conductor/test_resource.py +++ b/sahara/tests/unit/conductor/test_resource.py @@ -103,7 +103,7 @@ SAMPLE_JOB_EXECUTION = { "info": { "actions": [{"conf": "some stuff"}, {"conf": "more stuff"}], - "status": "Pending" + "status": "PENDING" }, "input_id": "b5ddde55-594e-428f-9040-028be81eb3c2", "job_configs": {