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

Remove duplicate (nested) "ok" responses

Browse source 
As we approach an "official" v1.0.0 of the API I'd like to remove some old
nested "ok" responses.  These were left in as the Beaker vmpooler
hypervisor used them, but I long-ago patched that code and I think it's
time to deprecate these.
This commit is contained in:
Scott Schneider 2015-08-21 13:54:56 -07:00
parent f7ad3bb7e8
commit 906ae89987
2 changed files with 0 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/vmpooler/api/v1.rb
View file

@ -295,8 +295,6 @@ module Vmpooler
jdata.each do |key, val| jdata.each do |key, val|
result[key] ||= {} result[key] ||= {}
result[key]['ok'] = true ##
val.to_i.times do |_i| val.to_i.times do |_i|
vm = backend.spop('vmpooler__ready__' + key) vm = backend.spop('vmpooler__ready__' + key)
@ -320,8 +318,6 @@ module Vmpooler
result[key] ||= {} result[key] ||= {}
result[key]['ok'] = true ##
if result[key]['hostname'] if result[key]['hostname']
result[key]['hostname'] = [result[key]['hostname']] unless result[key]['hostname'].is_a?(Array) result[key]['hostname'] = [result[key]['hostname']] unless result[key]['hostname'].is_a?(Array)
result[key]['hostname'].push(vm) result[key]['hostname'].push(vm)
@ -329,8 +325,6 @@ module Vmpooler
result[key]['hostname'] = vm result[key]['hostname'] = vm
end end
else else
result[key]['ok'] = false ##
status 503 status 503
result['ok'] = false result['ok'] = false
end end
@ -373,8 +367,6 @@ module Vmpooler
params[:template].split('+').each do |template| params[:template].split('+').each do |template|
result[template] ||= {} result[template] ||= {}
result[template]['ok'] = true ##
vm = backend.spop('vmpooler__ready__' + template) vm = backend.spop('vmpooler__ready__' + template)
unless vm.nil? unless vm.nil?
@ -404,8 +396,6 @@ module Vmpooler
result[template]['hostname'] = vm result[template]['hostname'] = vm
end end
else else
result[template]['ok'] = false ##
status 503 status 503
result['ok'] = false result['ok'] = false
end end

6
spec/vmpooler/api/v1_spec.rb
View file

@ -213,7 +213,6 @@ describe Vmpooler::API::V1 do
expected = { expected = {
ok: true, ok: true,
pool1: { pool1: {
ok: true,
hostname: 'abcdefghijklmnop' hostname: 'abcdefghijklmnop'
} }
} }
@ -229,11 +228,9 @@ describe Vmpooler::API::V1 do
expected = { expected = {
ok: true, ok: true,
pool1: { pool1: {
ok: true,
hostname: 'abcdefghijklmnop' hostname: 'abcdefghijklmnop'
}, },
pool2: { pool2: {
ok: true,
hostname: 'qrstuvwxyz012345' hostname: 'qrstuvwxyz012345'
} }
} }
@ -256,7 +253,6 @@ describe Vmpooler::API::V1 do
expected = { expected = {
ok: true, ok: true,
pool1: { pool1: {
ok: true,
hostname: 'abcdefghijklmnop' hostname: 'abcdefghijklmnop'
} }
} }
@ -280,7 +276,6 @@ describe Vmpooler::API::V1 do
expected = { expected = {
ok: true, ok: true,
pool1: { pool1: {
ok: true,
hostname: 'abcdefghijklmnop' hostname: 'abcdefghijklmnop'
} }
} }
@ -298,7 +293,6 @@ describe Vmpooler::API::V1 do
expected = { expected = {
ok: true, ok: true,
pool1: { pool1: {
ok: true,
hostname: 'abcdefghijklmnop' hostname: 'abcdefghijklmnop'
} }
} }