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

appengine/swarming/swarming_rpcs.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 ProtoRPC types for the Swarming Server handlers."""
 
 from protorpc import message_types
 from protorpc import messages
 
 
@@ skipping 30 matching lines @@
   key = messages.StringField(1)
   value = messages.StringField(2)
 
 
 class StringListPair(messages.Message):
   """Represents a mapping of string to list of strings."""
   key = messages.StringField(1)
   value = messages.StringField(2, repeated=True)
 
 
+class ThreeStateBool(messages.Enum):
+  FALSE = 1
+  TRUE = 2
+  NONE = 3
+
+
+def to_bool(three_state):
+  if three_state in (None, True, False):
+    return three_state
+  if three_state == ThreeStateBool.FALSE:
+    return False
+  if three_state == ThreeStateBool.TRUE:
+    return True
+

[M-A Ruel, 2016/08/09 20:23:13]

2 lines here

[kjlubick, 2016/08/09 20:44:44]

Done.

 ### Server related.
 
 
 class ServerDetails(messages.Message):
   """Reports the server version."""
   server_version = messages.StringField(1)
 
 
 class FileContentRequest(messages.Message):
   """Content of a file."""
@@ skipping 240 matching lines @@
 ### Bot-Related Requests
 
 
 class BotsRequest(messages.Message):
   """Information needed to request bot data."""
   limit = messages.IntegerField(1, default=200)
   cursor = messages.StringField(2)
   # Must be a list of 'key:value' strings to filter the returned list of bots
   # on.
   dimensions = messages.StringField(3, repeated=True)
+  quarantined = messages.EnumField(ThreeStateBool, 4, default='NONE')
+  is_dead = messages.EnumField(ThreeStateBool, 5, default='NONE')
 
 
 class BotEventsRequest(messages.Message):
   """Request to get events for a bot."""
   limit = messages.IntegerField(1, default=200)
   cursor = messages.StringField(2)
   # These should be DateTimeField but endpoints + protorpc have trouble encoding
   # this message in a GET request, this is due to DateTimeField's special
   # encoding in protorpc-1.0/protorpc/message_types.py that is bypassed when
   # using endpoints-1.0/endpoints/protojson.py to add GET query parameter
@@ skipping 105 matching lines @@
 
 
 class DeletedResponse(messages.Message):
   """Indicates whether a bot was deleted."""
   deleted = messages.BooleanField(1)
 
 
 class TerminateResponse(messages.Message):
   """Returns the pseudo taskid to wait for the bot to shut down."""
   task_id = messages.StringField(1)