zuul
/
nodepool
Code Issues Proposed changes

Include event id in node request listings 

The event id will now be included in the command output of
'request-list' as well as the HTTP endpoint for outstanding node
requests.

Change-Id: I2475ae879fd0321bac020c84935a5a1d52b8b916
This commit is contained in:
Simon Westphahl 2020-01-21 09:54:32 +01:00
parent b628195d04
commit 1b28a77284
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nodepool/status.py
View File

@ -235,14 +235,17 @@ def request_list(zk):
("requestor", "Requestor"),
("node_types", "Node Types"),
("nodes", "Nodes"),
("declined_by", "Declined By")])
("declined_by", "Declined By"),
("event_id", "Event ID"),
])
objs = []
for req in zk.nodeRequestIterator():
values = [req.id, req.relative_priority,
req.state, req.requestor,
req.node_types,
req.nodes,
req.declined_by]
req.declined_by,
req.event_id]
objs.append(dict(zip(headers_table.keys(),
values)))
return (objs, headers_table)

3
nodepool/tests/unit/test_webapp.py
View File

@ -220,7 +220,8 @@ class TestWebApp(tests.DBTestCase):
data = f.read()
objs = json.loads(data.decode('utf8'))
self.assertDictContainsSubset({'node_types': ['fake-label'],
'requestor': 'test_request_list', },
'requestor': 'test_request_list',
'event_id': req.event_id, },
objs[0])
def test_label_list_json(self):