projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2934: add "bar" repository to test fixture
[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 612696b89b5d611bb9a157ee00b6c3608bc10973..da421ebb4cb92f13369a4517ef80583642d54844 100644
(file)
--- a/
services/api/app/models/keep_disk.rb
+++ b/
services/api/app/models/keep_disk.rb
@@
-37,10
+37,7
@@
class KeepDisk < ArvadosModel
@bypass_arvados_authorization = true
self.update_attributes!(o.select { |k,v|
@bypass_arvados_authorization = true
self.update_attributes!(o.select { |k,v|
- [:service_host,
- :service_port,
- :service_ssl_flag,
- :bytes_total,
+ [:bytes_total,
:bytes_free,
:is_readable,
:is_writable,
:bytes_free,
:is_readable,
:is_writable,
@@
-51,21
+48,15
@@
class KeepDisk < ArvadosModel
end
def service_host
end
def service_host
- KeepService.where(uuid: self.keep_service_uuid) do |k|
- return k.service_host
- end
+ KeepService.find_by_uuid(self.keep_service_uuid).andand.service_host
end
def service_port
end
def service_port
- KeepService.where(uuid: self.keep_service_uuid) do |k|
- return k.service_port
- end
+ KeepService.find_by_uuid(self.keep_service_uuid).andand.service_port
end
def service_ssl_flag
end
def service_ssl_flag
- KeepService.where(uuid: self.keep_service_uuid) do |k|
- return k.service_ssl_flag
- end
+ KeepService.find_by_uuid(self.keep_service_uuid).andand.service_ssl_flag
end
protected
end
protected