mirror of
https://github.com/puppetlabs/vmpooler.git
synced 2026-01-27 02:18:41 -05:00
(maint) rename create_vm -> create_ready_vm
This commit is contained in:
parent
4d6368a42d
commit
5c2c18ac44
3 changed files with 19 additions and 15 deletions
|
|
@ -27,10 +27,14 @@ def token_exists?(token)
|
|||
result && !result.empty?
|
||||
end
|
||||
|
||||
def create_vm(template, name)
|
||||
def create_ready_vm(template, name)
|
||||
redis.sadd('vmpooler__ready__' + template, name)
|
||||
end
|
||||
|
||||
def create_vm(name)
|
||||
redis.hset("vmpooler__vm__#{name}", 'checkout', Time.now)
|
||||
end
|
||||
|
||||
def fetch_vm(vm)
|
||||
redis.hgetall("vmpooler__vm__#{vm}")
|
||||
end
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ describe Vmpooler::API::V1 do
|
|||
describe 'POST /vm' do
|
||||
it 'returns a single VM' do
|
||||
clear_pool 'pool1'
|
||||
create_vm 'pool1', 'abcdefghijklmnop'
|
||||
create_ready_vm 'pool1', 'abcdefghijklmnop'
|
||||
|
||||
post "#{prefix}/vm", '{"pool1":"1"}'
|
||||
expect_json(ok = true, http = 200)
|
||||
|
|
@ -70,7 +70,7 @@ describe Vmpooler::API::V1 do
|
|||
|
||||
it 'returns a single VM for an alias' do
|
||||
clear_pool 'pool1'
|
||||
create_vm 'pool1', 'abcdefghijklmnop'
|
||||
create_ready_vm 'pool1', 'abcdefghijklmnop'
|
||||
|
||||
post "#{prefix}/vm", '{"poolone":"1"}'
|
||||
expect_json(ok = true, http = 200)
|
||||
|
|
@ -94,8 +94,8 @@ describe Vmpooler::API::V1 do
|
|||
|
||||
it 'returns multiple VMs' do
|
||||
clear_pool 'pool1'
|
||||
create_vm 'pool1', 'abcdefghijklmnop'
|
||||
create_vm 'pool2', 'qrstuvwxyz012345'
|
||||
create_ready_vm 'pool1', 'abcdefghijklmnop'
|
||||
create_ready_vm 'pool2', 'qrstuvwxyz012345'
|
||||
|
||||
post "#{prefix}/vm", '{"pool1":"1","pool2":"1"}'
|
||||
expect_json(ok = true, http = 200)
|
||||
|
|
@ -118,7 +118,7 @@ describe Vmpooler::API::V1 do
|
|||
app.settings.set :config, auth: false
|
||||
|
||||
clear_pool 'pool1'
|
||||
create_vm 'pool1', 'abcdefghijklmnop'
|
||||
create_ready_vm 'pool1', 'abcdefghijklmnop'
|
||||
|
||||
post "#{prefix}/vm", '{"pool1":"1"}', {
|
||||
'HTTP_X_AUTH_TOKEN' => 'abcdefghijklmnopqrstuvwxyz012345'
|
||||
|
|
@ -143,7 +143,7 @@ describe Vmpooler::API::V1 do
|
|||
app.settings.set :config, auth: true
|
||||
|
||||
clear_pool 'pool1'
|
||||
create_vm 'pool1', 'abcdefghijklmnop'
|
||||
create_ready_vm 'pool1', 'abcdefghijklmnop'
|
||||
|
||||
post "#{prefix}/vm", '{"pool1":"1"}', {
|
||||
'HTTP_X_AUTH_TOKEN' => 'abcdefghijklmnopqrstuvwxyz012345'
|
||||
|
|
@ -165,7 +165,7 @@ describe Vmpooler::API::V1 do
|
|||
it 'does not extend VM lifetime if auth token is not provided' do
|
||||
app.settings.set :config, auth: true
|
||||
clear_pool 'pool1'
|
||||
create_vm 'pool1', 'abcdefghijklmnop'
|
||||
create_ready_vm 'pool1', 'abcdefghijklmnop'
|
||||
|
||||
post "#{prefix}/vm", '{"pool1":"1"}'
|
||||
expect_json(ok = true, http = 200)
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ describe Vmpooler::API::V1 do
|
|||
describe 'POST /vm/:template' do
|
||||
it 'returns a single VM' do
|
||||
clear_pool 'pool1'
|
||||
create_vm 'pool1', 'abcdefghijklmnop'
|
||||
create_ready_vm 'pool1', 'abcdefghijklmnop'
|
||||
|
||||
post "#{prefix}/vm/pool1", ''
|
||||
expect_json(ok = true, http = 200)
|
||||
|
|
@ -70,7 +70,7 @@ describe Vmpooler::API::V1 do
|
|||
|
||||
it 'returns a single VM for an alias' do
|
||||
clear_pool 'pool1'
|
||||
create_vm 'pool1', 'abcdefghijklmnop'
|
||||
create_ready_vm 'pool1', 'abcdefghijklmnop'
|
||||
|
||||
post "#{prefix}/vm/poolone", ''
|
||||
|
||||
|
|
@ -94,8 +94,8 @@ describe Vmpooler::API::V1 do
|
|||
|
||||
it 'returns multiple VMs' do
|
||||
clear_pool 'pool1'
|
||||
create_vm 'pool1', 'abcdefghijklmnop'
|
||||
create_vm 'pool2', 'qrstuvwxyz012345'
|
||||
create_ready_vm 'pool1', 'abcdefghijklmnop'
|
||||
create_ready_vm 'pool2', 'qrstuvwxyz012345'
|
||||
|
||||
post "#{prefix}/vm/pool1+pool2", ''
|
||||
expect_json(ok = true, http = 200)
|
||||
|
|
@ -118,7 +118,7 @@ describe Vmpooler::API::V1 do
|
|||
app.settings.set :config, auth: true
|
||||
|
||||
clear_pool 'pool1'
|
||||
create_vm 'pool1', 'abcdefghijklmnop'
|
||||
create_ready_vm 'pool1', 'abcdefghijklmnop'
|
||||
|
||||
post "#{prefix}/vm/pool1", '', {
|
||||
'HTTP_X_AUTH_TOKEN' => 'abcdefghijklmnopqrstuvwxyz012345'
|
||||
|
|
@ -141,7 +141,7 @@ describe Vmpooler::API::V1 do
|
|||
app.settings.set :config, auth: true
|
||||
|
||||
clear_pool 'pool1'
|
||||
create_vm 'pool1', 'abcdefghijklmnop'
|
||||
create_ready_vm 'pool1', 'abcdefghijklmnop'
|
||||
|
||||
post "#{prefix}/vm/pool1", '', {
|
||||
'HTTP_X_AUTH_TOKEN' => 'abcdefghijklmnopqrstuvwxyz012345'
|
||||
|
|
@ -163,7 +163,7 @@ describe Vmpooler::API::V1 do
|
|||
it 'does not extend VM lifetime if auth token is not provided' do
|
||||
app.settings.set :config, auth: true
|
||||
clear_pool 'pool1'
|
||||
create_vm 'pool1', 'abcdefghijklmnop'
|
||||
create_ready_vm 'pool1', 'abcdefghijklmnop'
|
||||
|
||||
post "#{prefix}/vm/pool1", ''
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue