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

remove 'last minute' tcp vm_ready check from the api for pooled vms

Browse source 
the vm_ready methods should be implemented per provider and checking in the api
creates issues since provider code is not available. Removing this for the V2 api
This commit is contained in:
Samuel Beaulieu 2022-03-29 12:01:17 -05:00
parent dd375b20c3
commit a2d613782a
No known key found for this signature in database
GPG key ID: 12030F74136D0F34
4 changed files with 9 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

3
spec/integration/api/v1/vm_spec.rb
View file

@ -124,8 +124,7 @@ describe Vmpooler::API::V1 do
end
it 'returns 503 for empty pool referenced by alias' do
create_ready_vm 'pool1', vmname, redis
post "#{prefix}/vm/poolone"
create_ready_vm 'pool2', vmname, redis
post "#{prefix}/vm/poolone"
expected = { ok: false }

25
spec/integration/api/v2/vm_spec.rb
View file

@ -129,8 +129,7 @@ describe Vmpooler::API::V2 do
end
it 'returns 503 for empty pool referenced by alias' do
create_ready_vm 'pool1', vmname, redis
post "#{prefix}/vm/poolone"
create_ready_vm 'pool2', vmname, redis
post "#{prefix}/vm/poolone"
expected = { ok: false }
@ -342,28 +341,6 @@ describe Vmpooler::API::V2 do
expect(pool_has_ready_vm?('pool1', '2abcdefghijklmnop', redis)).to eq(true)
end
it 'returns the second VM when the first fails to respond' do
create_ready_vm 'pool1', vmname, redis
create_ready_vm 'pool1', "2#{vmname}", redis
allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).with(vmname, 'one.example.com').and_raise('mockerror')
allow_any_instance_of(Vmpooler::API::Helpers).to receive(:open_socket).with("2#{vmname}", 'one.example.com').and_return(socket)
post "#{prefix}/vm", '{"pool1":"1"}'
expect_json(ok = true, http = 200)
expected = {
ok: true,
pool1: {
hostname: "2#{vmname}.one.example.com"
}
}
expect(last_response.body).to eq(JSON.pretty_generate(expected))
expect(pool_has_ready_vm?('pool1', vmname, redis)).to be false
end
context '(auth not configured)' do
it 'does not extend VM lifetime if auth token is provided' do
app.settings.set :config, auth: false

4
spec/integration/api/v2/vm_template_spec.rb
View file

@ -28,7 +28,7 @@ describe Vmpooler::API::V2 do
pools: [
{'name' => 'pool1', 'size' => 5},
{'name' => 'pool2', 'size' => 10},
{'name' => 'poolone', 'size' => 0}
{'name' => 'poolone', 'size' => 1}
],
statsd: { 'prefix' => 'stats_prefix'},
alias: { 'poolone' => 'pool1' },
@ -105,7 +105,7 @@ describe Vmpooler::API::V2 do
end
it 'returns 503 for empty pool referenced by alias' do
create_ready_vm 'pool1', 'abcdefghijklmnop', redis
create_ready_vm 'pool2', 'abcdefghijklmnop', redis
post "#{prefix}/vm/poolone"
expected = { ok: false }