openstack
/
cinder
Code Issues Proposed changes

Merge "VMware: Skip unsupported datastore types"

This commit is contained in:
Jenkins 2015-11-24 18:21:04 +00:00 committed by Gerrit Code Review
parent a4982342b2 c20778fe6b
commit 683bc2e687
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cinder/tests/unit/test_vmware_datastore.py
View File

@ -71,6 +71,21 @@ class DatastoreTest(test.TestCase):
host.value = value
return host
def test_filter_datastores_with_unsupported_type(self):
ds_1 = self._create_datastore('ds-1')
ds_2 = self._create_datastore('ds-2')
datastores = [ds_1, ds_2]
self._vops.get_summary.side_effect = [
self._create_summary(ds_1),
self._create_summary(ds_2, _type='foo')]
res = self._ds_sel._filter_datastores(
datastores, units.Ki, None, None, None)
self.assertEqual(1, len(res))
self.assertEqual(ds_1, res[0].datastore)
@mock.patch('cinder.volume.drivers.vmware.datastore.DatastoreSelector.'
'_filter_by_profile')
def test_filter_datastores(self, filter_by_profile):

1
cinder/volume/drivers/vmware/datastore.py
View File

@ -115,6 +115,7 @@ class DatastoreSelector(object):
return [summary for summary in filtered_summaries
if (summary.freeSpace > size_bytes and
summary.type.lower() in DatastoreType.get_all_types() and
(hard_affinity_ds_types is None or
summary.type.lower() in hard_affinity_ds_types))]