13098: 12199: Fix hostname assigned but not saved.

[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 7ee8c2f149e590dea892ee6723fe42b5450b29c3..a2b22ea7f6c55709dff9d745368cbbe46bed5669 100644 (file)
--- a/services/api/app/controllers/arvados/v1/nodes_controller.rb
+++ b/services/api/app/controllers/arvados/v1/nodes_controller.rb
@@ -9,15 +9,38 @@ class Arvados::V1::NodesController < ApplicationController
 
   include DbCurrentTime
 
+  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
-    super
-  end
-
-  def self._ping_requires_parameters
-    { ping_secret: {required: true} }
+    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