openstack/cinder
Code Issues Proposed changes

Merge "VMware: Add profile ID to connection info"

Browse Source
This commit is contained in:
Zuul 2017-11-05 06:04:37 +00:00 committed by Gerrit Code Review
commit 5d7f5ffcfc
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cinder/tests/unit/volume/drivers/vmware/test_vmware_vmdk.py
View File

@ -1762,9 +1762,15 @@ class VMwareVcVmdkDriverTestCase(test.TestCase):
get_volume_group_folder.assert_called_once_with(dc, vol['project_id'])
@mock.patch.object(VMDK_DRIVER, 'volumeops')
def _test_get_connection_info(self, vops, vmdk_connector=False):
@mock.patch.object(VMDK_DRIVER, '_get_storage_profile_id')
def _test_get_connection_info(
self, get_storage_profile_id, vops, vmdk_connector=False):
volume = self._create_volume_obj()
backing = mock.Mock(value='ref-1')
profile_id = mock.sentinel.profile_id
get_storage_profile_id.return_value = profile_id
if vmdk_connector:
vmdk_path = mock.sentinel.vmdk_path
vops.get_vmdk_path.return_value = vmdk_path
@ -1785,6 +1791,7 @@ class VMwareVcVmdkDriverTestCase(test.TestCase):
self.assertEqual('ref-1', ret['data']['volume'])
self.assertEqual(volume.id, ret['data']['volume_id'])
self.assertEqual(volume.name, ret['data']['name'])
self.assertEqual(profile_id, ret['data']['profile_id'])
if vmdk_connector:
self.assertEqual(volume.size * units.Gi, ret['data']['vmdk_size'])

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

@ -553,6 +553,7 @@ class VMwareVcVmdkDriver(driver.VolumeDriver):
'volume': backing.value,
'volume_id': volume.id,
'name': volume.name,
'profile_id': self._get_storage_profile_id(volume)
}
# vmdk connector in os-brick needs additional connection info.
@ -585,9 +586,11 @@ class VMwareVcVmdkDriver(driver.VolumeDriver):
connection_info['data']['config'] = vmdk_connector_config
LOG.debug("Returning connection_info (volume: '%(volume)s', volume_id:"
" '%(volume_id)s') for connector: %(connector)s.",
" '%(volume_id)s'), profile_id: '%(profile_id)s' for "
"connector: %(connector)s.",
{'volume': connection_info['data']['volume'],
'volume_id': volume.id,
'profile_id': connection_info['data']['profile_id'],
'connector': connector})
return connection_info