From 3b2908413bcbb72106dc731c14003324420112bc Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Thu, 7 Mar 2013 01:23:05 +0100 Subject: [PATCH] feature #1691: Fix list of NICs in onevm show --- src/cli/one_helper/onevm_helper.rb | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb index c77a7fb7db..b04380d99e 100644 --- a/src/cli/one_helper/onevm_helper.rb +++ b/src/cli/one_helper/onevm_helper.rb @@ -343,45 +343,41 @@ class OneVMHelper < OpenNebulaHelper::OneHelper "MAC"=> "-", "VLAN"=>"no", "BRIDGE"=>"-"} - nic_id = 0 + array_id = 0 vm_nics.each {|nic| - next if nic.has_key?("NIC_ID_RENDER") - - nic["NIC_ID_RENDER"] = nic_id + next if nic.has_key?("CLI_DONE") if nic.has_key?("IP6_LINK") - ip6_link = {"IP" => nic.delete("IP6_LINK"), - "NIC_ID" => nic_id, - "DOUBLE_ENTRY"=> true} + ip6_link = {"IP" => nic.delete("IP6_LINK"), + "CLI_DONE" => true, + "DOUBLE_ENTRY" => true} vm_nics.insert(array_id+1,ip6_link) array_id += 1 end if nic.has_key?("IP6_SITE") - ip6_link = {"IP" => nic.delete("IP6_SITE"), - "NIC_ID" => nic_id, - "DOUBLE_ENTRY"=> true} + ip6_link = {"IP" => nic.delete("IP6_SITE"), + "CLI_DONE" => true, + "DOUBLE_ENTRY" => true} vm_nics.insert(array_id+1,ip6_link) array_id += 1 end if nic.has_key?("IP6_GLOBAL") - ip6_link = {"IP" => nic.delete("IP6_GLOBAL"), - "NIC_ID" => nic_id, - "DOUBLE_ENTRY"=> true} + ip6_link = {"IP" => nic.delete("IP6_GLOBAL"), + "CLI_DONE" => true, + "DOUBLE_ENTRY" => true} vm_nics.insert(array_id+1,ip6_link) array_id += 1 end nic.merge!(nic_default) {|k,v1,v2| v1} - - nic_id += 1 array_id += 1 }