put back :find_object_by_uuid in virtual_machines controller

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

diff --git a/services/api/app/models/node.rb b/services/api/app/models/node.rb
index 725344d826d354bd3baf4342576ccd7dd993835f..7dd6f9a7089c16d254679c5b96f5c9bb58c1f60f 100644 (file)
--- a/services/api/app/models/node.rb
+++ b/services/api/app/models/node.rb
@@ -1,4 +1,4 @@
-class Node < OrvosModel
+class Node < ArvadosModel
   include AssignUuid
   include KindAndEtag
   include CommonApiTemplate
@@ -25,6 +25,7 @@ class Node < OrvosModel
     t.add :first_ping_at
     t.add :last_ping_at
     t.add :info
+    t.add :slot_number
     t.add :status
     t.add lambda { |x| @@nameservers }, :as => :nameservers
   end
@@ -61,7 +62,7 @@ class Node < OrvosModel
     end
     self.last_ping_at = Time.now
 
-    @bypass_orvos_authorization = true
+    @bypass_arvados_authorization = true
 
     # Record IP address
     if self.ip_address.nil?
@@ -184,7 +185,7 @@ class Node < OrvosModel
   end
 
   def permission_to_update
-    @bypass_orvos_authorization or super
+    @bypass_arvados_authorization or super
   end
 
   def permission_to_create