Fix network not detached from vdr dhcp edge

When one interface is deleted from vdr, if the network is not used
to transfer metadata requests, the network would not be deleted from
vdr dhcp edge which would lead to overlapping problems.
Fixes-Bug: #1511843

Change-Id: I41c99c55c9af625a04ccd029841b379151f14e95
This commit is contained in:
linb 2015-11-20 13:43:50 +08:00
parent a98053dacd
commit 4d734773b8
1 changed files with 5 additions and 4 deletions

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