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

B #1531: vcenter_driver should ignore uplink port groups (#1638)

Browse Source
This commit is contained in:
Sergio Semedi Barranco 2018-01-09 16:03:15 +01:00 committed by Tino Vázquez
parent 97f957460f
commit 6f5ba65753
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb
View File

@ -351,6 +351,8 @@ class DatacenterFolder
result.each do |r|
networks[r.obj._ref] = r.to_hash if r.obj.is_a?(RbVmomi::VIM::DistributedVirtualPortgroup) || r.obj.is_a?(RbVmomi::VIM::Network)
networks[r.obj._ref][:network_type] = r.obj.is_a?(RbVmomi::VIM::DistributedVirtualPortgroup) ? "Distributed Port Group" : "Port Group"
networks[r.obj._ref][:uplink] = false
networks[r.obj._ref][:processed] = false
#Multicluster nets support
networks[r.obj._ref][:clusters] = {}
@ -396,6 +398,15 @@ class DatacenterFolder
clusters = {}
result.each do |r|
browser = r.obj.environmentBrowser || nil
if browser
browser.QueryConfigTarget.distributedVirtualPortgroup.each do |s|
next if networks[s.portgroupKey][:processed]
networks[s.portgroupKey][:uplink] = s.uplinkPortgroup
networks[s.portgroupKey][:processed] = true
end
end
clusters[r.obj._ref] = r.to_hash if r.obj.is_a?(RbVmomi::VIM::ClusterComputeResource)
end
@ -447,7 +458,7 @@ class DatacenterFolder
opts[:dc_name] = dc_name
networks.each do |nref, net_info|
next if net_info[:one_net] || net_info[:clusters][:refs].size < 1
next if net_info[:one_net] || net_info[:clusters][:refs].size < 1 || net_info[:uplink]
opts[:clusters] = net_info[:clusters]
opts[:network_name] = net_info['name']