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

B #5545: vCenter VNETs with dpg does not set clusters correctly (#1680)

Browse Source 
Co-authored-by: Tino Vázquez <cvazquez@opennebula.io>
(cherry picked from commit f9123adc9cff2b837e1e813ce769bd11144eadb9)
This commit is contained in:
Carlos J. Herrera 2022-01-11 08:48:48 -05:00 committed by Tino Vazquez
parent 430d81bc3d
commit 2c927e0dcb
No known key found for this signature in database
GPG Key ID: 14201E424D02047E
2 changed files with 273 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

259
share/hooks/vcenter/create_vcenter_net.rb
View File

@ -92,7 +92,7 @@ def wait_vlanid(vnet)
end
# Creates a distributed port group in a datacenter
def create_dpg(one_vnet, dc, cluster, vi_client)
def create_dpg(one_vnet, dc, clusters, vi_client)
begin
# Get parameters needed to create the network
pnics = one_vnet['TEMPLATE/PHYDEV']
@ -131,25 +131,38 @@ def create_dpg(one_vnet, dc, cluster, vi_client)
# Creates distributed port group
new_dpg = dc.create_dpg(dvs, pg_name, vlan_id, nports)
# Attach dpg to esxi hosts
cluster['host'].each do |host|
begin
esx_host = VCenterDriver::ESXHost
.new_from_ref(host._ref, vi_client)
esx_host.lock
if dvs
pnics_available = nil
if pnics && !pnics.empty?
pnics_available = esx_host.available_pnics
clusters.each do |cluster|
cluster['host'].each do |host|
begin
esx_host = VCenterDriver::ESXHost.new_from_ref(
host._ref,
vi_client
)
esx_host.lock
if dvs
pnics_available = nil
if pnics && !pnics.empty?
pnics_available = esx_host.available_pnics
end
esx_host.assign_proxy_switch(
dvs,
sw_name,
pnics,
pnics_available
)
end
esx_host.assign_proxy_switch(dvs,
sw_name,
pnics,
pnics_available)
rescue StandardError => e
message = 'Error adding distributed port group ' \
" #{pg_name} to host #{host._ref}." \
" Reason: \"#{e.message}\"."
if VCenterDriver::CONFIG[:debug_information]
message += "#{message} #{e.backtrace}"
end
raise message
ensure
esx_host.unlock if esx_host
end
rescue StandardError => e
raise e
ensure
esx_host.unlock if esx_host
end
end
else
@ -357,96 +370,144 @@ begin
raise CreateNetworkError, err_msg
end
host_id = one_vnet['TEMPLATE/VCENTER_ONE_HOST_ID']
unless host_id
err_msg = 'Missing VCENTER_ONE_HOST_ID'
raise CreateNetworkError, err_msg
end
# Step 2. Contact vCenter cluster and extract cluster's info
vi_client = VCenterDriver::VIClient.new_from_host(host_id)
vc_uuid = vi_client.vim.serviceContent.about.instanceUuid
one_host = OpenNebula::Host.new_with_id(host_id, one_client)
rc = one_host.info
if OpenNebula.is_error?(rc)
err_msg = rc.message
raise CreateNetworkError, err_msg
end
cluster_id = one_host['CLUSTER_ID']
vnet_ref = nil
ccr_ref = one_host['TEMPLATE/VCENTER_CCR_REF']
cluster = VCenterDriver::ClusterComputeResource.new_from_ref(ccr_ref,
vi_client)
dc = cluster.datacenter
# Step 3. Create the port groups based on each type
if pg_type == VCenterDriver::Network::NETWORK_TYPE_NSXV
begin
logical_switch = create_virtual_wire(one_vnet, host_id)
vnet_ref = logical_switch.ls_vcenter_ref
ls_vni = logical_switch.ls_vni
ls_name = logical_switch.ls_name
net_info << "VCENTER_NET_REF=\"#{vnet_ref}\"\n"
net_info << "VCENTER_INSTANCE_ID=\"#{vc_uuid}\"\n"
net_info << "NSX_ID=\"#{logical_switch.ls_id}\"\n"
net_info << "NSX_VNI=\"#{ls_vni}\"\n"
net_info << "BRIDGE=\"#{ls_name}\"\n"
add_vnet_to_cluster(one_vnet, cluster_id)
net_info << "VCENTER_NET_STATE=\"READY\"\n"
update_net(one_vnet, net_info)
rescue StandardError => e
err_msg = e.message
raise CreateNetworkError, err_msg
end
end
if pg_type == VCenterDriver::Network::NETWORK_TYPE_NSXT
begin
logical_switch = create_opaque_network(one_vnet, host_id)
vnet_ref = dc.nsx_network(logical_switch.ls_id, pg_type)
ls_vni = logical_switch.ls_vni
ls_name = logical_switch.ls_name
net_info << "VCENTER_NET_REF=\"#{vnet_ref}\"\n"
net_info << "VCENTER_INSTANCE_ID=\"#{vc_uuid}\"\n"
net_info << "NSX_ID=\"#{logical_switch.ls_id}\"\n"
net_info << "NSX_VNI=\"#{ls_vni}\"\n"
net_info << "BRIDGE=\"#{ls_name}\"\n"
add_vnet_to_cluster(one_vnet, cluster_id)
net_info << "VCENTER_NET_STATE=\"READY\"\n"
update_net(one_vnet, net_info)
rescue StandardError => e
err_msg = e.message
raise CreateNetworkError, err_msg
end
end
if pg_type == VCenterDriver::Network::NETWORK_TYPE_DPG
hosts_id = one_vnet['TEMPLATE/VCENTER_ONE_HOST_ID']
unless hosts_id
err_msg = 'Missing VCENTER_ONE_HOST_ID'
raise CreateNetworkError, err_msg
end
dc = nil
clusters = []
clusters_ids = []
vi_client = nil
vc_uuid = nil
# Step 2. Get vnet, contact cluster and extract cluster's info
hosts_id.split(',').each do |host_id|
host_id = host_id.to_i
vi_client = VCenterDriver::VIClient.new_from_host(host_id)
vc_uuid = vi_client.vim.serviceContent.about.instanceUuid
one_host = OpenNebula::Host.new_with_id(host_id, one_client)
rc = one_host.info
if OpenNebula.is_error?(rc)
err_msg = rc.message
raise CreateNetworkError, err_msg
end
cluster_id = one_host['CLUSTER_ID']
clusters_ids.push(cluster_id)
ccr_ref = one_host['TEMPLATE/VCENTER_CCR_REF']
cluster = VCenterDriver::ClusterComputeResource.new_from_ref(
ccr_ref,
vi_client
)
clusters.push(cluster)
dc = cluster.datacenter
end
# With DVS we have to work at datacenter level and then for each host
vnet_ref = create_dpg(one_vnet, dc, cluster, vi_client)
vnet_ref = create_dpg(one_vnet, dc, clusters, vi_client)
net_info << "VCENTER_NET_REF=\"#{vnet_ref}\"\n"
net_info << "VCENTER_INSTANCE_ID=\"#{vc_uuid}\"\n"
add_vnet_to_cluster(one_vnet, cluster_id)
clusters_ids.each do |cluster_id|
add_vnet_to_cluster(one_vnet, cluster_id)
end
net_info << "VCENTER_NET_STATE=\"READY\"\n"
update_net(one_vnet, net_info)
else
host_id = one_vnet['TEMPLATE/VCENTER_ONE_HOST_ID']
unless host_id
err_msg = 'Missing VCENTER_ONE_HOST_ID'
raise CreateNetworkError, err_msg
end
# Step 2. Contact vCenter cluster and extract cluster's info
vi_client = VCenterDriver::VIClient.new_from_host(host_id)
vc_uuid = vi_client.vim.serviceContent.about.instanceUuid
one_host = OpenNebula::Host.new_with_id(host_id, one_client)
rc = one_host.info
if OpenNebula.is_error?(rc)
err_msg = rc.message
raise CreateNetworkError, err_msg
end
cluster_id = one_host['CLUSTER_ID']
vnet_ref = nil
ccr_ref = one_host['TEMPLATE/VCENTER_CCR_REF']
cluster = VCenterDriver::ClusterComputeResource.new_from_ref(
ccr_ref,
vi_client
)
dc = cluster.datacenter
# Step 3. Create the port groups based on each type
if pg_type == VCenterDriver::Network::NETWORK_TYPE_NSXV
begin
logical_switch = create_virtual_wire(one_vnet, host_id)
vnet_ref = logical_switch.ls_vcenter_ref
ls_vni = logical_switch.ls_vni
ls_name = logical_switch.ls_name
net_info << "VCENTER_NET_REF=\"#{vnet_ref}\"\n"
net_info << "VCENTER_INSTANCE_ID=\"#{vc_uuid}\"\n"
net_info << "NSX_ID=\"#{logical_switch.ls_id}\"\n"
net_info << "NSX_VNI=\"#{ls_vni}\"\n"
net_info << "BRIDGE=\"#{ls_name}\"\n"
add_vnet_to_cluster(one_vnet, cluster_id)
net_info << "VCENTER_NET_STATE=\"READY\"\n"
update_net(one_vnet, net_info)
rescue StandardError => e
err_msg = e.message
raise CreateNetworkError, err_msg
end
end
if pg_type == VCenterDriver::Network::NETWORK_TYPE_NSXT
begin
logical_switch = create_opaque_network(one_vnet, host_id)
vnet_ref = dc.nsx_network(logical_switch.ls_id, pg_type)
ls_vni = logical_switch.ls_vni
ls_name = logical_switch.ls_name
net_info << "VCENTER_NET_REF=\"#{vnet_ref}\"\n"
net_info << "VCENTER_INSTANCE_ID=\"#{vc_uuid}\"\n"
net_info << "NSX_ID=\"#{logical_switch.ls_id}\"\n"
net_info << "NSX_VNI=\"#{ls_vni}\"\n"
net_info << "BRIDGE=\"#{ls_name}\"\n"
add_vnet_to_cluster(one_vnet, cluster_id)
net_info << "VCENTER_NET_STATE=\"READY\"\n"
update_net(one_vnet, net_info)
rescue StandardError => e
err_msg = e.message
raise CreateNetworkError, err_msg
end
end
if pg_type == VCenterDriver::Network::NETWORK_TYPE_PG
# With DVS we have to work at esxi host level
cluster['host'].each do |host|
esx_host = VCenterDriver::ESXHost.new_from_ref(
host._ref,
vi_client
)
esx_rollback << esx_host
vnet_ref = create_pg(one_vnet, esx_host)
end
net_info << "VCENTER_NET_REF=\"#{vnet_ref}\"\n"
net_info << "VCENTER_INSTANCE_ID=\"#{vc_uuid}\"\n"
add_vnet_to_cluster(one_vnet, cluster_id)
net_info << "VCENTER_NET_STATE=\"READY\"\n"
update_net(one_vnet, net_info)
end
end
if pg_type == VCenterDriver::Network::NETWORK_TYPE_PG
# With DVS we have to work at esxi host level
cluster['host'].each do |host|
esx_host = VCenterDriver::ESXHost.new_from_ref(host._ref, vi_client)
esx_rollback << esx_host
vnet_ref = create_pg(one_vnet, esx_host)
end
net_info << "VCENTER_NET_REF=\"#{vnet_ref}\"\n"
net_info << "VCENTER_INSTANCE_ID=\"#{vc_uuid}\"\n"
add_vnet_to_cluster(one_vnet, cluster_id)
net_info << "VCENTER_NET_STATE=\"READY\"\n"
update_net(one_vnet, net_info)
end
one_vnet.unlock
exit(0)
rescue AllocateNetworkError => e
# Here there is no one_vnet allocated

186
share/hooks/vcenter/delete_vcenter_net.rb
View File

@ -105,51 +105,57 @@ begin
end
# Step 1. Extract vnet settings
host_id = template['TEMPLATE/VCENTER_ONE_HOST_ID']
raise 'Missing VCENTER_ONE_HOST_ID' unless host_id
network_id = template['ID']
pg_name = template['BRIDGE']
pg_type = template['TEMPLATE/VCENTER_PORTGROUP_TYPE']
sw_name = template['TEMPLATE/VCENTER_SWITCH_NAME']
# Step 2. Get vnet, contact cluster and extract cluster's info
vi_client = VCenterDriver::VIClient.new_from_host(host_id)
one_client = OpenNebula::Client.new
one_vnet = OpenNebula::VirtualNetwork.new_with_id(network_id, one_client)
one_host = OpenNebula::Host.new_with_id(host_id, one_client)
rc = one_host.info
raise rc.message if OpenNebula.is_error? rc
ccr_ref = one_host['TEMPLATE/VCENTER_CCR_REF']
cluster = VCenterDriver::ClusterComputeResource
.new_from_ref(ccr_ref, vi_client)
dc = cluster.datacenter
# NSX
ls_id = template['TEMPLATE/NSX_ID']
# NSX
one_vnet = nil
# With DVS we have to work at datacenter level and then for each host
if pg_type == VCenterDriver::Network::NETWORK_TYPE_DPG
begin
dc.lock
hosts_id = template['TEMPLATE/VCENTER_ONE_HOST_ID']
raise 'Missing VCENTER_ONE_HOST_ID' unless hosts_id
# Explore network folder in search of dpg and dvs
net_folder = dc.network_folder
net_folder.fetch!
# Step 2. Get vnet, contact cluster and extract cluster's info
hosts_id.split(',').each do |host_id|
host_id = host_id.to_i
vi_client = VCenterDriver::VIClient.new_from_host(host_id)
one_client = OpenNebula::Client.new
one_vnet = OpenNebula::VirtualNetwork.new_with_id(
network_id,
one_client
)
one_host = OpenNebula::Host.new_with_id(host_id, one_client)
rc = one_host.info
raise rc.message if OpenNebula.is_error? rc
# Get distributed port group and dvs if they exists
dvs = dc.dvs_exists(sw_name, net_folder)
dpg = dc.dpg_exists(pg_name, net_folder)
dc.remove_dpg(dpg) if dpg
ccr_ref = one_host['TEMPLATE/VCENTER_CCR_REF']
cluster = VCenterDriver::ClusterComputeResource.new_from_ref(
ccr_ref,
vi_client
)
dc = cluster.datacenter
# Only remove switch if the port group being removed is
# the last and only port group in the switch
dc.lock
if dvs && dvs.item.summary.portgroupName.size == 1 &&
dvs.item.summary.portgroupName[0] == "#{sw_name}-uplink-pg"
dc.remove_dvs(dvs)
# Explore network folder in search of dpg and dvs
net_folder = dc.network_folder
net_folder.fetch!
# Get distributed port group and dvs if they exists
dvs = dc.dvs_exists(sw_name, net_folder)
dpg = dc.dpg_exists(pg_name, net_folder)
dc.remove_dpg(dpg) if dpg
# Only remove switch if the port group being removed is
# the last and only port group in the switch
if dvs && dvs.item.summary.portgroupName.size == 1 &&
dvs.item.summary.portgroupName[0] == "#{sw_name}-uplink-pg"
dc.remove_dvs(dvs)
end
end
rescue StandardError => e
err_msg = e.message
@ -157,60 +163,94 @@ begin
ensure
dc.unlock if dc
end
end
else
host_id = template['TEMPLATE/VCENTER_ONE_HOST_ID']
raise 'Missing VCENTER_ONE_HOST_ID' unless host_id
if pg_type == VCenterDriver::Network::NETWORK_TYPE_PG
cluster['host'].each do |host|
# Step 3. Loop through hosts in clusters
esx_host = VCenterDriver::ESXHost
.new_from_ref(host._ref, vi_client)
# Step 2. Get vnet, contact cluster and extract cluster's info
vi_client = VCenterDriver::VIClient.new_from_host(host_id)
one_client = OpenNebula::Client.new
one_vnet = OpenNebula::VirtualNetwork.new_with_id(
network_id,
one_client
)
one_host = OpenNebula::Host.new_with_id(host_id, one_client)
rc = one_host.info
raise rc.message if OpenNebula.is_error? rc
begin
esx_host.lock # Exclusive lock for ESX host operation
ccr_ref = one_host['TEMPLATE/VCENTER_CCR_REF']
cluster = VCenterDriver::ClusterComputeResource.new_from_ref(
ccr_ref,
vi_client
)
next unless esx_host.pg_exists(pg_name)
# NSX
ls_id = template['TEMPLATE/NSX_ID']
# NSX
swname = esx_host.remove_pg(pg_name)
next if !swname || sw_name != swname
if pg_type == VCenterDriver::Network::NETWORK_TYPE_PG
cluster['host'].each do |host|
# Step 3. Loop through hosts in clusters
esx_host = VCenterDriver::ESXHost.new_from_ref(
host._ref,
vi_client
)
vswitch = esx_host.vss_exists(sw_name)
next unless vswitch
begin
esx_host.lock # Exclusive lock for ESX host operation
# Only remove switch if the port group being removed is
# the last and only port group in the switch
if vswitch.portgroup.empty?
esx_host.remove_vss(sw_name)
next unless esx_host.pg_exists(pg_name)
swname = esx_host.remove_pg(pg_name)
next if !swname || sw_name != swname
vswitch = esx_host.vss_exists(sw_name)
next unless vswitch
# Only remove switch if the port group being removed is
# the last and only port group in the switch
if vswitch.portgroup.empty?
esx_host.remove_vss(sw_name)
end
rescue StandardError => e
err_msg = e.message
raise DeletePortgroupError, err_msg
ensure
esx_host.unlock if esx_host # Remove host lock
end
end
end
if pg_type == VCenterDriver::Network::NETWORK_TYPE_NSXV
begin
nsx_client = NSXDriver::NSXClient.new_from_id(host_id)
logical_switch = NSXDriver::VirtualWire.new(
nsx_client,
ls_id,
nil,
nil
)
logical_switch.delete_logical_switch
rescue StandardError => e
err_msg = e.message
raise DeletePortgroupError, err_msg
ensure
esx_host.unlock if esx_host # Remove host lock
end
end
end
if pg_type == VCenterDriver::Network::NETWORK_TYPE_NSXV
begin
nsx_client = NSXDriver::NSXClient.new_from_id(host_id)
logical_switch = NSXDriver::VirtualWire
.new(nsx_client, ls_id, nil, nil)
logical_switch.delete_logical_switch
rescue StandardError => e
err_msg = e.message
raise DeletePortgroupError, err_msg
end
end
if pg_type == VCenterDriver::Network::NETWORK_TYPE_NSXT
begin
nsx_client = NSXDriver::NSXClient.new_from_id(host_id)
logical_switch = NSXDriver::OpaqueNetwork
.new(nsx_client, ls_id, nil, nil)
logical_switch.delete_logical_switch
rescue StandardError => e
err_msg = e.message
raise DeletePortgroupError, err_msg
if pg_type == VCenterDriver::Network::NETWORK_TYPE_NSXT
begin
nsx_client = NSXDriver::NSXClient.new_from_id(host_id)
logical_switch = NSXDriver::OpaqueNetwork.new(
nsx_client,
ls_id,
nil,
nil
)
logical_switch.delete_logical_switch
rescue StandardError => e
err_msg = e.message
raise DeletePortgroupError, err_msg
end
end
end
rescue DeleteNetworkError => e