openstack
/
nova
Code Issues Proposed changes

Merge "Fix Cells ImagePropertiesFilter can raise exceptions"

This commit is contained in:
Jenkins 2014-07-22 02:26:09 +00:00 committed by Gerrit Code Review
parent 7095575e1c 70e0d3f13b
commit e0a00504bc
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/cells/filters/image_properties.py
View File

@ -58,8 +58,8 @@ class ImagePropertiesFilter(filters.BaseCellFilter):
l = list(version)
version = str(l[0])
if version is None or self._matches_version(version,
hypervisor_version_requires):
if not version or self._matches_version(version,
hypervisor_version_requires):
filtered_cells.append(cell)
return filtered_cells

1
nova/tests/cells/test_cells_filters.py
View File

@ -82,6 +82,7 @@ class ImagePropertiesFilter(_FilterTestClass):
def test_missing_hypervisor_version_in_cells(self):
image = {'properties': {'hypervisor_version_requires': '>6.2.1'}}
self.filter_props['request_spec'] = {'image': image}
self.cell1.capabilities = {"prominent_hypervisor_version": set([])}
self.assertEqual(self.cells,
self._filter_cells(self.cells, self.filter_props))