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

feature #1691: Fix render of single NIC VMs. Fix NIC_ID collition

Browse Source
This commit is contained in:
Ruben S. Montero 2013-03-07 00:47:00 +01:00
parent 04a5fd2324
commit fa20255b6d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -336,7 +336,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
if vm.has_elements?("/VM/TEMPLATE/NIC")
CLIHelper.print_header(str_h1 % "VM NICS",false)
vm_nics = vm.to_hash['VM']['TEMPLATE']['NIC']
vm_nics = [vm.to_hash['VM']['TEMPLATE']['NIC']].flatten
nic_default = {"NETWORK" => "-",
"IP" => "-",
@ -348,9 +348,9 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
vm_nics.each {|nic|
next if nic.has_key?("NIC_ID")
next if nic.has_key?("NIC_ID_RENDER")
nic["NIC_ID"] = nic_id
nic["NIC_ID_RENDER"] = nic_id
if nic.has_key?("IP6_LINK")
ip6_link = {"IP" => nic.delete("IP6_LINK"),
@ -430,7 +430,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
end
end
end.show([vm_nics].flatten,{})
end.show(vm_nics,{})
while vm.has_elements?("/VM/TEMPLATE/NIC")
vm.delete_element("/VM/TEMPLATE/NIC")