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 #3462: show defined nics for hybrid VMs

Browse Source
This commit is contained in:
Javi Fontan 2014-12-17 18:48:47 +01:00 committed by Ruben S. Montero
parent b95f0188cc
commit c59cf85bf7
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -452,7 +452,28 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
puts
CLIHelper.print_header(str_h1 % "VM NICS",false)
vm_nics = [vm.to_hash['VM']['TEMPLATE']['NIC']].flatten if !vm_nics
# vm_nics is defined for hybridvisors. If there are both IP from
# the hybridvisor and from OpenNebula nics check if the IP is the
# same as one of IPs generated by OpenNebula and show standard
# information. If it's a different IP show all the information.
#
# The template can already contain one NIC not controled by
# OpenNebula and we want to show also that info.
if vm_nics
if vm.has_elements?("/VM/TEMPLATE/NIC")
nics = [vm.to_hash['VM']['TEMPLATE']['NIC']].flatten
ips = nics.map {|n| n['IP'] }
ip = vm_nics.first['IP']
if ips.include? ip
vm_nics = nics
else
vm_nics += nics
end
end
else
vm_nics = [vm.to_hash['VM']['TEMPLATE']['NIC']].flatten
end
nic_default = {"NETWORK" => "-",
"IP" => "-",