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

Merge branch 'feature-3087'

Browse Source
This commit is contained in:
Ruben S. Montero 2014-07-24 22:43:45 +02:00
commit 65358df493
2 changed files with 59 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cli/etc/onevm.yaml
View File

@ -35,6 +35,11 @@
:size: 10
:left: true
:CLUSTER:
:desc: Cluster where the VM is running
:size: 10
:left: true
:TIME:
:desc: Time since the VM was submitted
:size: 10

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

@ -126,6 +126,19 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
def format_pool(options)
config_file = self.class.table_conf
# Get cluster names to use later in list
cluster_pool = OpenNebula::ClusterPool.new(@client)
rc = cluster_pool.info
cluster_names = {}
cluster_names["-1"] = "default"
if !OpenNebula.is_error?(rc)
cluster_pool.each do |c|
cluster_names[c["ID"]] = c["NAME"]
end
end
table = CLIHelper::ShowTable.new(config_file, self) do
column :ID, "ONE identifier for Virtual Machine", :size=>6 do |d|
d["ID"]
@ -171,6 +184,23 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
end
end
column :CLUSTER, "Cluster where the VM is running", :left,
:size=> 10 do |d|
if d["HISTORY_RECORDS"]["HISTORY"]
history = [d["HISTORY_RECORDS"]["HISTORY"]].flatten
cluster_id = history.last["CID"]
cluster = cluster_names[cluster_id]
if !cluster
cluster_id
else
cluster
end
else
"NONE"
end
end
column :TIME, "Time since the VM was submitted", :size=>10 do |d|
stime = d["STIME"].to_i
etime = d["ETIME"]=="0" ? Time.now.to_i : d["ETIME"].to_i
@ -236,6 +266,28 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
str_h1="%-80s"
str="%-20s: %-20s"
cluster = nil
if %w{ACTIVE SUSPENDED POWEROFF}.include? vm.state_str
cluster_id = vm['/VM/HISTORY_RECORDS/HISTORY[last()]/CID']
else
cluster_id = nil
end
if cluster_id
if cluster_id == "-1"
cluster = "default"
else
clu = OpenNebula::Cluster.new(OpenNebula::Cluster.build_xml(cluster_id), @client)
rc = clu.info
if OpenNebula.is_error?(rc)
cluster = "ERROR"
else
cluster = clu["NAME"]
end
end
end
CLIHelper.print_header(
str_h1 % "VIRTUAL MACHINE #{vm['ID']} INFORMATION")
puts str % ["ID", vm.id.to_s]
@ -248,9 +300,8 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
puts str % ["HOST",
vm['/VM/HISTORY_RECORDS/HISTORY[last()]/HOSTNAME']] if
%w{ACTIVE SUSPENDED POWEROFF}.include? vm.state_str
puts str % ["CLUSTER ID",
vm['/VM/HISTORY_RECORDS/HISTORY[last()]/CID'] ] if
%w{ACTIVE SUSPENDED POWEROFF}.include? vm.state_str
puts str % ["CLUSTER ID", cluster_id ] if cluster_id
puts str % ["CLUSTER", cluster ] if cluster
puts str % ["START TIME",
OpenNebulaHelper.time_to_str(vm['/VM/STIME'])]
puts str % ["END TIME",