openstack
/
cinder
Code Issues Proposed changes

Merge "VMware: Add volume name in vCenter to conn info" into stable/mitaka

This commit is contained in:
Jenkins 2016-09-23 16:02:01 +00:00 committed by Gerrit Code Review
parent 2a3b921702 98d24ae8aa
commit e6f90c767a
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1608,7 +1608,7 @@ class VMwareVcVmdkDriverTestCase(test.TestCase):
host = mock.sentinel.host
vops.get_host.return_value = host
volume = {'name': 'vol-1', 'id': 1}
volume = self._create_volume_dict()
conn_info = self._driver.initialize_connection(volume, connector)
relocate_backing.assert_called_once_with(volume, backing, host)
@ -1635,7 +1635,7 @@ class VMwareVcVmdkDriverTestCase(test.TestCase):
backing = mock.Mock(value=mock.sentinel.backing_value)
create_backing.return_value = backing
volume = {'name': 'vol-1', 'id': 1}
volume = self._create_volume_dict()
conn_info = self._driver.initialize_connection(volume, connector)
create_backing.assert_called_once_with(volume, host)
@ -1643,8 +1643,8 @@ class VMwareVcVmdkDriverTestCase(test.TestCase):
self.assertEqual('vmdk', conn_info['driver_volume_type'])
self.assertEqual(backing.value, conn_info['data']['volume'])
self.assertEqual(volume['id'],
conn_info['data']['volume_id'])
self.assertEqual(volume['id'], conn_info['data']['volume_id'])
self.assertEqual(volume['name'], conn_info['data']['name'])
@mock.patch.object(VMDK_DRIVER, 'volumeops')
@mock.patch.object(VMDK_DRIVER, '_relocate_backing')

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

@ -536,9 +536,10 @@ class VMwareVcVmdkDriver(driver.VolumeDriver):
# Create backing
backing = self._create_backing(volume)
# Set volume's moref value and name
# Set volume ID and backing moref value and name.
connection_info['data'] = {'volume': backing.value,
'volume_id': volume['id']}
'volume_id': volume['id'],
'name': volume['name']}
LOG.info(_LI("Returning connection_info: %(info)s for volume: "
"%(volume)s with connector: %(connector)s."),