Add bots.count endpoint

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 617 matching lines @@
       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)
     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,
+      http_method='GET')
+  @auth.require(acl.is_privileged_user)
+  def count(self, request):
+    """Counts number of bots with given dimensions."""
+    logging.info('%s', request)
+    now = utils.utcnow()
+    q = bot_management.BotInfo.query().order(bot_management.BotInfo.key)

[M-A Ruel, 2016/08/01 15:33:14]

order is not needed for counting.

[kjlubick, 2016/08/01 17:26:32]

Done.

+    for d in request.dimensions:
+      if not ':' in d:

[M-A Ruel, 2016/08/01 15:33:14]

this check is not needed because you already check for this at line 652.

[kjlubick, 2016/08/01 17:26:32]

Done.

+        raise endpoints.BadRequestException('Invalid dimensions')

[M-A Ruel, 2016/08/01 15:33:14]

...: %s' % d)
?

[kjlubick, 2016/08/01 17:26:31]

Done.

+      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)
+    bots, cursor = datastore_utils.fetch_page(q)

[M-A Ruel, 2016/08/01 15:33:14]

you don't need to fetch a page, just count, see line 410.

[kjlubick, 2016/08/01 17:26:32]

Done.

+    return swarming_rpcs.BotsCount(
+        count=len(bots),
+        now=now)
+
 
 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))