x/vmware-nsx
Code Issues Proposed changes

Merge "NSX|V3: router attached to VLAN must have gateway"

Browse Source
This commit is contained in:
Zuul 2018-02-25 12:19:25 +00:00 committed by Gerrit Code Review
commit 895c25d2df
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
vmware_nsx/plugins/nsx_v3/plugin.py
View File

@ -3467,20 +3467,27 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
router_data = router['router'] router_data = router['router']
self._assert_on_router_admin_state(router_data) self._assert_on_router_admin_state(router_data)
# if setting this router as no-snat, make sure gw address scope match if validators.is_attr_set(gw_info):
# those of the subnets
if (validators.is_attr_set(gw_info) and
not gw_info.get('enable_snat', cfg.CONF.enable_snat_by_default)):
router_ports = self._get_router_interfaces(context, router_id) router_ports = self._get_router_interfaces(context, router_id)
for port in router_ports: for port in router_ports:
for fip in port['fixed_ips']: # if setting this router as no-snat, make sure gw address scope
self._validate_address_scope_for_router_interface( # match those of the subnets
context.elevated(), router_id, if not gw_info.get('enable_snat',
gw_info['network_id'], fip['subnet_id']) cfg.CONF.enable_snat_by_default):
for fip in port['fixed_ips']:
self._validate_address_scope_for_router_interface(
context.elevated(), router_id,
gw_info['network_id'], fip['subnet_id'])
# If the network attached to a router is a VLAN backed network
# then it must be attached to a edge cluster
if (not gw_info and
not self._is_overlay_network(context, port['network_id'])):
msg = _("A router attached to a VLAN backed network "
"must have a external network assigned.")
raise n_exc.InvalidInput(error_message=msg)
# VPNaaS need to be notified on router GW changes (there is currently # VPNaaS need to be notified on router GW changes (there is
# no matching upstream registration for this) # currentlyno matching upstream registration for this)
if validators.is_attr_set(gw_info):
vpn_plugin = directory.get_plugin(plugin_const.VPN) vpn_plugin = directory.get_plugin(plugin_const.VPN)
if vpn_plugin: if vpn_plugin:
vpn_driver = vpn_plugin.drivers[vpn_plugin.default_provider] vpn_driver = vpn_plugin.drivers[vpn_plugin.default_provider]