Merge branch 'master' into origin-2608-websocket-event-bus-alt2

[arvados.git] / services / api / app / models / keep_disk.rb

diff --git a/services/api/app/models/keep_disk.rb b/services/api/app/models/keep_disk.rb
index b705f0b411f9094261af037320cada133f49c87c..77fc6278eba531f6baa1acf997044aaf893121c6 100644 (file)
--- a/services/api/app/models/keep_disk.rb
+++ b/services/api/app/models/keep_disk.rb
@@ -4,10 +4,9 @@ class KeepDisk < ArvadosModel
   include CommonApiTemplate
   before_validation :ensure_ping_secret
 
-  api_accessible :superuser, :extend => :common do |t|
+  api_accessible :user, extend: :common do |t|
     t.add :node_uuid
     t.add :filesystem_uuid
-    t.add :ping_secret
     t.add :bytes_total
     t.add :bytes_free
     t.add :is_readable
@@ -15,6 +14,16 @@ class KeepDisk < ArvadosModel
     t.add :last_read_at
     t.add :last_write_at
     t.add :last_ping_at
+    t.add :service_host
+    t.add :service_port
+    t.add :service_ssl_flag
+  end
+  api_accessible :superuser, :extend => :user do |t|
+    t.add :ping_secret
+  end
+
+  def foreign_key_attributes
+    super.reject { |a| a == "filesystem_uuid" }
   end
 
   def ping(o)
@@ -26,7 +35,7 @@ class KeepDisk < ArvadosModel
     end
 
     @bypass_arvados_authorization = true
-    self.update_attributes(o.select { |k,v|
+    self.update_attributes!(o.select { |k,v|
                              [:service_host,
                               :service_port,
                               :service_ssl_flag,