openstack
/
cinder
Code Issues Proposed changes

Merge "Dell SC: Error creating snapshots with live volume"

This commit is contained in:
Jenkins 2016-11-03 17:20:35 +00:00 committed by Gerrit Code Review
parent 1790cc5d90 ab7e3f1591
commit b7cebd6d31
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cinder/tests/unit/volume/drivers/dell/test_dellsc.py
View File

@ -21,6 +21,8 @@ from cinder import exception
from cinder.objects import fields
from cinder import test
from cinder.tests.unit import fake_constants as fake
from cinder.tests.unit import fake_snapshot
from cinder.tests.unit import fake_volume
from cinder.volume.drivers.dell import dell_storagecenter_api
from cinder.volume.drivers.dell import dell_storagecenter_iscsi
from cinder.volume import volume_types
@ -1375,6 +1377,28 @@ class DellSCSanISCSIDriverTestCase(test.TestCase):
volume,
connector)
def _simple_volume(self, **kwargs):
updates = {'display_name': fake.VOLUME_NAME,
'id': fake.VOLUME_ID,
'provider_id': self.VOLUME[u'instanceId']}
updates.update(kwargs)
return fake_volume.fake_volume_obj(self._context, **updates)
def _simple_snapshot(self, **kwargs):
updates = {'id': fake.SNAPSHOT_ID,
'display_name': fake.SNAPSHOT_NAME,
'status': 'available',
'provider_location': None,
'volume_size': 1}
updates.update(kwargs)
snapshot = fake_snapshot.fake_snapshot_obj(self._context, **updates)
volume = self._simple_volume()
snapshot.volume = volume
return snapshot
@mock.patch.object(dell_storagecenter_api.StorageCenterApi,
'find_volume',
return_value=VOLUME)
@ -1388,8 +1412,7 @@ class DellSCSanISCSIDriverTestCase(test.TestCase):
mock_open_connection,
mock_init):
provider_id = self.VOLUME[u'instanceId']
snapshot = {'volume_id': fake.VOLUME_ID,
'id': fake.SNAPSHOT_ID}
snapshot = self._simple_snapshot()
expected = {'status': 'available',
'provider_id': provider_id}
ret = self.driver.create_snapshot(snapshot)
@ -1407,8 +1430,7 @@ class DellSCSanISCSIDriverTestCase(test.TestCase):
mock_close_connection,
mock_open_connection,
mock_init):
snapshot = {'volume_id': fake.VOLUME_ID,
'id': fake.SNAPSHOT_ID}
snapshot = self._simple_snapshot()
self.assertRaises(exception.VolumeBackendAPIException,
self.driver.create_snapshot,
snapshot)
@ -1425,8 +1447,7 @@ class DellSCSanISCSIDriverTestCase(test.TestCase):
mock_close_connection,
mock_open_connection,
mock_init):
snapshot = {'volume_id': fake.VOLUME_ID,
'id': fake.SNAPSHOT_ID}
snapshot = self._simple_snapshot()
self.assertRaises(exception.VolumeBackendAPIException,
self.driver.create_snapshot,
snapshot)

2
cinder/volume/drivers/dell/dell_storagecenter_common.py
View File

@ -442,7 +442,7 @@ class DellCommonDriver(driver.ConsistencyGroupVD, driver.ManageableVD,
"""Create snapshot"""
# our volume name is the volume id
volume_name = snapshot.get('volume_id')
provider_id = snapshot.get('provider_id')
provider_id = snapshot.volume.get('provider_id')
snapshot_id = snapshot.get('id')
LOG.debug('Creating snapshot %(snap)s on volume %(vol)s',
{'snap': snapshot_id,