Merge "Include user/driver data in node detail list"

nodepool/cmd/nodepoolcmd.py

@@ -200,7 +200,7 @@ class NodePoolCmd(NodepoolApp):
             fields.extend(['pool', 'hostname', 'private_ipv4', 'AZ',
                            'connection_port', 'launcher',
                            'allocated_to', 'hold_job',
-                           'comment'])
+                           'comment', 'user_data', 'driver_data'])
         results = status.node_list(self.zk, node_id)
         print(status.output(results, 'pretty', fields))
 

nodepool/status.py

@@ -127,7 +127,9 @@ def node_list(zk, node_id=None):
         ("launcher", "Launcher"),
         ("allocated_to", "Allocated To"),
         ("hold_job", "Hold Job"),
-        ("comment", "Comment")
+        ("comment", "Comment"),
+        ("user_data", "User Data"),
+        ("driver_data", "Driver Data"),
     ]
     headers_table = OrderedDict(headers_table)
 
@@ -157,7 +159,9 @@ def node_list(zk, node_id=None):
             node.launcher,
             node.allocated_to,
             node.hold_job,
-            node.comment
+            node.comment,
+            node.user_data,
+            node.driver_data,
         ]
         return values
 

nodepool/tests/unit/test_commands.py

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