commit e1729bb1558c8070c2459a310e59aa2320f4a0d3
author Aviv Keshet <akeshet@chromium.org> Wed May 31 13:27:09 2017 -0700
committer chrome-bot <chrome-bot@chromium.org> Wed May 31 21:14:38 2017 -0700
tree 1ce09defe33a27c267a2eabc94ff9a23989260cd
parent 9857f8754fddad14c578fc8f5615ff233c8612cc

autotest: add `atest server list -N` option to list only hostnames

BUG=chromium:721591
TEST=atest server list -N

Change-Id: Ia3a3cbecc901b8dc58e59d41bbf5057bb5396b00
Reviewed-on: https://chromium-review.googlesource.com/520122
Commit-Ready: Aviv Keshet <akeshet@chromium.org>
Tested-by: Aviv Keshet <akeshet@chromium.org>
Reviewed-by: Dan Shi <dshi@google.com>

cli/server.py

diff --git a/cli/server.py b/cli/server.py
index 62b707d..b318d73 100644
--- a/cli/server.py
+++ b/cli/server.py
@@ -139,6 +139,10 @@
                                help='Format output as JSON.',
                                action='store_true',
                                default=False)
+        self.parser.add_option('-N', '--hostnames-only',
+                               help='Only return hostnames.',
+                               action='store_true',
+                               default=False)
 
 
     def parse(self):
@@ -149,9 +153,9 @@
         self.table = options.table
         self.status = options.status
         self.summary = options.summary
-        if self.table and self.summary:
-            self.invalid_syntax('Option --table and --summary cannot be both '
-                                'specified.')
+        self.namesonly = options.hostnames_only
+        if sum([self.table, self.summary, self.json, self.namesonly]) > 1:
+            self.invalid_syntax('May only specify up to 1 output-format flag.')
         return (options, leftover)
 
 
@@ -183,6 +187,8 @@
                 formatter = server_manager_utils.format_servers_table
             elif self.summary:
                 formatter = server_manager_utils.format_servers_summary
+            elif self.namesonly:
+                formatter = server_manager_utils.format_servers_nameonly
             else:
                 formatter = server_manager_utils.format_servers
             print formatter(results)

site_utils/server_manager_utils.py

diff --git a/site_utils/server_manager_utils.py b/site_utils/server_manager_utils.py
index 35c9bc0..34c8477 100644
--- a/site_utils/server_manager_utils.py
+++ b/site_utils/server_manager_utils.py
@@ -191,6 +191,15 @@
     return '\n'.join(result_lines)
 
 
+def format_servers_nameonly(servers):
+    """format servers for printing names only
+
+    @param servers: Sequence of Server instances.
+    @returns: Formatted output as string.
+    """
+    return '\n'.join(s.hostname for s in servers)
+
+
 def _get_servers_by_role(servers):
     """Return a mapping from roles to servers.