Merge branch '15694-cwl-hang' closes #15694

[arvados.git] / services / api / app / controllers / arvados / v1 / nodes_controller.rb

diff --git a/services/api/app/controllers/arvados/v1/nodes_controller.rb b/services/api/app/controllers/arvados/v1/nodes_controller.rb
index 023d2ff888a8d2f15818c90e62388c7ab183a713..eb72b7096de8776b7d930739417d9d50dab789f9 100644 (file)
--- a/services/api/app/controllers/arvados/v1/nodes_controller.rb
+++ b/services/api/app/controllers/arvados/v1/nodes_controller.rb
@@ -1,21 +1,48 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 class Arvados::V1::NodesController < ApplicationController
-  skip_before_filter :require_auth_scope, :only => :ping
-  skip_before_filter :find_object_by_uuid, :only => :ping
-  skip_before_filter :render_404_if_no_object, :only => :ping
+  skip_before_action :require_auth_scope, :only => :ping
+  skip_before_action :find_object_by_uuid, :only => :ping
+  skip_before_action :render_404_if_no_object, :only => :ping
 
   include DbCurrentTime
 
-  def update
-    if resource_attrs[:job_uuid]
-      @object.job_readable = readable_job_uuids(resource_attrs[:job_uuid]).any?
-    end
-    super
-  end
-
   def self._ping_requires_parameters
     { ping_secret: {required: true} }
   end
 
+  def self._create_requires_parameters
+    super.merge(
+      { assign_slot: {required: false, type: 'boolean', description: 'assign slot and hostname'} })
+  end
+
+  def self._update_requires_parameters
+    super.merge(
+      { assign_slot: {required: false, type: 'boolean', description: 'assign slot and hostname'} })
+  end
+
+  def create
+    @object = model_class.new(resource_attrs)
+    @object.assign_slot if params[:assign_slot]
+    @object.save!
+    show
+  end
+
+  def update
+    if resource_attrs[:job_uuid].is_a? String
+      @object.job_readable = readable_job_uuids([resource_attrs[:job_uuid]]).any?
+    end
+    attrs_to_update = resource_attrs.reject { |k,v|
+      [:kind, :etag, :href].index k
+    }
+    @object.update_attributes!(attrs_to_update)
+    @object.assign_slot if params[:assign_slot]
+    @object.save!
+    show
+  end
+
   def ping
     act_as_system_user do
       @object = Node.where(uuid: (params[:id] || params[:uuid])).first
@@ -49,7 +76,7 @@ class Arvados::V1::NodesController < ApplicationController
     if @select.nil? or @select.include? 'job_uuid'
       job_uuids = @objects.map { |n| n[:job_uuid] }.compact
       assoc_jobs = readable_job_uuids(job_uuids)
-      @objects = @objects.each do |node|
+      @objects.each do |node|
         node.job_readable = assoc_jobs.include?(node[:job_uuid])
       end
     end
@@ -57,7 +84,7 @@ class Arvados::V1::NodesController < ApplicationController
 
   protected
 
-  def readable_job_uuids(*uuids)
+  def readable_job_uuids(uuids)
     Job.readable_by(*@read_users).select(:uuid).where(uuid: uuids).map(&:uuid)
   end
 end