zuul/nodepool
Code Issues Proposed changes

Merge "Add username to detailed node list output"

Browse Source
This commit is contained in:
Zuul 2022-12-09 20:26:39 +00:00 committed by Gerrit Code Review
commit 9d98386b62
3 changed files with 4 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

@ -205,7 +205,7 @@ class NodePoolCmd(NodepoolApp):
'public_ipv4', 'ipv6', 'state', 'age', 'locked'] 'public_ipv4', 'ipv6', 'state', 'age', 'locked']
if detail: if detail:
fields.extend(['pool', 'hostname', 'private_ipv4', 'AZ', fields.extend(['pool', 'hostname', 'private_ipv4', 'AZ',
'connection_port', 'launcher', 'username', 'connection_port', 'launcher',
'allocated_to', 'hold_job', 'allocated_to', 'hold_job',
'comment', 'user_data', 'driver_data']) 'comment', 'user_data', 'driver_data'])
results = status.node_list(self.zk, node_id) results = status.node_list(self.zk, node_id)

2
nodepool/status.py
View File

@ -123,6 +123,7 @@ def node_list(zk, node_id=None):
("hostname", "Hostname"), ("hostname", "Hostname"),
("private_ipv4", "Private IPv4"), ("private_ipv4", "Private IPv4"),
("AZ", "AZ"), ("AZ", "AZ"),
("username", "Username"),
("connection_port", "Port"), ("connection_port", "Port"),
("launcher", "Launcher"), ("launcher", "Launcher"),
("allocated_to", "Allocated To"), ("allocated_to", "Allocated To"),
@ -155,6 +156,7 @@ def node_list(zk, node_id=None):
node.hostname, node.hostname,
node.private_ipv4, node.private_ipv4,
node.az, node.az,
node.username,
node.connection_port, node.connection_port,
node.launcher, node.launcher,
node.allocated_to, node.allocated_to,

2
nodepool/tests/unit/test_commands.py
View File

@ -78,7 +78,7 @@ class TestNodepoolCMD(tests.DBTestCase):
col_count = 9 col_count = 9
if detail: if detail:
cmd += ['--detail'] cmd += ['--detail']
col_count = 20 col_count = 21
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)