swarming: refactor cipd input

appengine/swarming/handlers_bot.py

Index: appengine/swarming/handlers_bot.py
diff --git a/appengine/swarming/handlers_bot.py b/appengine/swarming/handlers_bot.py
index c44cf760df2af67907bafabede38a3c772880a32..36833fc8c1c467a2f52be4de6b08b34dda4ff286 100644
--- a/appengine/swarming/handlers_bot.py
+++ b/appengine/swarming/handlers_bot.py
@@ -383,6 +383,14 @@ class BotPollHandler(_BotBaseHandler):
       'cmd': 'run',
       'manifest': {
         'bot_id': bot_id,
+        'cipd_input': {
+          'client_package': (

[M-A Ruel, 2016/05/12 13:49:45]

() not needed

+              request.properties.cipd_input.client_package.to_dict()),
+          'packages': [
+            p.to_dict() for p in request.properties.cipd_input.packages
+          ],
+          'server': request.properties.cipd_input.server,
+        } if request.properties.cipd_input else None,
         'command': cmd,
         'dimensions': request.properties.dimensions,
         'env': request.properties.env,
@@ -393,16 +401,9 @@ class BotPollHandler(_BotBaseHandler):
         'io_timeout': request.properties.io_timeout_secs,
         'isolated': {
           'input': request.properties.inputs_ref.isolated,
-          'server': request.properties.inputs_ref.isolatedserver,
           'namespace': request.properties.inputs_ref.namespace,
+          'server': request.properties.inputs_ref.isolatedserver,
         } if request.properties.inputs_ref else None,
-        '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),
       },
     }