diff options
author | Zuul <zuul@review.opendev.org> | 2021-05-28 16:48:06 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2021-05-28 16:48:06 +0000 |
commit | 91b30ab231a43e4405610f0fd45fd77992458e40 (patch) | |
tree | 1f7efab771452291bde3c56537fe3ac37c50dafa /zuul/cmd | |
parent | 78bf9cd6ca851170a774a03f3000cf5ff0eeb57d (diff) | |
parent | 01efd92d2a4e870b15076cfccc99524ffa6cbf7e (diff) | |
download | zuul-91b30ab231a43e4405610f0fd45fd77992458e40.tar.gz |
Merge "client: fix REST autohold-list response"
Diffstat (limited to 'zuul/cmd')
-rwxr-xr-x | zuul/cmd/client.py | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/zuul/cmd/client.py b/zuul/cmd/client.py index 3a9c35ab4..d7154184c 100755 --- a/zuul/cmd/client.py +++ b/zuul/cmd/client.py @@ -82,17 +82,7 @@ class ZuulRESTClient(object): 'tenant/%s/autohold' % tenant) req = requests.get(url, verify=self.verify) self._check_status(req) - resp = req.json() - # reformat the answer to match RPC format - ret = {} - for d in resp: - key = ','.join([d['tenant'], - d['project'], - d['job'], - d['ref_filter']]) - ret[key] = (d['count'], d['reason'], d['node_hold_expiration']) - - return ret + return req.json() def enqueue(self, tenant, pipeline, project, trigger, change): if not self.auth_token: @@ -494,7 +484,7 @@ class Client(zuul.cmd.ZuulApp): table = prettytable.PrettyTable( field_names=[ 'ID', 'Tenant', 'Project', 'Job', 'Ref Filter', - 'Max Count', 'Reason' + 'Current Count', 'Max Count', 'Reason' ]) for request in autohold_requests: @@ -504,6 +494,7 @@ class Client(zuul.cmd.ZuulApp): request['project'], request['job'], request['ref_filter'], + request['current_count'], request['max_count'], request['reason'], ]) |