x/vmware-nsx
Code Issues Proposed changes

Merge "Retry DHCP server deletion"

Browse Source
This commit is contained in:
Zuul 2021-11-19 15:01:26 +00:00 committed by Gerrit Code Review
commit ca624d95fb
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vmware_nsx/plugins/common_v3/plugin.py
View File

@ -1714,6 +1714,11 @@ class NsxPluginV3Base(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
LOG.error('Unable to create DHCP bindings for existing ports '
'on subnet %s', subnet['id'])
@nsxlib_utils.retry_upon_exception(
Exception, max_attempts=cfg.CONF.nsx_v3.retries)
def _safe_delete_dhcp_server(self, nsx_service_id):
self.nsxlib.dhcp_server.delete(nsx_service_id)
def _disable_native_dhcp(self, context, network_id):
# Disable native DHCP service on the backend for this network.
# First delete the DHCP port in this network. Then delete the
@ -1743,7 +1748,7 @@ class NsxPluginV3Base(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
network_id)
try:
self.nsxlib.dhcp_server.delete(dhcp_service['nsx_service_id'])
self._safe_delete_dhcp_server(dhcp_service['nsx_service_id'])
LOG.debug("Deleted logical DHCP server %(server)s for network "
"%(network)s",
{'server': dhcp_service['nsx_service_id'],