diff options
| author | Matthieu Huin <mhuin@redhat.com> | 2020-05-14 14:51:16 +0200 |
|---|---|---|
| committer | Matthieu Huin <mhuin@redhat.com> | 2020-06-17 07:44:56 +0000 |
| commit | 3572b4cc34e7ab50a61118949bdc6803f4b7d7ac (patch) | |
| tree | e369ca91196e942f4d65583ad113e529764e0413 /zuul/web | |
| parent | 2793d27b12bd4bf13aee6145558e9bf59bb4e076 (diff) | |
| download | zuul-3572b4cc34e7ab50a61118949bdc6803f4b7d7ac.tar.gz | |
REST API: fix discrepancies between RPC and REST outputs for autohold
The REST API implementation of autohold-list and autohold-info was
missing some fields and misnaming others compared to the RPC output.
This fixes problems with the CLI when using autohold-list via the REST
client.
Change-Id: I29748bda8c59888ea521ae65201fc3bacefd3a91
Diffstat (limited to 'zuul/web')
| -rwxr-xr-x | zuul/web/__init__.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/zuul/web/__init__.py b/zuul/web/__init__.py index d731879d7..966ced922 100755 --- a/zuul/web/__init__.py +++ b/zuul/web/__init__.py @@ -453,9 +453,12 @@ class ZuulWebAPI(object): 'project': request['project'], 'job': request['job'], 'ref_filter': request['ref_filter'], - 'count': request['max_count'], + 'max_count': request['max_count'], + 'current_count': request['current_count'], 'reason': request['reason'], - 'node_hold_expiration': request['node_expiration'] + 'node_expiration': request['node_expiration'], + 'expired': request['expired'], + 'nodes': request['nodes'] }) resp = cherrypy.response resp.headers['Access-Control-Allow-Origin'] = '*' @@ -490,9 +493,12 @@ class ZuulWebAPI(object): 'project': request['project'], 'job': request['job'], 'ref_filter': request['ref_filter'], - 'count': request['max_count'], + 'max_count': request['max_count'], + 'current_count': request['current_count'], 'reason': request['reason'], - 'node_hold_expiration': request['node_expiration'] + 'node_expiration': request['node_expiration'], + 'expired': request['expired'], + 'nodes': request['nodes'] } def _autohold_delete(self, request_id): |