zuul/nodepool
Code Issues Proposed changes

status: add pool column to nodepool list output

Browse Source 
This helps debug pool quota usage.

Change-Id: Id6cdef978e1ba80a4fea5e5bfa862755fb6d7e40
This commit is contained in:
Tristan Cacqueray 2018-06-29 03:05:36 +00:00
parent 3e0a822bf6
commit 5745c807c9
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nodepool/cmd/nodepoolcmd.py
View File

@ -160,7 +160,7 @@ class NodePoolCmd(NodepoolApp):
fields = ['id', 'provider', 'label', 'server_id', fields = ['id', 'provider', 'label', 'server_id',
'public_ipv4', 'ipv6', 'state', 'age', 'locked'] 'public_ipv4', 'ipv6', 'state', 'age', 'locked']
if detail: if detail:
fields.extend(['hostname', 'private_ipv4', 'AZ', fields.extend(['pool', 'hostname', 'private_ipv4', 'AZ',
'connection_port', 'launcher', 'connection_port', 'launcher',
'allocated_to', 'hold_job', 'allocated_to', 'hold_job',
'comment']) 'comment'])

2
nodepool/status.py
View File

@ -119,6 +119,7 @@ def node_list(zk, node_id=None):
("state", "State"), ("state", "State"),
("age", "Age"), ("age", "Age"),
("locked", "Locked"), ("locked", "Locked"),
("pool", "Pool"),
("hostname", "Hostname"), ("hostname", "Hostname"),
("private_ipv4", "Private IPv4"), ("private_ipv4", "Private IPv4"),
("AZ", "AZ"), ("AZ", "AZ"),
@ -149,6 +150,7 @@ def node_list(zk, node_id=None):
node.state, node.state,
age(node.state_time), age(node.state_time),
locked, locked,
node.pool,
node.hostname, node.hostname,
node.private_ipv4, node.private_ipv4,
node.az, node.az,

2
nodepool/tests/test_commands.py
View File

@ -67,7 +67,7 @@ class TestNodepoolCMD(tests.DBTestCase):
col_count = 9 col_count = 9
if detail: if detail:
cmd += ['--detail'] cmd += ['--detail']
col_count = 17 col_count = 18
if not validate_col_count: if not validate_col_count:
col_count = 0 col_count = 0
self.assert_listed(configfile, cmd, 6, status, node_cnt, col_count) self.assert_listed(configfile, cmd, 6, status, node_cnt, col_count)

3
releasenotes/notes/nodepool-list-pool-detail-680f47814fd51427.yaml Normal file
View File

@ -0,0 +1,3 @@
---
features:
- The detailed nodepool list outputs the node's pool.