openstack
/
cinder
Code Issues Proposed changes

Glance: remove _extract_attributes method 

This is only used in unit tests and no live code.
Move it to the unit tests.

Change-Id: Idb18fe01676c357ba25c36f0645ff1483863d122
This commit is contained in:
Eric Harney 2022-04-11 11:23:25 -04:00
parent 2621b18916
commit 5bf919dc1f
2 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cinder/image/glance.py
View File

@ -635,35 +635,6 @@ def _convert_to_string(metadata: dict) -> dict:
return _convert(_json_dumps, metadata)
def _extract_attributes(image):
# NOTE(hdd): If a key is not found, base.Resource.__getattr__() may perform
# a get(), resulting in a useless request back to glance. This list is
# therefore sorted, with dependent attributes as the end
# 'deleted_at' depends on 'deleted'
# 'checksum' depends on 'status' == 'active'
IMAGE_ATTRIBUTES = ('size', 'disk_format', 'owner',
'container_format', 'status', 'id',
'name', 'created_at', 'updated_at',
'deleted', 'deleted_at', 'checksum',
'min_disk', 'min_ram', 'protected',
'visibility',
'cinder_encryption_key_id')
output: Dict[str, Any] = {}
for attr in IMAGE_ATTRIBUTES:
if attr == 'deleted_at' and not output['deleted']:
output[attr] = None
elif attr == 'checksum' and output['status'] != 'active':
output[attr] = None
else:
output[attr] = getattr(image, attr, None)
output['properties'] = getattr(image, 'properties', {})
return output
def _remove_read_only(image_meta: dict) -> dict:
IMAGE_ATTRIBUTES = ['status', 'updated_at', 'created_at', 'deleted_at']
output = copy.deepcopy(image_meta)

25
cinder/tests/unit/image/test_glance.py
View File

@ -984,6 +984,29 @@ class TestGlanceImageService(test.TestCase):
attribute as the client would return if they're not set in the
database. Regression test for bug #1308058.
"""
def _extract_attributes(image):
IMAGE_ATTRIBUTES = ('size', 'disk_format', 'owner',
'container_format', 'status', 'id',
'name', 'created_at', 'updated_at',
'deleted', 'deleted_at', 'checksum',
'min_disk', 'min_ram', 'protected',
'visibility',
'cinder_encryption_key_id')
output = {}
for attr in IMAGE_ATTRIBUTES:
if attr == 'deleted_at' and not output['deleted']:
output[attr] = None
elif attr == 'checksum' and output['status'] != 'active':
output[attr] = None
else:
output[attr] = getattr(image, attr, None)
output['properties'] = getattr(image, 'properties', {})
return output
class MyFakeGlanceImage(glance_stubs.FakeImage):
def __init__(self, metadata):
IMAGE_ATTRIBUTES = ['size', 'disk_format', 'owner',
@ -1001,7 +1024,7 @@ class TestGlanceImageService(test.TestCase):
'updated_at': self.NOW_DATETIME,
}
image = MyFakeGlanceImage(metadata)
actual = glance._extract_attributes(image)
actual = _extract_attributes(image)
expected = {
'id': 1,
'name': None,