From ddce4f6de6f0a77b45e9f3358eb6f0c1f1870fba Mon Sep 17 00:00:00 2001 From: radhika Date: Wed, 16 Nov 2016 11:40:55 -0500 Subject: [PATCH] 10290: scheduling_parameters added to container_requests controller. --- .../v1/container_requests_controller.rb | 1 + .../v1/container_requests_controller_test.rb | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 services/api/test/functional/arvados/v1/container_requests_controller_test.rb 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 6e2848ceb5..ed04a4ba8f 100644 --- 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 index 0000000000..e54e15d311 --- /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 -- 2.30.2