Merge "Ignore designate NotFound errors during PTR delete" into stable/2026.1

Author: Zuul

neutron/services/externaldns/drivers/designate/driver.py

@@ -156,7 +156,15 @@ def delete_record_set(self, context, dns_domain, dns_name, records):
         for record in records:
             in_addr_name = netaddr.IPAddress(record).reverse_dns
             in_addr_zone_name = self._get_in_addr_zone_name(in_addr_name)
-            admin_client.recordsets.delete(in_addr_zone_name, in_addr_name)
+            try:
+                admin_client.recordsets.delete(in_addr_zone_name, in_addr_name)
+            except d_exc.NotFound:
+                LOG.warning(
+                    "While deleting PTR record, either zone %(zone)s "
+                    "or recordset %(recordset)s could not be found. "
+                    "Double check that they were not left as orphans.",
+                    {"zone": in_addr_zone_name, "recordset": in_addr_name}
+                )
 
     def _get_ids_ips_to_delete(self, dns_domain, name, records,
                                designate_client):

neutron/tests/unit/services/externaldns/drivers/designate/test_driver.py

@@ -226,6 +226,42 @@ def test_delete_record_set_with_reverse_dns(self):
             ]
         )
 
+    def test_delete_record_set_with_reverse_dns_not_found(self):
+        self.admin_client.recordsets.delete.side_effect = [
+            d_exc.NotFound, None]
+        self.client.recordsets.list.return_value = [
+            {'id': 123, 'records': ['192.168.0.10']},
+            {'id': 456, 'records': ['2001:db8:0:1::1']}
+        ]
+
+        with mock.patch.object(driver, "LOG") as log_mock:
+            self.driver.delete_record_set(
+                self.context, 'example.test.', 'test',
+                ['192.168.0.10', '2001:db8:0:1::1']
+            )
+            log_mock.warning.assert_called_once()
+
+        self.client.recordsets.delete.assert_has_calls(
+            [
+                mock.call('example.test.', 123),
+                mock.call('example.test.', 456)
+            ]
+        )
+
+        self.admin_client.recordsets.delete.assert_has_calls(
+            [
+                mock.call(
+                    '0.168.192.in-addr.arpa.', '10.0.168.192.in-addr.arpa.'
+                ),
+                mock.call(
+                    '0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0.0.0.0.0.0.0.8.b.d.0.1.0.'
+                    '0.2.ip6.arpa.',
+                    '1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0.0.0.0.0.0.0.8.b.d.0.'
+                    '1.0.0.2.ip6.arpa.'
+                )
+            ]
+        )
+
     def test_create_record_set_zone_not_found(self):
         self.client.recordsets.create.side_effect = d_exc.NotFound