openstack/cinder
Code Issues Proposed changes

Merge "NetApp: Managing cDOT LUN by UUID fails"

Browse Source
This commit is contained in:
Jenkins
2016-05-09 02:55:04 +00:00
committed by Gerrit Code Review
parent 23c64ee6fc c53ef881a7
commit 8b7de0400b
2 changed files with 91 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,7 @@ Mock unit tests for the NetApp block storage library
import copy
import uuid
import ddt
import mock
from oslo_log import versionutils
from oslo_utils import units
@@ -41,6 +42,7 @@ from cinder.volume.drivers.netapp import utils as na_utils
from cinder.volume import utils as volume_utils
@ddt.ddt
class NetAppBlockStorageLibraryTestCase(test.TestCase):
def setUp(self):
@@ -458,31 +460,87 @@ class NetAppBlockStorageLibraryTestCase(test.TestCase):
self.assertEqual('true', self.library.lun_space_reservation)
def test_get_existing_vol_manage_missing_id_path(self):
def test_get_existing_vol_with_manage_ref_no_source_info(self):
self.assertRaises(exception.ManageExistingInvalidReference,
self.library._get_existing_vol_with_manage_ref,
{})
def test_get_existing_vol_manage_not_found(self):
self.zapi_client.get_lun_by_args.return_value = []
self.assertRaises(exception.ManageExistingInvalidReference,
self.library._get_existing_vol_with_manage_ref,
{'source-id': 'src_id',
'source-name': 'lun_path'})
{'source-name': 'lun_path'})
self.assertEqual(1, self.zapi_client.get_lun_by_args.call_count)
@mock.patch.object(block_base.NetAppBlockStorageLibrary,
'_extract_lun_info',
mock.Mock(return_value=block_base.NetAppLun(
'lun0', 'lun0', '3', {'UUID': 'src_id'})))
def test_get_existing_vol_manage_lun(self):
def test_get_existing_vol_manage_lun_by_path(self):
self.library.vserver = 'fake_vserver'
self.zapi_client.get_lun_by_args.return_value = ['lun0', 'lun1']
lun = self.library._get_existing_vol_with_manage_ref(
{'source-id': 'src_id', 'path': 'lun_path'})
self.assertEqual(1, self.zapi_client.get_lun_by_args.call_count)
mock_lun = block_base.NetAppLun(
'lun0', 'lun0', '3', {'UUID': 'fake_uuid'})
self.mock_object(block_base.NetAppBlockStorageLibrary,
'_extract_lun_info',
mock.Mock(return_value=mock_lun))
existing_ref = {'source-name': 'fake_path'}
lun = self.library._get_existing_vol_with_manage_ref(existing_ref)
self.zapi_client.get_lun_by_args.assert_called_once_with(
path='fake_path')
self.library._extract_lun_info.assert_called_once_with('lun0')
self.assertEqual('lun0', lun.name)
def test_get_existing_vol_manage_lun_by_uuid(self):
self.library.vserver = 'fake_vserver'
self.zapi_client.get_lun_by_args.return_value = ['lun0', 'lun1']
mock_lun = block_base.NetAppLun(
'lun0', 'lun0', '3', {'UUID': 'fake_uuid'})
self.mock_object(block_base.NetAppBlockStorageLibrary,
'_extract_lun_info',
mock.Mock(return_value=mock_lun))
existing_ref = {'source-id': 'fake_uuid'}
lun = self.library._get_existing_vol_with_manage_ref(existing_ref)
self.zapi_client.get_lun_by_args.assert_called_once_with(
uuid='fake_uuid')
self.library._extract_lun_info.assert_called_once_with('lun0')
self.assertEqual('lun0', lun.name)
def test_get_existing_vol_manage_lun_invalid_mode(self):
self.assertRaises(exception.ManageExistingInvalidReference,
self.library._get_existing_vol_with_manage_ref,
{'source-id': 'src_id'})
def test_get_existing_vol_manage_lun_invalid_lun(self):
self.zapi_client.get_lun_by_args.return_value = ['lun0', 'lun1']
self.mock_object(block_base.NetAppBlockStorageLibrary,
'_is_lun_valid_on_storage',
mock.Mock(side_effect=[False, True]))
mock_lun0 = block_base.NetAppLun(
'lun0', 'lun0', '3', {'UUID': 'src_id_0'})
mock_lun1 = block_base.NetAppLun(
'lun1', 'lun1', '5', {'UUID': 'src_id_1'})
self.mock_object(block_base.NetAppBlockStorageLibrary,
'_extract_lun_info',
mock.Mock(side_effect=[mock_lun0, mock_lun1]))
lun = self.library._get_existing_vol_with_manage_ref(
{'source-name': 'lun_path'})
self.assertEqual(1, self.zapi_client.get_lun_by_args.call_count)
self.library._extract_lun_info.assert_has_calls([
mock.call('lun0'),
mock.call('lun1'),
])
self.assertEqual('lun1', lun.name)
@mock.patch.object(block_base.NetAppBlockStorageLibrary,
'_get_existing_vol_with_manage_ref',
mock.Mock(return_value=block_base.NetAppLun(

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

@@ -689,30 +689,33 @@ class NetAppBlockStorageLibrary(object):
def _get_existing_vol_with_manage_ref(self, existing_ref):
"""Get the corresponding LUN from the storage server."""
uuid = existing_ref.get('source-id')
path = existing_ref.get('source-name')
if not (uuid or path):
reason = _('Reference must contain either source-id'
' or source-name element.')
lun_info = {}
if path:
lun_info['path'] = path
elif uuid:
if not hasattr(self, 'vserver'):
reason = _('Volume manage identifier with source-id is only '
'supported with clustered Data ONTAP.')
raise exception.ManageExistingInvalidReference(
existing_ref=existing_ref, reason=reason)
lun_info['uuid'] = uuid
else:
reason = _('Volume manage identifier must contain either '
'source-id or source-name element.')
raise exception.ManageExistingInvalidReference(
existing_ref=existing_ref, reason=reason)
lun_info = {}
lun_info.setdefault('path', path if path else None)
if hasattr(self, 'vserver') and uuid:
lun_info['uuid'] = uuid
luns = self.zapi_client.get_lun_by_args(**lun_info)
if luns:
for lun in luns:
netapp_lun = self._extract_lun_info(lun)
storage_valid = self._is_lun_valid_on_storage(netapp_lun)
uuid_valid = True
if uuid:
if netapp_lun.get_metadata_property('UUID') == uuid:
uuid_valid = True
else:
uuid_valid = False
if storage_valid and uuid_valid:
return netapp_lun
for lun in luns:
netapp_lun = self._extract_lun_info(lun)
if self._is_lun_valid_on_storage(netapp_lun):
return netapp_lun
raise exception.ManageExistingInvalidReference(
existing_ref=existing_ref,
reason=(_('LUN not found with given ref %s.') % existing_ref))