Displaying 5 results from an estimated 5 matches for "include_pool".
2009 Jul 06
0
[PATCH server] UI for accumulated uptime for VMs. (revised2)
...ndex 9d1074a..87f07f5 100644
--- a/src/app/controllers/resources_controller.rb
+++ b/src/app/controllers/resources_controller.rb
@@ -63,7 +63,9 @@ class ResourcesController < PoolController
def vms_json
svc_show(params[:id])
- super(:full_items => @pool.vms, :find_opts => {}, :include_pool => :true)
+ super(:full_items => @pool.vms,
+ :find_opts => {:select => Vm.calc_uptime},
+ :include_pool => :true)
end
def delete
diff --git a/src/app/controllers/smart_pools_controller.rb b/src/app/controllers/smart_pools_controller.rb
index 8762ac0..131...
2009 Jul 02
1
[PATCH server] UI for accumulated uptime for VMs. (revised)
...ndex 9d1074a..87f07f5 100644
--- a/src/app/controllers/resources_controller.rb
+++ b/src/app/controllers/resources_controller.rb
@@ -63,7 +63,9 @@ class ResourcesController < PoolController
def vms_json
svc_show(params[:id])
- super(:full_items => @pool.vms, :find_opts => {}, :include_pool => :true)
+ super(:full_items => @pool.vms,
+ :find_opts => {:select => Vm.calc_uptime},
+ :include_pool => :true)
end
def delete
diff --git a/src/app/controllers/smart_pools_controller.rb b/src/app/controllers/smart_pools_controller.rb
index 8762ac0..b35...
2009 Jul 06
2
[PATCH server] UI for accumulated uptime for VMs. (revised3)
...ndex 9d1074a..87f07f5 100644
--- a/src/app/controllers/resources_controller.rb
+++ b/src/app/controllers/resources_controller.rb
@@ -63,7 +63,9 @@ class ResourcesController < PoolController
def vms_json
svc_show(params[:id])
- super(:full_items => @pool.vms, :find_opts => {}, :include_pool => :true)
+ super(:full_items => @pool.vms,
+ :find_opts => {:select => Vm.calc_uptime},
+ :include_pool => :true)
end
def delete
diff --git a/src/app/controllers/smart_pools_controller.rb b/src/app/controllers/smart_pools_controller.rb
index 8762ac0..131...
2009 Jun 29
3
[PATCH server] UI for accumulated uptime for VMs.
...dex 9d1074a..7188db8 100644
--- a/src/app/controllers/resources_controller.rb
+++ b/src/app/controllers/resources_controller.rb
@@ -63,7 +63,12 @@ class ResourcesController < PoolController
def vms_json
svc_show(params[:id])
- super(:full_items => @pool.vms, :find_opts => {}, :include_pool => :true)
+ super(:full_items => @pool.vms, :find_opts => {:select => "*, case
+ when state='running' then
+ (cast(total_uptime || ' sec' as interval) +
+ (now() - total_uptime_timestamp))
+ else cast(total_uptime || ' sec...
2009 May 22
1
[PATCH server] fixed smart pool 'save' regression.
...rc/app/controllers/resources_controller.rb
index efd3cb6..9d1074a 100644
--- a/src/app/controllers/resources_controller.rb
+++ b/src/app/controllers/resources_controller.rb
@@ -66,12 +66,6 @@ class ResourcesController < PoolController
super(:full_items => @pool.vms, :find_opts => {}, :include_pool => :true)
end
- def additional_create_params
- {:parent_id => (params[:hardware_pool] ?
- params[:hardware_pool][:parent_id] :
- params[:parent_id])}
- end
-
def delete
vm_pool_ids = params[:vm_pool_ids].split(",")
success...