x
/
vmware-nsx
Code Issues Proposed changes

[V2T] Fetch routers for network instead of interfaces 

This commit will ensure the actual number of routers attached to
a given network is retrieved and considered for migration.
Applies set logic to rule out duplicates, and prints the list of
routers attached to the network in case multiple are found.

Change-Id: Ia033a9229e77b49d96cb9885ecc69e22821be696
This commit is contained in:
Salvatore Orlando 2021-04-12 10:53:31 -07:00 committed by Salvatore Orlando
parent 182cfc2524
commit 5c27a2a471
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vmware_nsx/shell/admin/plugins/nsxv/resources/migration.py
View File

@ -158,15 +158,16 @@ def _validate_networks(plugin, admin_context, transit_networks):
"allowed." % (net['id'], n_dhcp_subnets)) "allowed." % (net['id'], n_dhcp_subnets))
# Network attached to multiple routers # Network attached to multiple routers
intf_ports = plugin._get_network_interface_ports( router_ids = set(plugin._get_network_router_ids(
admin_context, net['id']) admin_context, net['id']))
if len(intf_ports) > 1: if len(router_ids) > 1:
log_error("Network %s has interfaces on multiple " log_error("Network %s has interfaces on multiple "
"routers. Only 1 is allowed." % net['id']) "routers (%s). Only 1 is allowed."
% (net['id'], ",".join(router_ids)))
if (cfg.CONF.vlan_transparent and if (cfg.CONF.vlan_transparent and
net.get('vlan_transparent') is True): net.get('vlan_transparent') is True):
if len(intf_ports) > 0: if len(router_ids) > 0:
log_error("VLAN Transparent network %s cannot be " log_error("VLAN Transparent network %s cannot be "
"attached to a logical router." % net['id']) "attached to a logical router." % net['id'])
if n_dhcp_subnets > 0: if n_dhcp_subnets > 0:
@ -175,6 +176,8 @@ def _validate_networks(plugin, admin_context, transit_networks):
# Subnets overlapping with the transit network # Subnets overlapping with the transit network
ipv6_subnets = 0 ipv6_subnets = 0
intf_ports = plugin._get_network_interface_ports(
admin_context, net['id'])
for subnet in subnets: for subnet in subnets:
# get the subnet IPs # get the subnet IPs
if ('allocation_pools' in subnet and if ('allocation_pools' in subnet and