openstack
/
nova
Code Issues Proposed changes

Merge "Default image.size to 0 when extracting v1 image attributes"

This commit is contained in:
Jenkins 2016-08-03 11:20:46 +00:00 committed by Gerrit Code Review
parent 1d4b5b8258 7a16c754fb
commit 6b3dd1bad8
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/image/glance.py
View File

@ -965,7 +965,9 @@ def _extract_attributes(image, include_locations=False):
output[attr] = getattr(image, attr, None)
# NOTE(mdorman): 'size' attribute must not be 'None', so use 0 instead
elif attr == 'size':
output[attr] = getattr(image, attr) or 0
# NOTE(mriedem): A snapshot image may not have the size attribute
# set so default to 0.
output[attr] = getattr(image, attr, 0) or 0
else:
# NOTE(xarses): Anything that is caught with the default value
# will result in an additional lookup to glance for said attr.

19
nova/tests/unit/image/test_glance.py
View File

@ -2412,6 +2412,25 @@ class TestExtractAttributes(test.NoDBTestCase):
image_v2, include_locations=False)
self.assertEqual(v1_output, v2_output)
@mock.patch.object(schemas, 'Schema', side_effect=FakeSchema)
def test_extract_image_attributes_empty_images_no_size(self,
mocked_schema):
image_v1_dict = dict(image_fixtures['empty_image_v1'])
# pop the size attribute since it might not be set on a snapshot image
image_v1_dict.pop('size')
image_v2 = ImageV2(image_fixtures['empty_image_v2'])
image_v1 = collections.namedtuple('_', image_v1_dict.keys())(
**image_v1_dict)
self.flags(use_glance_v1=True, group='glance')
v1_output = glance._translate_from_glance(
image_v1, include_locations=False)
self.flags(use_glance_v1=False, group='glance')
v2_output = glance._translate_from_glance(
image_v2, include_locations=False)
self.assertEqual(v1_output, v2_output)
@mock.patch.object(schemas, 'Schema', side_effect=FakeSchema)
def test_extract_image_attributes_active_images_custom_prop(
self, mocked_schema):