shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

bug #1130: Use period_to_str in onevm

Browse Source
This commit is contained in:
Daniel Molina 2012-02-15 19:55:41 +01:00
parent fcb430e4a8
commit 179487ac35
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/cli/one_helper/onevm_helper.rb
View File

@ -92,14 +92,10 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
end
column :TIME, "Time since the VM was submitted", :size=>11 do |d|
stime = Time.at(d["STIME"].to_i)
etime = d["ETIME"]=="0" ? Time.now : Time.at(d["ETIME"].to_i)
dtime = Time.at(etime-stime).getgm
"%02d %02d:%02d:%02d" % [
dtime.yday-1,
dtime.hour,
dtime.min,
dtime.sec]
stime = d["STIME"].to_i
etime = d["ETIME"]=="0" ? Time.now.to_i : d["ETIME"].to_i
dtime = etime-stime
OpenNebulaHelper.period_to_str(dtime)
end
default :ID, :USER, :GROUP, :NAME, :STAT, :CPU, :MEM, :HOSTNAME,
@ -201,24 +197,21 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
end
column :TIME, "Total time in this state", :size=>11 do |d|
stime = Time.at(d["STIME"].to_i)
etime = d["ETIME"]=="0" ? Time.now : Time.at(d["ETIME"].to_i)
dtime = Time.at(etime-stime).getgm
"%02d %02d:%02d:%02d" % [dtime.yday-1, dtime.hour,
dtime.min, dtime.sec]
stime = d["STIME"].to_i
etime = d["ETIME"]=="0" ? Time.now.to_i : d["ETIME"].to_i
dtime = etime-stime
OpenNebulaHelper.period_to_str(dtime)
end
column :PTIME, "Prolog time for this state", :size=>11 do |d|
stime = Time.at(d["PSTIME"].to_i)
stime = d["PSTIME"].to_i
if d["PSTIME"]=="0"
etime=Time.at(0)
etime=0
else
etime = d["PETIME"]=="0" ? Time.now :
Time.at(d["PETIME"].to_i)
etime = d["PETIME"]=="0" ? Time.now.to_i: d["PETIME"].to_i
end
dtime = Time.at(etime-stime).getgm
"%02d %02d:%02d:%02d" % [dtime.yday-1, dtime.hour,
dtime.min, dtime.sec]
dtime = etime-stime
OpenNebulaHelper.period_to_str(dtime)
end
default :SEQ, :HOSTNAME, :REASON, :START, :TIME, :PTIME