x
/
vmware-nsx
Code Issues Proposed changes

NSX|P Fix get_subnets for router interfaces 

The parameter name in kwargs was wrong, leading to reading
all the subnets again.

Change-Id: Ied5a18f9737e48ed805d2c24673c8f1d9df0958e
This commit is contained in:
asarfaty 2020-02-26 10:29:02 +02:00
parent d875db9fcb
commit 625485c6e8
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
vmware_nsx/plugins/nsx_p/plugin.py
View File

@ -1047,7 +1047,8 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base):
dhcp_port = self._get_sunbet_dhcp_port(context, net_id)
return True if dhcp_port else False
def _get_segment_subnets(self, context, net_id, net_az=None, **kwargs):
def _get_segment_subnets(self, context, net_id, net_az=None,
interface_subnets=None, **kwargs):
"""Get list of segmentSubnet objects to put on the segment
Including router interface subnets (for overlay networks) &
DHCP subnet (if using policy DHCP)
@ -1065,9 +1066,9 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base):
dhcp_subnet = self.get_subnet(context, subnet.id)
break
router_subnets = None
if 'router_subnets' in kwargs:
router_subnets = kwargs['router_subnets']
router_subnets = []
if interface_subnets:
router_subnets = interface_subnets
else:
# Get it from the network, only if overlay
if self._is_overlay_network(context, net_id):
@ -1090,7 +1091,7 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base):
dns_nameservers = dhcp_subnet['dns_nameservers']
if (not dns_nameservers or
not validators.is_attr_set(dns_nameservers)):
# Use preconfigured dns server
# Use pre-configured dns server
if not net_az:
net_az = self.get_network_az_by_net_id(context, net_id)
dns_nameservers = net_az.nameservers
@ -1103,16 +1104,15 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base):
dhcp_config=dhcp_config)
seg_subnets.append(seg_subnet)
if router_subnets:
for rtr_subnet in router_subnets:
if rtr_subnet['id'] == dhcp_subnet_id:
# Do not add the same subnet twice
continue
if rtr_subnet['network_id'] == net_id:
gw_addr = self._get_gateway_addr_from_subnet(rtr_subnet)
seg_subnets.append(
policy_defs.Subnet(gateway_address=gw_addr,
dhcp_config=None))
for rtr_subnet in router_subnets:
if rtr_subnet['id'] == dhcp_subnet_id:
# Do not add the same subnet twice
continue
if rtr_subnet['network_id'] == net_id:
gw_addr = self._get_gateway_addr_from_subnet(rtr_subnet)
seg_subnets.append(
policy_defs.Subnet(gateway_address=gw_addr,
dhcp_config=None))
return seg_subnets