Merge branch 'api_improvements'

This commit is contained in:
Scott Schneider 2014-02-14 13:01:58 -08:00
commit c88961a76f

View file

@ -163,17 +163,13 @@ get '/dashboard/stats/vcloud/running' do
JSON.pretty_generate(result) JSON.pretty_generate(result)
end end
get '/status' do get '/vm' do
content_type :json content_type :json
result = {} result = []
pools.each do |pool| pools.each do |pool|
result[pool['name']] = {} result.push(pool['name'])
result[pool['name']]['size'] = pool['size']
[ 'pending', 'ready', 'completed' ].each do |queue|
result[pool['name']][queue] = $redis.scard("vmware_host_pool__#{queue}__#{pool['name']}")
end
end end
JSON.pretty_generate(result) JSON.pretty_generate(result)