openstack
/
heat
Code Issues Proposed changes

Merge "Ignore dns domain NotFound when deleting record"

This commit is contained in:
Zuul 2018-05-15 12:07:09 +00:00 committed by Gerrit Code Review
parent 1b23f171f7 55a7492c6c
commit 60b4a3f13f
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
heat/engine/clients/os/designate.py
View File

@ -97,7 +97,10 @@ class DesignateClientPlugin(client_plugin.ClientPlugin):
return self.client().records.update(record.domain_id, record)
def record_delete(self, **kwargs):
domain_id = self.get_domain_id(kwargs.pop('domain'))
try:
domain_id = self.get_domain_id(kwargs.pop('domain'))
except heat_exception.EntityNotFound:
return
return self.client().records.delete(domain_id,
kwargs.pop('id'))

18
heat/tests/clients/test_designate_client.py
View File

@ -283,6 +283,24 @@ class DesignateClientPluginRecordTest(common.HeatTestCase):
self.sample_domain_id,
self.sample_uuid)
@mock.patch.object(client.DesignateClientPlugin, 'client')
@mock.patch('designateclient.v1.records.Record')
def test_record_delete_domain_not_found(self, mock_record,
client_designate):
self._client.records.delete.return_value = None
self.client_plugin.get_domain_id.side_effect = (
heat_exception.EntityNotFound)
client_designate.return_value = self._client
record = dict(
id=self.sample_uuid,
domain=self.sample_domain_id
)
self.client_plugin.record_delete(**record)
self.assertFalse(self._client.records.delete.called)
@mock.patch.object(client.DesignateClientPlugin, 'client')
@mock.patch('designateclient.v1.records.Record')
def test_record_show(self, mock_record, client_designate):