diff --git a/nodepool/cmd/nodepoolcmd.py b/nodepool/cmd/nodepoolcmd.py index daf4adcfe..522556f0d 100755 --- a/nodepool/cmd/nodepoolcmd.py +++ b/nodepool/cmd/nodepoolcmd.py @@ -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']) diff --git a/nodepool/status.py b/nodepool/status.py index ca892c3c4..e21e9bb5d 100755 --- a/nodepool/status.py +++ b/nodepool/status.py @@ -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, diff --git a/nodepool/tests/test_commands.py b/nodepool/tests/test_commands.py index eb40e6032..dbabd12e0 100644 --- a/nodepool/tests/test_commands.py +++ b/nodepool/tests/test_commands.py @@ -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) diff --git a/releasenotes/notes/nodepool-list-pool-detail-680f47814fd51427.yaml b/releasenotes/notes/nodepool-list-pool-detail-680f47814fd51427.yaml new file mode 100644 index 000000000..5189940e2 --- /dev/null +++ b/releasenotes/notes/nodepool-list-pool-detail-680f47814fd51427.yaml @@ -0,0 +1,3 @@ +--- +features: + - The detailed nodepool list outputs the node's pool.