[ARVADOS] updated: 5779020e2f38bbc88dc436b33dcaf7dbd8292752
git at public.curoverse.com
git at public.curoverse.com
Fri May 30 21:58:23 EDT 2014
Summary of changes:
.../app/controllers/application_controller.rb | 2 +-
apps/workbench/app/models/arvados_base.rb | 11 +-
.../workbench/app/views/jobs/_show_status.html.erb | 4 +-
.../src/arvados.org/keepclient/keepclient_test.go | 2 +-
sdk/python/arvados/collection.py | 237 ++++++++++--
.../python/arvados/commands/__init__.py | 0
sdk/python/arvados/commands/put.py | 399 +++++++++++++++++++++
sdk/python/arvados/errors.py | 2 +
sdk/python/arvados/keep.py | 84 +++++
sdk/python/bin/arv-put | 215 +----------
sdk/python/setup.py | 4 +-
sdk/python/test_cmdline.py | 81 +++++
sdk/python/tests/arvados_testutil.py | 61 ++++
.../{testdata => tests/data}/1000G_ref_manifest | 0
sdk/python/{testdata => tests/data}/jlake_manifest | 0
sdk/python/{ => tests}/run_test_server.py | 42 ++-
sdk/python/tests/test_arv-put.py | 352 ++++++++++++++++++
sdk/python/{ => tests}/test_collections.py | 309 +++++++++++-----
sdk/python/{ => tests}/test_keep_client.py | 20 +-
sdk/python/tests/test_keep_locator.py | 67 ++++
sdk/python/{ => tests}/test_pipeline_template.py | 0
sdk/python/{ => tests}/test_util.py | 0
sdk/python/{ => tests}/test_websockets.py | 0
.../app/controllers/arvados/v1/nodes_controller.rb | 2 +-
.../arvados/v1/pipeline_instances_controller.rb | 1 +
services/api/app/models/arvados_model.rb | 57 ++-
services/api/app/models/node.rb | 34 +-
services/api/app/models/user.rb | 8 +-
services/api/config/application.yml.example | 10 +-
services/api/test/fixtures/links.yml | 37 ++
.../arvados/v1/collections_controller_test.rb | 14 +
.../functional/arvados/v1/users_controller_test.rb | 2 +
.../test/integration/serialized_encoding_test.rb | 27 ++
services/api/test/unit/arvados_model_test.rb | 44 +++
services/api/test/unit/permission_test.rb | 14 +
services/fuse/run_test_server.py | 1 -
services/fuse/tests/run_test_server.py | 1 +
services/fuse/{ => tests}/test_mount.py | 0
.../src/arvados.org/keepproxy/keepproxy_test.go | 2 +-
39 files changed, 1748 insertions(+), 398 deletions(-)
copy apps/workbench/app/mailers/.gitkeep => sdk/python/arvados/commands/__init__.py (100%)
create mode 100644 sdk/python/arvados/commands/put.py
create mode 100644 sdk/python/test_cmdline.py
create mode 100644 sdk/python/tests/arvados_testutil.py
rename sdk/python/{testdata => tests/data}/1000G_ref_manifest (100%)
rename sdk/python/{testdata => tests/data}/jlake_manifest (100%)
rename sdk/python/{ => tests}/run_test_server.py (91%)
create mode 100644 sdk/python/tests/test_arv-put.py
rename sdk/python/{ => tests}/test_collections.py (68%)
rename sdk/python/{ => tests}/test_keep_client.py (93%)
create mode 100644 sdk/python/tests/test_keep_locator.py
rename sdk/python/{ => tests}/test_pipeline_template.py (100%)
rename sdk/python/{ => tests}/test_util.py (100%)
rename sdk/python/{ => tests}/test_websockets.py (100%)
create mode 100644 services/api/test/integration/serialized_encoding_test.rb
delete mode 120000 services/fuse/run_test_server.py
create mode 120000 services/fuse/tests/run_test_server.py
rename services/fuse/{ => tests}/test_mount.py (100%)
via 5779020e2f38bbc88dc436b33dcaf7dbd8292752 (commit)
via a975c45ec9908660db54b1f22399fc2c43488af5 (commit)
via f8d2097375c2d105b53de18a5ec7afdb7eb36b78 (commit)
via 135f306e75cb61e1153b3590b71c32ef497404ed (commit)
via b6ea1fe3bf38bf28823c80b3aef98239a1c0311b (commit)
via c1e7255a85dfc2807ba78e1cf9d109d896c80b42 (commit)
via b01252252e30851993c25817e07b574be66ce17f (commit)
via 21485541dec5b6df36aaba7d4c2a1e96ba65dec6 (commit)
via 8191d7365a61f4d4309c2f0b387188303320a889 (commit)
via 39b2ed3024860262747fd6622433e0bf7ba39530 (commit)
via 5b15dc0308bd3ddcc3c50828269888b5811d0007 (commit)
via 15cc0bc32eb57c02b566826598c6de2a8587ef9f (commit)
via 3107d80e87c4fd8a4c6f6e06d9a22537bc1f19b0 (commit)
via c7ee5e02cae78d3edff6ed393d776c4995441896 (commit)
via ffe3cdbc8c37e2b4a4e3ea4f67c1c9ca5d81e2ed (commit)
via c5f14dadb8306f55035dc0c54ec2bdd0acbcc705 (commit)
via 3c68bb92a1f59bd762ac02b72f2e11f3296b40c9 (commit)
via 0a4f2421e30dc0ae43908310a3328cc8553d7a76 (commit)
via 8f65fcff76bdc20e5a15368a30b9ce27c262d57f (commit)
via 83b6a3fdd9a0fe432758dd44acf252bbd129a930 (commit)
via 06cf8e35c69540ae44890f8e96961e31cb7fbe66 (commit)
via 347fcb3c09ba4cbcd0385c21b0dd409eebe3b93c (commit)
via 6d23a7362308b808a10b698c84a022287d1668a6 (commit)
via 8b7ea9235e5761beab0dbc92d9c400574f672a15 (commit)
via 8f5755f5ec65da08ffe9dfc6856848ec747a31a8 (commit)
via aa384c3f2d8b7d1782ea059e1eb56c15f542a40c (commit)
via aa3d77be5c99f5f8724fb010336b3379f97985c3 (commit)
via f9eeccd5633231fdd3e4c7b2fb5c694dff137de9 (commit)
via 475f5ad53cfe66375aa14fb28419c5b393cc946e (commit)
via bd7ce9eaf1081f760fe3b13a9b5f3c74dcd44855 (commit)
via 0a5265697a17a6703f89df12f665068817b90fcf (commit)
via 609b941f5f1787ea8380518551b63e259d36c657 (commit)
via d603426ef3b87a1a84e71122cbf8330074d68fef (commit)
via c63dcd2c097233f322e6980815347b0c47f9e5bf (commit)
via 516d43a18765674c2a5d0f0bc2a4a4a789d4c61c (commit)
via 0888e3a31a1af2041e316a2e7b3db74af1cea373 (commit)
via fe85ec515483d95ac36e00e5a411da9c1f76f2de (commit)
via 58a78243026ac9a4569d6cc05bf77045bff7ab20 (commit)
via 283154a1d4ebc745f03abeef96c0571d284d4a70 (commit)
via 91e7c9058bf1f38ad50008a6fd2397c1e15d33eb (commit)
via 5d3b5a301e1087531b087e06e9d8d4607ad66917 (commit)
via 5c6e82a9eec78dea7c3a991aa735cdc5e87c5120 (commit)
via 6c3086d313afba5e37e6949ecb454519b8d042e4 (commit)
via 66db17f904a1591c135a1aa196865d8f53aa7632 (commit)
via bd4eb5f518a3253f7858128419f51e2a1b25f951 (commit)
via 73dd64f9c81989aad456f1aee8f0ad909703b859 (commit)
via 4406d50cdf2ae7b2c3e9846ddcf629ad535cf7fa (commit)
via 601d191c37c7edcaca8a6176eae736982f750a89 (commit)
via ae4db6299b2d255bbc08a4c6fd3e77abcf030fb8 (commit)
via fc2b0d0b96456bd260f2f508c2da10d74aba22f2 (commit)
via 3507e379566beba249c137c5decb062decc24cf2 (commit)
via 29a07d251a7eecd0ae4965ac5113f9de7da4e6b7 (commit)
via 878620a8b1827ed3f58e267a89f76c2dbeaa4b65 (commit)
via f87dd9682c5c1583e7d908cf8ed7fae6e4a53c7a (commit)
via 1ee02554ce8b7ec41264f457897a9309ae3fe1a5 (commit)
via 5cf3dd70bc2f2947ee42afadbced3f3cde81fa16 (commit)
via 8dbe66a50a101509b921e9eba33f5f392ce6eed1 (commit)
via b2812e9406253ded204ac853fb47437e8118bcdd (commit)
via 9d4f6f0284011fbc7a8edd203d1fab93a9a61321 (commit)
via 30b6c5a0f8dc91c76ca30ba4b5263b7eab858bdb (commit)
via 46460c9615f07184ecb9917e4c948635712859da (commit)
via 83304d43227dce877cc86d87f8f25463a4fac096 (commit)
via 6c92a0d8acd0a5525bbe566a3e202b93d498b370 (commit)
via 4ac438924f1e365cf5231140c9640c004ad4f1ff (commit)
from 09d3d4d177810ee9aea235eddbda9306f1aa5b7b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 5779020e2f38bbc88dc436b33dcaf7dbd8292752
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Fri May 30 21:52:49 2014 -0400
2939: Added generic "options" parameter to #create to allow workbench pages to
specify additional parameters to be passed through to the API server.
diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index cf46868..c99960f 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -145,7 +145,7 @@ class ApplicationController < ActionController::Base
@new_resource_attrs ||= params[model_class.to_s.underscore.singularize]
@new_resource_attrs ||= {}
@new_resource_attrs.reject! { |k,v| k.to_s == 'uuid' }
- @object ||= model_class.new @new_resource_attrs
+ @object ||= model_class.new @new_resource_attrs, params["options"]
@object.save!
redirect_to @object
end
diff --git a/apps/workbench/app/models/arvados_base.rb b/apps/workbench/app/models/arvados_base.rb
index f905e0d..76e9967 100644
--- a/apps/workbench/app/models/arvados_base.rb
+++ b/apps/workbench/app/models/arvados_base.rb
@@ -30,8 +30,9 @@ class ArvadosBase < ActiveRecord::Base
end
end
- def initialize raw_params={}
+ def initialize raw_params={}, create_params={}
super self.class.permit_attribute_params(raw_params)
+ @create_params = create_params
@attribute_sortkey ||= {
'id' => nil,
'name' => '000',
diff --git a/apps/workbench/app/views/jobs/_show_status.html.erb b/apps/workbench/app/views/jobs/_show_status.html.erb
index 5ff39fa..f4e8fa9 100644
--- a/apps/workbench/app/views/jobs/_show_status.html.erb
+++ b/apps/workbench/app/views/jobs/_show_status.html.erb
@@ -8,7 +8,7 @@ Re-run job using version:
<% [:script_parameters, :runtime_constraints].each do |d| %>
<%= hidden_field :job, d, :value => Oj.dump(@object[d]) %>
<% end %>
-<%= hidden_field :job, :no_reuse, :value => true %>
+<%= hidden_field :options, :no_reuse, :value => true %>
<%= button_tag "Same (#{@object.script_version.slice 0,8}...)", {class: 'btn btn-primary', id: "run-pipeline-button"} %>
<% end %>
@@ -20,7 +20,7 @@ Re-run job using version:
<% [:script_parameters, :runtime_constraints].each do |d| %>
<%= hidden_field :job, d, :value => Oj.dump(@object[d]) %>
<% end %>
-<%= hidden_field :job, :no_reuse, :value => true %>
+<%= hidden_field :options, :no_reuse, :value => true %>
<%= button_tag "Latest (#{@object.supplied_script_version})", {class: 'btn btn-primary', id: "run-pipeline-button"} %>
<% end %>
</div>
commit a975c45ec9908660db54b1f22399fc2c43488af5
Merge: 09d3d4d f8d2097
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Fri May 30 21:02:59 2014 -0400
Merge remote-tracking branch 'refs/remotes/origin/2939-create-params' into origin-2939-re-run-job-button
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list