openstack
/
cinder
Code Issues Proposed changes

Merge "VMware: Check empty provider location"

This commit is contained in:
Zuul 2018-12-13 03:45:05 +00:00 committed by Gerrit Code Review
parent 0b70bd7046 b738fc20f9
commit 38e91b1030
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cinder/tests/unit/volume/drivers/vmware/test_fcd.py
View File

@ -208,9 +208,16 @@ class VMwareVStorageObjectDriverTestCase(test.TestCase):
@mock.patch.object(FCD_DRIVER, '_delete_fcd')
def test_delete_volume(self, delete_fcd):
volume = self._create_volume_obj()
volume.provider_location = 'foo@ds1'
self._driver.delete_volume(volume)
delete_fcd.assert_called_once_with(volume.provider_location)
@mock.patch.object(FCD_DRIVER, '_delete_fcd')
def test_delete_volume_empty_provider_location(self, delete_fcd):
volume = self._create_volume_obj()
self._driver.delete_volume(volume)
delete_fcd.assert_not_called()
@mock.patch.object(volumeops.FcdLocation, 'from_provider_location')
@mock.patch.object(FCD_DRIVER, '_get_adapter_type')
def test_initialize_connection(

4
cinder/volume/drivers/vmware/fcd.py
View File

@ -123,6 +123,10 @@ class VMwareVStorageObjectDriver(vmdk.VMwareVcVmdkDriver):
:param volume: The volume to delete.
"""
if not volume.provider_location:
LOG.warning("FCD provider location is empty for volume %s",
volume.id)
else:
self._delete_fcd(volume.provider_location)
def initialize_connection(self, volume, connector, initiator_data=None):