10290: scheduling_parameters added to container_requests controller.

diff --git a/services/api/app/controllers/arvados/v1/container_requests_controller.rb b/services/api/app/controllers/arvados/v1/container_requests_controller.rb
index 6e2848ceb53f34165379e3f1afa539d67dbb5651..ed04a4ba8f71c148d424db545c5d9bd7ddc69a7c 100644 (file)
--- a/services/api/app/controllers/arvados/v1/container_requests_controller.rb
+++ b/services/api/app/controllers/arvados/v1/container_requests_controller.rb
@@ -4,4 +4,5 @@ class Arvados::V1::ContainerRequestsController < ApplicationController
   accept_attribute_as_json :runtime_constraints, Hash
   accept_attribute_as_json :command, Array
   accept_attribute_as_json :filters, Array
+  accept_attribute_as_json :scheduling_parameters, Hash
 end

diff --git a/services/api/test/functional/arvados/v1/container_requests_controller_test.rb b/services/api/test/functional/arvados/v1/container_requests_controller_test.rb
new file mode 100644 (file)
index 0000000..e54e15d
--- /dev/null
+++ b/services/api/test/functional/arvados/v1/container_requests_controller_test.rb
@@ -0,0 +1,22 @@
+require 'test_helper'
+
+class Arvados::V1::ContainerRequestsControllerTest < ActionController::TestCase
+  test 'create with scheduling parameters' do
+    authorize_with :system_user
+
+    sp = {'partitions' => ['test1', 'test2']}
+    post :create, {
+      container_request: {
+        command: ['echo', 'hello'],
+        container_image: 'test',
+        output_path: 'test',
+        scheduling_parameters: sp,
+      },
+    }
+    assert_response :success
+
+    cr = JSON.parse(@response.body)
+    assert_not_nil cr, 'Expected container request'
+    assert_equal sp, cr['scheduling_parameters']
+  end
+end