diff options
| author | Zuul <zuul@review.opendev.org> | 2023-04-20 21:17:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-04-20 21:17:51 +0000 |
| commit | 237b66c84d40fd3d32bf32a6a1acc6a224c6faab (patch) | |
| tree | 8fbc0faa462bb0f357905e79af0f93b711ea4e24 | |
| parent | ef49a7614ccacc8729cfadaeda897dce7fd01a7c (diff) | |
| parent | 0257040c186195ce13e4cfa8ee1b524a4451833a (diff) | |
| download | designate-237b66c84d40fd3d32bf32a6a1acc6a224c6faab.tar.gz | |
Merge "Use ids when removing ptr records" into stable/wallaby
| -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 e8afa7c6..9df81db1 100644 --- a/designate/central/service.py +++ b/designate/central/service.py @@ -2147,7 +2147,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): @@ -2321,7 +2322,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, @@ -2381,24 +2383,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 |