Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(937)

Unified Diff: appengine/swarming/message_conversion.py

Issue 1939343002: swarming: change meaning of inputs_ref (Closed) Base URL: https://chromium.googlesource.com/external/github.com/luci/luci-py@master
Patch Set: nit Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: appengine/swarming/message_conversion.py
diff --git a/appengine/swarming/message_conversion.py b/appengine/swarming/message_conversion.py
index 03ea712c35eb44e5d3838a4a8b069898cf169eff..399d2b65798d7a1ce70a4c6af87c6e0e02997c67 100644
--- a/appengine/swarming/message_conversion.py
+++ b/appengine/swarming/message_conversion.py
@@ -102,10 +102,17 @@ def bot_event_to_rpc(entity):
def task_request_to_rpc(entity):
""""Returns a swarming_rpcs.TaskRequest from a task_request.TaskRequest."""
assert entity.__class__ is task_request.TaskRequest
+
inputs_ref = None
if entity.properties.inputs_ref:
inputs_ref = _ndb_to_rpc(
swarming_rpcs.FilesRef, entity.properties.inputs_ref)
+
+ outputs_target = None
+ if entity.properties.outputs_target:
+ outputs_target = _ndb_to_rpc(
+ swarming_rpcs.IsolatedOutputsTarget, entity.properties.outputs_target)
+
props = entity.properties
cmd = None
if props.commands:
@@ -119,6 +126,7 @@ def task_request_to_rpc(entity):
dimensions=_string_pairs_from_dict(props.dimensions),
env=_string_pairs_from_dict(props.env),
inputs_ref=inputs_ref,
+ outputs_target=outputs_target,
packages=[
_ndb_to_rpc(swarming_rpcs.CipdPackage, p) for p in props.packages
])
@@ -136,9 +144,16 @@ def new_task_request_from_rpc(msg, now):
props = msg.properties
if not props:
raise ValueError('properties is required')
+
inputs_ref = None
if props.inputs_ref:
inputs_ref = _rpc_to_ndb(task_request.FilesRef, props.inputs_ref)
+
+ outputs_target = None
+ if props.outputs_target:
+ outputs_target = _rpc_to_ndb(
+ task_request.IsolatedOutputsTarget, props.outputs_target)
+
properties = _rpc_to_ndb(
task_request.TaskProperties,
props,
@@ -149,6 +164,7 @@ def new_task_request_from_rpc(msg, now):
dimensions={i.key: i.value for i in props.dimensions},
env={i.key: i.value for i in props.env},
inputs_ref=inputs_ref,
+ outputs_target=outputs_target,
packages=[
_rpc_to_ndb(task_request.CipdPackage, p) for p in props.packages
])

Powered by Google App Engine
This is Rietveld 408576698