puppetlabs/vmpooler
2
0
Fork 0
mirror of https://github.com/puppetlabs/vmpooler.git synced 2026-01-26 10:08:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into name_change

Browse source 
Conflicts:
	vmpooler-api
This commit is contained in:
Scott Schneider 2014-03-04 17:59:26 -08:00
commit 6e8e61e0e7
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
vmpooler-api
View file

@ -38,7 +38,7 @@ get '/' do
} }
end end
get '/dashboard/stats/vmpooler/numbers' do get '/dashboard/stats/vmpooler/numbers/?' do
result = Hash.new result = Hash.new
result['pending'] = 0 result['pending'] = 0
result['cloning'] = 0 result['cloning'] = 0
@ -63,7 +63,7 @@ get '/dashboard/stats/vmpooler/numbers' do
JSON.pretty_generate(result) JSON.pretty_generate(result)
end end
get '/dashboard/stats/vmpooler/pool' do get '/dashboard/stats/vmpooler/pool/?' do
result = Hash.new result = Hash.new
$config[:pools].each do |pool| $config[:pools].each do |pool|
@ -115,7 +115,7 @@ get '/dashboard/stats/vmpooler/pool' do
JSON.pretty_generate(result) JSON.pretty_generate(result)
end end
get '/dashboard/stats/vmpooler/running' do get '/dashboard/stats/vmpooler/running/?' do
result = Hash.new result = Hash.new
$config[:pools].each do |pool| $config[:pools].each do |pool|
@ -164,7 +164,7 @@ get '/dashboard/stats/vmpooler/running' do
JSON.pretty_generate(result) JSON.pretty_generate(result)
end end
get '/vm' do get '/vm/?' do
content_type :json content_type :json
result = [] result = []
@ -176,7 +176,7 @@ get '/vm' do
JSON.pretty_generate(result) JSON.pretty_generate(result)
end end
get '/vm/:template' do get '/vm/:template/?' do
content_type :json content_type :json
result = {} result = {}
@ -186,7 +186,7 @@ get '/vm/:template' do
JSON.pretty_generate(result) JSON.pretty_generate(result)
end end
post '/vm/:template' do post '/vm/:template/?' do
content_type :json content_type :json
result = {} result = {}
@ -211,7 +211,7 @@ post '/vm/:template' do
JSON.pretty_generate(result) JSON.pretty_generate(result)
end end
delete '/vm/:hostname' do delete '/vm/:hostname/?' do
content_type :json content_type :json
result = {} result = {}