From fa20255b6d331d44809202dc464ae5fbedeb6f0f Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Thu, 7 Mar 2013 00:47:00 +0100 Subject: [PATCH] feature #1691: Fix render of single NIC VMs. Fix NIC_ID collition --- src/cli/one_helper/onevm_helper.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb index 246add5afb..c77a7fb7db 100644 --- a/src/cli/one_helper/onevm_helper.rb +++ b/src/cli/one_helper/onevm_helper.rb @@ -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")