openstack
/
designate
Code Issues Proposed changes

Merge "Check zone_id in notification_handler to avoid UUID format issue."

This commit is contained in:
Zuul 2022-06-09 06:27:49 +00:00 committed by Gerrit Code Review
parent 5641e6722f 42dac06e0c
commit e1f7b4d6e3
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
designate/notification_handler/neutron.py
View File

@ -44,6 +44,12 @@ class NeutronFloatingHandler(base.BaseAddressHandler):
self.get_canonical_name(), event_type)
zone_id = cfg.CONF[self.name].zone_id
if not zone_id:
LOG.error('NeutronFloatingHandler: zone_id is None, '
'ignore the event.')
return
if event_type.startswith('floatingip.delete'):
self._delete(zone_id=zone_id,
resource_id=payload['floatingip_id'],

5
designate/notification_handler/nova.py
View File

@ -48,6 +48,11 @@ class NovaFixedHandler(BaseAddressHandler):
LOG.debug('NovaFixedHandler received notification - %s', event_type)
zone_id = cfg.CONF[self.name].zone_id
if not zone_id:
LOG.error('NovaFixedHandler: zone_id is None, ignore the event.')
return
if event_type == 'compute.instance.create.end':
payload['project'] = context.get("project_name", None)
self._create(addresses=payload['fixed_ips'],