Merge "status: add pool column to nodepool list output"

This commit is contained in:
Zuul 2018-07-21 01:16:16 +00:00 committed by Gerrit Code Review
commit bb76debb3e
4 changed files with 7 additions and 2 deletions

View File

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

View File

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

View File

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

View File

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