swarming: change meaning of inputs_ref

appengine/swarming/handlers_bot.py

 # Copyright 2015 The LUCI Authors. All rights reserved.
 # Use of this source code is governed by the Apache v2.0 license that can be
 # found in the LICENSE file.
 
 """Internal bot API handlers."""
 
 import base64
 import json
 import logging
 import re
@@ skipping 361 matching lines @@
       # TODO(maruel): Note the task if possible and hand it out on next poll.
       # https://code.google.com/p/swarming/issues/detail?id=130
       self.abort(500, 'Deadline')
 
   def _cmd_run(self, request, run_result_key, bot_id):
     cmd = None
     if request.properties.commands:
       cmd = request.properties.commands[0]
     elif request.properties.command:
       cmd = request.properties.command
+
+    isolated = None
+    if request.properties.inputs_ref:
+      isolated = {
+        'input': request.properties.inputs_ref.isolated,
+        'server': request.properties.inputs_ref.isolatedserver,
+        'namespace': request.properties.inputs_ref.namespace,
+      }
+    elif request.properties.outputs_target:
+      isolated = {
+        'input': None,
+        'server': request.properties.inputs_ref.isolatedserver,
+        'namespace': request.properties.inputs_ref.namespace,
+      }
+
     out = {
       'cmd': 'run',
       'manifest': {
         'bot_id': bot_id,
         'command': cmd,
         'dimensions': request.properties.dimensions,
         'env': request.properties.env,
         'extra_args': request.properties.extra_args,
         'grace_period': request.properties.grace_period_secs,
         'hard_timeout': request.properties.execution_timeout_secs,
         'host': utils.get_versioned_hosturl(),
         'io_timeout': request.properties.io_timeout_secs,
-        'inputs_ref': request.properties.inputs_ref,
+        'isolated': isolated,
         'packages': [
           {
             'package_name': p.package_name,
             'version': p.version,
           }
           for p in request.properties.packages
         ],
         'task_id': task_pack.pack_run_result_key(run_result_key),
       },
     }
@@ skipping 262 matching lines @@
       ('/swarming/api/v1/bot/poll', BotPollHandler),
       ('/swarming/api/v1/bot/server_ping', ServerPingHandler),
       ('/swarming/api/v1/bot/task_update', BotTaskUpdateHandler),
       ('/swarming/api/v1/bot/task_update/<task_id:[a-f0-9]+>',
           BotTaskUpdateHandler),
       ('/swarming/api/v1/bot/task_error', BotTaskErrorHandler),
       ('/swarming/api/v1/bot/task_error/<task_id:[a-f0-9]+>',
           BotTaskErrorHandler),
   ]
   return [webapp2.Route(*i) for i in routes]