diff options
author | Zuul <zuul@review.opendev.org> | 2022-09-16 07:13:06 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2022-09-16 07:13:06 +0000 |
commit | 378581bacd42dd65c177d7a90be0045b6528ce72 (patch) | |
tree | 0eab8b8c9936816e0e7f60400dd8d1643ed89f6e | |
parent | 1787dd8674da6922b0cdb20962a6e874e59fb973 (diff) | |
parent | 465cee23d37aefc5d641375dfd0362f79980517d (diff) | |
download | designate-378581bacd42dd65c177d7a90be0045b6528ce72.tar.gz |
Merge "Check zone_id in notification_handler to avoid UUID format issue." into stable/xena
-rw-r--r-- | designate/notification_handler/neutron.py | 6 | ||||
-rw-r--r-- | designate/notification_handler/nova.py | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/designate/notification_handler/neutron.py b/designate/notification_handler/neutron.py index 4a816eeb..4b512f6d 100644 --- a/designate/notification_handler/neutron.py +++ b/designate/notification_handler/neutron.py @@ -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'], diff --git a/designate/notification_handler/nova.py b/designate/notification_handler/nova.py index 7f35ea16..b9a1a973 100644 --- a/designate/notification_handler/nova.py +++ b/designate/notification_handler/nova.py @@ -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'], |