openstack/cinder
Code Issues Proposed changes

Merge "VMware: Fix create vol from streamOptimized image"

Browse Source
This commit is contained in:
Jenkins 2016-06-29 10:39:08 +00:00 committed by Gerrit Code Review
commit f27190538f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -787,7 +787,7 @@ class VMwareVcVmdkDriverTestCase(test.TestCase):
select_ds_for_volume.assert_called_once_with(volume) select_ds_for_volume.assert_called_once_with(volume)
vops.get_create_spec.assert_called_once_with( vops.get_create_spec.assert_called_once_with(
volume['name'], 0, disk_type, summary.name, profileId=profile_id, volume['name'], 0, disk_type, summary.name, profile_id=profile_id,
adapter_type=adapter_type, extra_config=extra_config) adapter_type=adapter_type, extra_config=extra_config)
self.assertEqual(vm_create_spec, import_spec.configSpec) self.assertEqual(vm_create_spec, import_spec.configSpec)
download_image.assert_called_with( download_image.assert_called_with(

2
cinder/volume/drivers/vmware/vmdk.py
View File

@ -1020,7 +1020,7 @@ class VMwareVcVmdkDriver(driver.VolumeDriver):
dummy_disk_size, dummy_disk_size,
disk_type, disk_type,
summary.name, summary.name,
profileId=profile_id, profile_id=profile_id,
adapter_type=adapter_type, adapter_type=adapter_type,
extra_config=extra_config) extra_config=extra_config)
# convert vm_create_spec to vm_import_spec # convert vm_create_spec to vm_import_spec