x/vmware-nsx
Code Issues Proposed changes

Merge "Fix network not detached from vdr dhcp edge"

Browse Source
This commit is contained in:
Jenkins 2015-11-22 11:40:08 +00:00 committed by Gerrit Code Review
commit 418476cc43
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vmware_nsx/plugins/nsx_v/drivers/distributed_router_driver.py
View File

@ -355,10 +355,11 @@ class RouterDistributedDriver(router_driver.RouterBaseDriver):
# If DHCP is disabled, this remove cannot trigger metadata change
# as metadata is served via DHCP Edge
elif (subnet['enable_dhcp'] and self.plugin.metadata_proxy_handler and
self._metadata_cfg_required_after_port_remove(context, router_id,
subnet)):
md_gw_data = self._metadata_route_update(context, router_id)
elif (subnet['enable_dhcp'] and self.plugin.metadata_proxy_handler):
md_gw_data = self._get_metadata_gw_data(context, router_id)
if self._metadata_cfg_required_after_port_remove(
context, router_id, subnet):
self._metadata_route_update(context, router_id)
self.plugin._update_subnets_and_dnat_firewall(context, router_db)
# Safly remove interface, VDR can have interface to only one subnet in