diff --git a/README.md b/README.md index 51f5436..2b30900 100644 --- a/README.md +++ b/README.md @@ -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" } } diff --git a/lib/vmpooler/api/v1.rb b/lib/vmpooler/api/v1.rb index 5ff6019..1a4ee73 100644 --- a/lib/vmpooler/api/v1.rb +++ b/lib/vmpooler/api/v1.rb @@ -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|