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

Merge pull request #100 from sschneid/display_vm_state

Browse source 
Display VM state in GET /vm/:hostname route
This commit is contained in:
Colin 2015-05-06 13:14:36 -07:00
commit cf20c418bc
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -211,7 +211,8 @@ $ curl --url vmpooler.company.com/vm/pxpmtoonx7fiqg6
"pxpmtoonx7fiqg6": {
"template": "centos-6-x86_64",
"lifetime": 12,
"running": 3,
"running": 3.1,
"state": "running",
"domain": "company.com"
}
}

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

@ -426,8 +426,14 @@ module Vmpooler
if rdata['destroy']
result[params[:hostname]]['running'] = ((Time.parse(rdata['destroy']) - Time.parse(rdata['checkout'])) / 60 / 60).round(2)
else
result[params[:hostname]]['state'] = 'destroyed'
elsif rdata['checkout']
result[params[:hostname]]['running'] = ((Time.now - Time.parse(rdata['checkout'])) / 60 / 60).round(2)
result[params[:hostname]]['state'] = 'running'
elsif rdata['check']
result[params[:hostname]]['state'] = 'ready'
else
result[params[:hostname]]['state'] = 'pending'
end
rdata.keys.each do |key|