openstack
/
cinder
Code Issues Proposed changes

Merge "NetApp: block drivers fail when volume missing." into stable/ocata

This commit is contained in:
Jenkins 2017-08-16 04:28:53 +00:00 committed by Gerrit Code Review
parent bf4e53c7e6 397a26fc70
commit 7fd193d16d
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
cinder/tests/unit/volume/drivers/netapp/dataontap/test_block_base.py
View File

@ -885,6 +885,7 @@ class NetAppBlockStorageLibraryTestCase(test.TestCase):
def test_delete_lun_no_metadata(self):
self.mock_object(self.library, '_get_lun_attr', return_value=None)
self.library.zapi_client = mock.Mock()
self.library.lun_table = fake.LUN_TABLE
self.mock_object(self.library, 'zapi_client')
self.library._delete_lun(fake.LUN_NAME)
@ -896,6 +897,40 @@ class NetAppBlockStorageLibraryTestCase(test.TestCase):
self.zapi_client.
mark_qos_policy_group_for_deletion.call_count)
@mock.patch.object(block_base, 'LOG', mock.Mock())
def test_delete_lun_missing_lun(self):
mock_get_lun_attr = self.mock_object(self.library, '_get_lun_attr')
mock_get_lun_attr.return_value = fake.LUN_METADATA
self.library.zapi_client = mock.Mock()
error = netapp_api.NaApiError(code=netapp_api.EOBJECTNOTFOUND)
self.mock_object(self.library.zapi_client, 'destroy_lun',
side_effect=error)
self.library.lun_table = {fake.LUN_NAME: None}
self.library._delete_lun(fake.LUN_NAME)
mock_get_lun_attr.assert_called_once_with(
fake.LUN_NAME, 'metadata')
self.library.zapi_client.destroy_lun.assert_called_once_with(fake.PATH)
block_base.LOG.error.assert_not_called()
block_base.LOG.warning.assert_called_once()
self.assertFalse(self.library.lun_table)
@mock.patch.object(block_base, 'LOG', mock.Mock())
def test_delete_lun_client_exception(self):
mock_get_lun_attr = self.mock_object(self.library, '_get_lun_attr')
mock_get_lun_attr.return_value = fake.LUN_METADATA
self.library.zapi_client = mock.Mock()
self.mock_object(self.library.zapi_client, 'destroy_lun',
side_effect=netapp_api.NaApiError)
self.assertRaises(exception.NetAppDriverException,
self.library._delete_lun,
fake.LUN_NAME)
block_base.LOG.error.assert_not_called()
block_base.LOG.warning.assert_not_called()
def test_delete_snapshot(self):
mock_delete_lun = self.mock_object(self.library, '_delete_lun')

11
cinder/volume/drivers/netapp/dataontap/block_base.py
View File

@ -282,7 +282,16 @@ class NetAppBlockStorageLibrary(object):
metadata = self._get_lun_attr(lun_name, 'metadata')
if metadata:
self.zapi_client.destroy_lun(metadata['Path'])
try:
self.zapi_client.destroy_lun(metadata['Path'])
except netapp_api.NaApiError as e:
if e.code == netapp_api.EOBJECTNOTFOUND:
LOG.warning(_LW("Failure deleting LUN %(name)s."
" %(message)s"),
{'name': lun_name, 'message': e})
else:
error_message = (_('A NetApp Api Error occurred: %s') % e)
raise exception.NetAppDriverException(error_message)
self.lun_table.pop(lun_name)
else:
LOG.warning(_LW("No entry in LUN table for volume/snapshot"