openstack/cinder
Code Issues Proposed changes

Merge "EQLX: Extend of snapshot or clone failure"

Browse Source
This commit is contained in:
Jenkins 2016-07-06 04:14:51 +00:00 committed by Gerrit Code Review
commit a1105e3abd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/tests/unit/test_eqlx.py
View File

@ -186,7 +186,7 @@ class DellEQLSanISCSIDriverTestCase(test.TestCase):
with mock.patch.object(self.driver,
'extend_volume') as mock_extend_volume:
mock_eql_execute.configure_mock(**mock_attrs)
mock_eql_execute.return_value = volume
mock_eql_execute.return_value = self.fake_iqn_return
mock_extend_volume.return_value = self.fake_iqn_return
model_update = self.driver.create_volume_from_snapshot(
volume, snapshot)

4
cinder/volume/drivers/eqlx.py
View File

@ -529,7 +529,7 @@ class DellEQLSanISCSIDriver(san.SanISCSIDriver):
'clone', volume['name'])
# Extend Volume if needed
if out and volume['size'] > snapshot['volume_size']:
out = self.extend_volume(out, volume['size'])
self.extend_volume(volume, volume['size'])
LOG.debug('Volume from snapshot %(name)s resized from '
'%(current_size)sGB to %(new_size)sGB.',
{'name': volume['name'],
@ -552,7 +552,7 @@ class DellEQLSanISCSIDriver(san.SanISCSIDriver):
# Extend Volume if needed
if out and volume['size'] > src_vref['size']:
out = self.extend_volume(out, volume['size'])
self.extend_volume(volume, volume['size'])
self.add_multihost_access(volume)
return self._get_volume_data(out)