I've added pool data for the two columns.
---
src/app/models/pool.rb | 29 ++++++++++++++------------
src/app/views/pool_families/index.html.haml | 4 +-
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb
index a6b4e2c..5136e78 100644
--- a/src/app/models/pool.rb
+++ b/src/app/models/pool.rb
@@ -85,19 +85,22 @@ class Pool < ActiveRecord::Base
def statistics
# TODO - Need to set up cache invalidation before this is safe
#Rails.cache.fetch("pool-#{id}-statistics") do
- {
- :cloud_providers => instances.collect{|i| i.provider_account}.uniq.count,
- :deployments => deployments.count,
- :total_instances => (instances.deployed.count +
- instances.pending.count + instances.failed.count),
- :instances_deployed => instances.deployed.count,
- :instances_pending => instances.pending.count,
- :instances_failed => instances.failed.count,
- :used_quota => quota.running_instances,
- :quota_percent => number_to_percentage(quota.percentage_used,
- :precision => 0),
- :available_quota => quota.maximum_running_instances
- }
+ max = quota.maximum_running_instances
+ total = quota.running_instances
+ avail = max - total unless max.nil?
+ statistics = {
+ :cloud_providers => instances.collect{|i| i.provider_account}.uniq.count,
+ :deployments => deployments.count,
+ :total_instances => (instances.deployed.count +
+ instances.pending.count + instances.failed.count),
+ :instances_deployed => instances.deployed.count,
+ :instances_pending => instances.pending.count,
+ :instances_failed => instances.failed.count,
+ :used_quota => quota.running_instances,
+ :quota_percent => number_to_percentage(quota.percentage_used,
+ :precision => 0),
+ :available_quota => avail
+ }
#end
end
diff --git a/src/app/views/pool_families/index.html.haml
b/src/app/views/pool_families/index.html.haml
index b370cb8..3cc1061 100644
--- a/src/app/views/pool_families/index.html.haml
+++ b/src/app/views/pool_families/index.html.haml
@@ -39,7 +39,7 @@
%td= pool.statistics[:instances_pending]
%td= pool.statistics[:instances_failed]
%td= pool.statistics[:quota_percent]
- %td
- %td
+ %td= pool.statistics[:used_quota]
+ %td= pool.statistics[:available_quota].nil? ? raw('∞') :
pool.statistics[:available_quota]
%td= link_to pool.catalogs.first.name, catalog_path(pool.catalogs.first) if
pool.catalogs.any?
%td= link_to 'Edit', edit_pool_path(pool), :class =>
'rounded-link'
--
1.7.6.2
_______________________________________________
aeolus-devel mailing list
aeolus-devel(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/aeolus-devel