openstack
/
cinder
Code Issues Proposed changes

Merge "Dell EMC SC: Raise on _init_volume create_snapshot failure"

This commit is contained in:
Jenkins 2017-04-13 01:27:14 +00:00 committed by Gerrit Code Review
parent dab351de23 343c00ae87
commit 4d71d60da6
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cinder/tests/unit/volume/drivers/dell/test_dellscapi.py
View File

@ -4291,17 +4291,21 @@ class DellSCSanAPITestCase(test.TestCase):
return_value=RPLAY)
@mock.patch.object(dell_storagecenter_api.StorageCenterApi,
'_init_volume')
@mock.patch.object(dell_storagecenter_api.StorageCenterApi,
'get_volume')
@mock.patch.object(dell_storagecenter_api.HttpClient,
'post',
return_value=RESPONSE_200)
def test_create_replay_inact_vol(self,
mock_post,
mock_get_volume,
mock_init_volume,
mock_first_result,
mock_close_connection,
mock_open_connection,
mock_init):
# Test case where the specified volume is inactive
mock_get_volume.return_value = self.VOLUME
res = self.scapi.create_replay(self.INACTIVE_VOLUME,
'Test Replay',
60)
@ -4310,6 +4314,20 @@ class DellSCSanAPITestCase(test.TestCase):
self.assertTrue(mock_first_result.called)
self.assertEqual(self.RPLAY, res, 'Unexpected ScReplay')
@mock.patch.object(dell_storagecenter_api.StorageCenterApi,
'_init_volume')
@mock.patch.object(dell_storagecenter_api.StorageCenterApi,
'get_volume')
def test_create_replay_inact_vol_init_fail(
self, mock_get_volume, mock_init_volume, mock_close_connection,
mock_open_connection, mock_init):
# Test case where the specified volume is inactive
mock_get_volume.return_value = self.INACTIVE_VOLUME
self.assertRaises(exception.VolumeBackendAPIException,
self.scapi.create_replay,
self.INACTIVE_VOLUME, 'Test Replay', 60)
mock_init_volume.assert_called_once_with(self.INACTIVE_VOLUME)
@mock.patch.object(dell_storagecenter_api.StorageCenterApi,
'_first_result',
return_value=RPLAY)

17
cinder/volume/drivers/dell/dell_storagecenter_api.py
View File

@ -1983,6 +1983,12 @@ class StorageCenterApi(object):
storageusage = self._get_json(r)
return storageusage
def _is_active(self, scvolume):
if (scvolume.get('active') is not True or
scvolume.get('replayAllowed') is not True):
return False
return True
def create_replay(self, scvolume, replayid, expire):
"""Takes a snapshot of a volume.
@ -1999,12 +2005,19 @@ class StorageCenterApi(object):
cloning a volume we will snap it right before creating
the clone.
:returns: The Dell replay object or None.
:raises VolumeBackendAPIException: On failure to intialize volume.
"""
replay = None
if scvolume is not None:
if (scvolume.get('active') is not True or
scvolume.get('replayAllowed') is not True):
if not self._is_active(scvolume):
self._init_volume(scvolume)
scvolume = self.get_volume(self._get_id(scvolume))
if not self._is_active(scvolume):
raise exception.VolumeBackendAPIException(
message=(
_('Unable to create snapshot from empty volume.'
' %s') % scvolume['name']))
# We have a volume and it is initialized.
payload = {}
payload['description'] = replayid
payload['expireTime'] = expire