Allow botlist API call to respond to quarantined: and is_dead:

appengine/swarming/handlers_endpoints.py

 # Copyright 2015 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """This module defines Swarming Server endpoints handlers."""
 
 import datetime
 import logging
 
 from google.appengine.api import datastore_errors
@@ skipping 602 matching lines @@
       swarming_rpcs.BotsRequest, swarming_rpcs.BotList,
       http_method='GET')
   @auth.require(acl.is_privileged_user)
   def list(self, request):
     """Provides list of known bots.
 
     Deleted bots will not be listed.
     """
     logging.info('%s', request)
     now = utils.utcnow()
-    q = bot_management.BotInfo.query().order(bot_management.BotInfo.key)
+    q = bot_management.BotInfo.query()
     for d in request.dimensions:
       if not ':' in d:
         raise endpoints.BadRequestException('Invalid dimensions')
       parts = d.split(':', 1)
       if len(parts) != 2 or any(i.strip() != i or not i for i in parts):
         raise endpoints.BadRequestException('Invalid dimensions')
-      q = q.filter(bot_management.BotInfo.dimensions_flat == d)
+      if parts[0] == 'quarantined':

[M-A Ruel, 2016/08/08 19:29:51]

Please change BotsRequest with formal arguments instead.

[kjlubick, 2016/08/08 20:12:05]

Done.  Should I update BotsCount (line 657ish) to respond to these new
arguments?

[M-A Ruel, 2016/08/08 20:28:00]

Yes it should match.

+        if parts[1] == 'true':
+          q = q.filter(bot_management.BotInfo.quarantined == True)
+        elif parts[1] == 'false':
+          q = q.filter(bot_management.BotInfo.quarantined == False)
+      elif parts[0] == 'is_dead':
+        dt = datetime.timedelta(
+            seconds=config.settings().bot_death_timeout_secs)
+        timeout = now - dt
+        if parts[1] == 'true':
+          q = q.filter(bot_management.BotInfo.last_seen_ts < timeout)
+        elif parts[1] == 'false':
+          q = q.filter(bot_management.BotInfo.last_seen_ts > timeout)
+      else:
+        q = q.filter(bot_management.BotInfo.dimensions_flat == d)
     bots, cursor = datastore_utils.fetch_page(q, request.limit, request.cursor)
     return swarming_rpcs.BotList(
         cursor=cursor,
         death_timeout=config.settings().bot_death_timeout_secs,
         items=[message_conversion.bot_info_to_rpc(bot, now) for bot in bots],
         now=now)
 
   @gae_ts_mon.instrument_endpoint()
   @auth.endpoints_method(
       swarming_rpcs.BotsRequest, swarming_rpcs.BotsCount,
@@ skipping 42 matching lines @@
 def get_routes():
   return (
     endpoints_webapp2.api_routes(SwarmingServerService) +
     endpoints_webapp2.api_routes(SwarmingTaskService) +
     endpoints_webapp2.api_routes(SwarmingTasksService) +
     endpoints_webapp2.api_routes(SwarmingBotService) +
     endpoints_webapp2.api_routes(SwarmingBotsService) +
     # components.config endpoints for validation and configuring of luci-config
     # service URL.
     endpoints_webapp2.api_routes(config.ConfigApi))