NSX|V3+P: allow network deletion in case DHCP port not found
Change-Id: I3b924a78d5209bfb60f80a86b57ff64a72b947ea
This commit is contained in:
parent
4d01aee204
commit
5ffc162a14
|
@ -1657,8 +1657,10 @@ class NsxPluginV3Base(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
|
||||||
context.session, dhcp_service['port_id'])
|
context.session, dhcp_service['port_id'])
|
||||||
self._cleanup_port(context, dhcp_service['port_id'],
|
self._cleanup_port(context, dhcp_service['port_id'],
|
||||||
nsx_port_id)
|
nsx_port_id)
|
||||||
except nsx_lib_exc.ResourceNotFound:
|
except (nsx_lib_exc.ResourceNotFound, n_exc.NotFound):
|
||||||
# This could happen when the port has been manually deleted.
|
# This could happen when the port has been manually deleted
|
||||||
|
# from the NSX, or when the neutron port deletion previously
|
||||||
|
# failed
|
||||||
LOG.error("Failed to delete DHCP port %(port)s for "
|
LOG.error("Failed to delete DHCP port %(port)s for "
|
||||||
"network %(network)s",
|
"network %(network)s",
|
||||||
{'port': dhcp_service['port_id'],
|
{'port': dhcp_service['port_id'],
|
||||||
|
|
Loading…
Reference in New Issue