mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-19 11:22:55 +09:00
Feature #1285: Minor changes to oneimage and onevm show
This commit is contained in:
1 parent
564502fe6a
commit
554f5f332e
2 files changed
+5
-5
No files matched your search
@@ -131,7 +131,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
|
||||
puts str % ["SOURCE",image['SOURCE']]
|
||||
puts str % ["PATH",image['PATH']] if image['PATH'] && !image['PATH'].empty?
|
||||
puts str % ["FSTYPE",image['FSTYPE']] if image['FSTYPE'] && !image['FSTYPE'].empty?
|
||||
puts str % ["SIZE", image['SIZE']]
|
||||
puts str % ["SIZE", OpenNebulaHelper.unit_to_str(image['SIZE'].to_i,{},"M")]
|
||||
puts str % ["STATE", image.short_state_str]
|
||||
puts str % ["RUNNING_VMS", image['RUNNING_VMS']]
|
||||
puts
|
||||
|
||||
@@ -231,7 +231,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
|
||||
d["SEQ"]
|
||||
end
|
||||
|
||||
column :HOST, "Host name of the VM container", :size=>15 do |d|
|
||||
column :HOST, "Host name of the VM container", :left, :size=>15 do |d|
|
||||
d["HOSTNAME"]
|
||||
end
|
||||
|
||||
@@ -243,14 +243,14 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
|
||||
OpenNebulaHelper.time_to_str(d['STIME'])
|
||||
end
|
||||
|
||||
column :TIME, "Total time in this state", :size=>11 do |d|
|
||||
column :TIME, "Total time in this state", :size=>15 do |d|
|
||||
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|
|
||||
column :PROLOG_TIME, "Prolog time for this state", :size=>15 do |d|
|
||||
stime = d["PSTIME"].to_i
|
||||
if d["PSTIME"]=="0"
|
||||
etime=0
|
||||
@@ -261,7 +261,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
|
||||
OpenNebulaHelper.period_to_str(dtime)
|
||||
end
|
||||
|
||||
default :SEQ, :HOST, :REASON, :START, :TIME, :PTIME
|
||||
default :SEQ, :HOST, :REASON, :START, :TIME, :PROLOG_TIME
|
||||
end
|
||||
|
||||
vm_hash=vm.to_hash
|
||||
|
||||
Reference in new issue
Block a user