From 4d95cb449a239550bf2774d23aab4fea8587aa2a Mon Sep 17 00:00:00 2001 From: mcabrerizo Date: Thu, 17 Nov 2016 17:52:59 +0100 Subject: [PATCH 1/2] Fix B#4928 import vcenter networks with same name in different clusters --- src/vmm_mad/remotes/vcenter/vcenter_driver.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb index f012218af2..7355f421c5 100644 --- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb +++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb @@ -517,7 +517,7 @@ class VIClient next if !n[:host][0] # Networks can be in several cluster, create one per cluster - Array(n[:host][0]).each{ |host_system| + Array(n[:host]).each{ |host_system| net_name = "#{n.name} - #{host_system.parent.name}" if !vnpool["VNET[BRIDGE=\"#{n[:name]}\"]/\ From 10b7bd74e2b5134cf966b102f9cbe76ce9fe7ba9 Mon Sep 17 00:00:00 2001 From: mcabrerizo Date: Fri, 18 Nov 2016 18:03:24 +0100 Subject: [PATCH 2/2] Fix B#4928 import vcenter networks with same name in different clusters --- src/vmm_mad/remotes/vcenter/vcenter_driver.rb | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb index 7355f421c5..c671e3f976 100644 --- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb +++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb @@ -517,21 +517,24 @@ class VIClient next if !n[:host][0] # Networks can be in several cluster, create one per cluster + net_names = [] Array(n[:host]).each{ |host_system| net_name = "#{n.name} - #{host_system.parent.name}" - - if !vnpool["VNET[BRIDGE=\"#{n[:name]}\"]/\ - TEMPLATE[VCENTER_TYPE=\"Port Group\"]"] - one_nets << { - :name => net_name, - :bridge => n.name, - :cluster => host_system.parent.name, - :type => "Port Group", - :one => "NAME = \"#{net_name}\"\n" \ - "BRIDGE = \"#{n[:name]}\"\n" \ - "VN_MAD = \"dummy\"\n" \ - "VCENTER_TYPE = \"Port Group\"" - } + if !net_names.include?(net_name) + if !vnpool["VNET[BRIDGE=\"#{n[:name]}\"]/\ + TEMPLATE[VCENTER_TYPE=\"Port Group\"]"] + one_nets << { + :name => net_name, + :bridge => n.name, + :cluster => host_system.parent.name, + :type => "Port Group", + :one => "NAME = \"#{net_name}\"\n" \ + "BRIDGE = \"#{n[:name]}\"\n" \ + "VN_MAD = \"dummy\"\n" \ + "VCENTER_TYPE = \"Port Group\"" + } + net_names << net_name + end end } }