Include Machine Provider machine_type in swarming_rpcs.BotInfo

appengine/swarming/message_conversion.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 facilitates conversion from dictionaries to ProtoRPC messages.
 
 Given a dictionary whose keys' names and values' types comport with the
 fields defined for a protorpc.messages.Message subclass, this module tries to
 generate a Message instance that corresponds to the provided dictionary. The
 "normal" use case is for ndb.Models which need to be represented as a
@@ skipping 58 matching lines @@
     return utils.timestamp_to_datetime(value*1000000.)
   except OverflowError as e:
     raise ValueError(e)
 
 
 def bot_info_to_rpc(entity, now, deleted=False):
   """"Returns a swarming_rpcs.BotInfo from a bot.BotInfo."""
   return _ndb_to_rpc(
       swarming_rpcs.BotInfo,
       entity,
+      bot_id=entity.id,
+      deleted=deleted,
       dimensions=_string_list_pairs_from_dict(entity.dimensions),
       is_dead=entity.is_dead(now),
-      bot_id=entity.id,
-      deleted=deleted,
+      machine_type=entity.machine_type,
       state=json.dumps(entity.state, sort_keys=True, separators=(',', ':')))
 
 
 def bot_event_to_rpc(entity):
   """"Returns a swarming_rpcs.BotEvent from a bot.BotEvent."""
   return _ndb_to_rpc(
       swarming_rpcs.BotEvent,
       entity,
       dimensions=_string_list_pairs_from_dict(entity.dimensions),
       state=json.dumps(entity.state, sort_keys=True, separators=(',', ':')),
@@ skipping 165 matching lines @@
     kwargs['run_id'] = entity.task_id
   else:
     assert entity.__class__ is task_result.TaskResultSummary, entity
     kwargs['properties_hash'] = (
         entity.properties_hash.encode('hex')
         if entity.properties_hash else None)
     # This returns the right value for deduped tasks too.
     k = entity.run_result_key
     kwargs['run_id'] = task_pack.pack_run_result_key(k) if k else None
   return _ndb_to_rpc(swarming_rpcs.TaskResult, entity, **kwargs)