mirror of
https://github.com/puppetlabs/vmpooler.git
synced 2026-01-26 01:58:41 -05:00
Revert "(POOLER-81) Add time_remaining information" (#279)
* Revert "(POOLER-34) Ship clone request to ready time to metrics (#277)" This reverts commita865e6bd2f. * Revert "(POOLER-81) Add time_remaining information (#276)" This reverts commit1910cffaf7.
This commit is contained in:
parent
a865e6bd2f
commit
84065dd059
2 changed files with 1 additions and 24 deletions
|
|
@ -644,10 +644,7 @@ module Vmpooler
|
||||||
result[params[:hostname]]['running'] = ((Time.parse(rdata['destroy']) - Time.parse(rdata['checkout'])) / 60 / 60).round(2)
|
result[params[:hostname]]['running'] = ((Time.parse(rdata['destroy']) - Time.parse(rdata['checkout'])) / 60 / 60).round(2)
|
||||||
result[params[:hostname]]['state'] = 'destroyed'
|
result[params[:hostname]]['state'] = 'destroyed'
|
||||||
elsif rdata['checkout']
|
elsif rdata['checkout']
|
||||||
running = Time.now - Time.parse(rdata['checkout'])
|
result[params[:hostname]]['running'] = ((Time.now - Time.parse(rdata['checkout'])) / 60 / 60).round(2)
|
||||||
result[params[:hostname]]['running'] = format("%02dh %02dm %02ds", running / (60 * 60), (running / 60) % 60, running % 60)
|
|
||||||
remaining = Time.parse(rdata['checkout']) + rdata['lifetime'].to_i*60*60 - Time.now
|
|
||||||
result[params[:hostname]]['time_remaining'] = format("%02dh %02dm %02ds", remaining / (60 * 60), (remaining / 60) % 60, remaining % 60)
|
|
||||||
result[params[:hostname]]['state'] = 'running'
|
result[params[:hostname]]['state'] = 'running'
|
||||||
elsif rdata['check']
|
elsif rdata['check']
|
||||||
result[params[:hostname]]['state'] = 'ready'
|
result[params[:hostname]]['state'] = 'ready'
|
||||||
|
|
|
||||||
|
|
@ -39,26 +39,6 @@ describe Vmpooler::API::V1 do
|
||||||
create_token('abcdefghijklmnopqrstuvwxyz012345', 'jdoe', current_time)
|
create_token('abcdefghijklmnopqrstuvwxyz012345', 'jdoe', current_time)
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'GET /vm/:hostname' do
|
|
||||||
it 'returns correct information on a running vm' do
|
|
||||||
create_running_vm 'pool1', 'abcdefghijklmnop'
|
|
||||||
get "#{prefix}/vm/abcdefghijklmnop"
|
|
||||||
expect_json(ok = true, http = 200)
|
|
||||||
expected = {
|
|
||||||
ok: true,
|
|
||||||
abcdefghijklmnop: {
|
|
||||||
template: "pool1",
|
|
||||||
lifetime: 0,
|
|
||||||
running: "00h 00m ..s",
|
|
||||||
time_remaining: "00h ..m ..s",
|
|
||||||
state: "running",
|
|
||||||
ip: ""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
expect(last_response.body).to match(JSON.pretty_generate(expected))
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'POST /vm' do
|
describe 'POST /vm' do
|
||||||
it 'returns a single VM' do
|
it 'returns a single VM' do
|
||||||
create_ready_vm 'pool1', 'abcdefghijklmnop'
|
create_ready_vm 'pool1', 'abcdefghijklmnop'
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue