openstack/cinder
Code Issues Proposed changes

Merge "Remove snapshot['size'] references"

Browse Source
This commit is contained in:
Jenkins 2017-05-06 19:22:55 +00:00 committed by Gerrit Code Review
commit d3f1d1bf6d
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/tests/unit/volume/drivers/dell_emc/test_vmax.py
View File

@ -9441,7 +9441,7 @@ class VMAXCommonTest(test.TestCase):
mock_sg): mock_sg):
common = self.driver.common common = self.driver.common
snapshot = self.data.test_snapshot_v3.copy() snapshot = self.data.test_snapshot_v3.copy()
snapshot['size'] = '100' snapshot['volume_size'] = '100'
with mock.patch.object(common, '_initial_setup', with mock.patch.object(common, '_initial_setup',
return_value=self.data.extra_specs): return_value=self.data.extra_specs):
self.driver.create_snapshot(snapshot) self.driver.create_snapshot(snapshot)

1
cinder/tests/unit/volume/drivers/hitachi/test_hitachi_vsp_horcm_fc.py
View File

@ -570,7 +570,6 @@ for i in range(8):
snapshot['name'] = 'TEST_SNAPSHOT{0:d}'.format(i) snapshot['name'] = 'TEST_SNAPSHOT{0:d}'.format(i)
snapshot['provider_location'] = None if i == 2 else '{0:d}'.format( snapshot['provider_location'] = None if i == 2 else '{0:d}'.format(
i if i < 5 else i + 5) i if i < 5 else i + 5)
snapshot['size'] = 256 if i == 1 else 128
snapshot['status'] = 'creating' if i == 2 else 'available' snapshot['status'] = 'creating' if i == 2 else 'available'
snapshot['volume_id'] = '00000000-0000-0000-0000-{0:012d}'.format( snapshot['volume_id'] = '00000000-0000-0000-0000-{0:012d}'.format(
i if i < 5 else 7) i if i < 5 else 7)

1
cinder/tests/unit/volume/drivers/hitachi/test_hitachi_vsp_horcm_iscsi.py
View File

@ -647,7 +647,6 @@ for i in range(8):
snapshot['name'] = 'TEST_SNAPSHOT{0:d}'.format(i) snapshot['name'] = 'TEST_SNAPSHOT{0:d}'.format(i)
snapshot['provider_location'] = None if i == 2 else '{0:d}'.format( snapshot['provider_location'] = None if i == 2 else '{0:d}'.format(
i if i < 5 else i + 5) i if i < 5 else i + 5)
snapshot['size'] = 256 if i == 1 else 128
snapshot['status'] = 'creating' if i == 2 else 'available' snapshot['status'] = 'creating' if i == 2 else 'available'
snapshot['volume_id'] = '00000000-0000-0000-0000-{0:012d}'.format( snapshot['volume_id'] = '00000000-0000-0000-0000-{0:012d}'.format(
i if i < 5 else 7) i if i < 5 else 7)