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

Change datetime to RFC3339 for start_time and end_time

Browse source
This commit is contained in:
Spencer McElmurry 2018-07-11 09:40:16 -07:00
parent d602057cf2
commit 14329f8907
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -646,8 +646,8 @@ module Vmpooler
elsif rdata['checkout'] elsif rdata['checkout']
result[params[:hostname]]['running'] = ((Time.now - Time.parse(rdata['checkout'])) / 60 / 60).round(2) result[params[:hostname]]['running'] = ((Time.now - Time.parse(rdata['checkout'])) / 60 / 60).round(2)
result[params[:hostname]]['remaining'] = ((Time.parse(rdata['checkout']) + rdata['lifetime'].to_i*60*60 - Time.now) / 60 / 60).round(2) result[params[:hostname]]['remaining'] = ((Time.parse(rdata['checkout']) + rdata['lifetime'].to_i*60*60 - Time.now) / 60 / 60).round(2)
result[params[:hostname]]['start_time'] = Time.parse(rdata['checkout']) result[params[:hostname]]['start_time'] = Time.parse(rdata['checkout']).to_datetime.rfc3339
result[params[:hostname]]['end_time'] = Time.parse(rdata['checkout']) + rdata['lifetime'].to_i*60*60 result[params[:hostname]]['end_time'] = (Time.parse(rdata['checkout']) + rdata['lifetime'].to_i*60*60).to_datetime.rfc3339
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'

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

@ -50,8 +50,8 @@ describe Vmpooler::API::V1 do
expect(response_body["lifetime"]).to eq(0) expect(response_body["lifetime"]).to eq(0)
expect(response_body["running"]).to be >= 0 expect(response_body["running"]).to be >= 0
expect(response_body["remaining"]).to be <= 0 expect(response_body["remaining"]).to be <= 0
expect(response_body["start_time"]).to eq("#{current_time}") expect(response_body["start_time"]).to eq(current_time.to_datetime.rfc3339)
expect(response_body["end_time"]).to eq("#{current_time}") expect(response_body["end_time"]).to eq(current_time.to_datetime.rfc3339)
expect(response_body["state"]).to eq("running") expect(response_body["state"]).to eq("running")
expect(response_body["ip"]).to eq("") expect(response_body["ip"]).to eq("")
end end