openstack/cinder
Code Issues Proposed changes

Merge "Port vmware datastore to Python 3"

Browse Source
This commit is contained in:
Jenkins 2015-11-07 05:35:22 +00:00 committed by Gerrit Code Review
commit a06236e6c1
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,12 +113,10 @@ class DatastoreSelector(object):
filtered_summaries = [self._vops.get_summary(ds) for ds in
filtered_datastores]
def _filter(summary):
return (summary.freeSpace > size_bytes and
return [summary for summary in filtered_summaries
if (summary.freeSpace > size_bytes and
(hard_affinity_ds_types is None or
summary.type.lower() in hard_affinity_ds_types))
return filter(_filter, filtered_summaries)
summary.type.lower() in hard_affinity_ds_types))]
def _get_all_hosts(self):
"""Get all ESX hosts managed by vCenter."""

1
tests-py3.txt
View File

@ -108,6 +108,7 @@ cinder.tests.unit.test_v6000_fcp
cinder.tests.unit.test_v6000_iscsi
cinder.tests.unit.test_v7000_common
cinder.tests.unit.test_v7000_fcp
cinder.tests.unit.test_vmware_datastore
cinder.tests.unit.test_vmware_vmdk
cinder.tests.unit.test_vmware_volumeops
cinder.tests.unit.test_volume