diff options
author | Zuul <zuul@review.opendev.org> | 2023-04-21 00:52:20 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2023-04-21 00:52:20 +0000 |
commit | bce24efbeff80ce3a572cc409e8ee5b843535a2d (patch) | |
tree | c71ceb8083a80f2a7981d2dfbf20c9836f8b415f /designate/central/service.py | |
parent | f59448d9f1ea49d36ed1f22ee1ecdbc43ead15ff (diff) | |
parent | 1df48dfee1246cf7f719c790c6964c0863756717 (diff) | |
download | designate-bce24efbeff80ce3a572cc409e8ee5b843535a2d.tar.gz |
Merge "Use ids when removing ptr records" into stable/yogastable/yoga
Diffstat (limited to 'designate/central/service.py')
-rw-r--r-- | designate/central/service.py | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/designate/central/service.py b/designate/central/service.py index 601849e6..577f59b1 100644 --- a/designate/central/service.py +++ b/designate/central/service.py @@ -1803,7 +1803,8 @@ class Service(service.RPCService): LOG.debug('Deleting record %s for FIP %s', record['id'], record['managed_resource_id']) self._delete_ptr_record( - elevated_context, record + elevated_context, record.zone_id, record.recordset_id, + record['id'] ) def _list_floatingips(self, context, region=None): @@ -1977,7 +1978,8 @@ class Service(service.RPCService): raise exceptions.NotFound(msg) self._delete_ptr_record( - elevated_context, record + elevated_context, record.zone_id, record.recordset_id, + record['id'] ) def _create_floating_ip(self, context, fip, record, @@ -2057,24 +2059,30 @@ class Service(service.RPCService): return fips @transaction - def _delete_ptr_record(self, context, record): + def _delete_ptr_record(self, context, zone_id, recordset_id, + record_to_delete_id): try: - recordset = self.get_recordset( - context, record.zone_id, record.recordset_id + recordset = self.storage.find_recordset( + context, {'id': recordset_id, 'zone_id': zone_id} ) + record_ids = [record['id'] for record in recordset.records] - if record not in recordset.records: + if record_to_delete_id not in record_ids: LOG.debug( 'PTR Record %s not found in recordset %s', - record.id, record.recordset_id + record_to_delete_id, recordset_id ) return - recordset.records.remove(record) + for record in list(recordset.records): + if record['id'] != record_to_delete_id: + continue + recordset.records.remove(record) + break if not recordset.records: self.delete_recordset( - context, record.zone_id, record.recordset_id + context, zone_id, recordset_id ) return |