openstack
/
nova
Code Issues Proposed changes

compute: only use non_inheritable_image_properties if snapshotting 

The CONF.non_inheritable_image_properties parameter lists a set of
image metadata properties that should be discarded when uploading
an image to glance during the snapshotting process.

This property is currently applied in the nova.utils method
get_image_from_system_metadata(), which causes the properties in
question to be discarded in a wide variety of non-snapshotting
related operations.

This is a regression caused by two commits:

  commit 8e575be75c
  Author: Xavier Queralt <xqueralt@redhat.com>
  Date: Mon Aug 26 22:53:03 2013 +0200

    Add methods to get image metadata from instance

  commit 4389f2292a
  Author: Xavier Queralt <xqueralt@redhat.com>
  Date: Mon Aug 26 22:55:46 2013 +0200

    Avoid errors on some actions when image not usable

Which moved handling of CONF.non_inheritable_image_properties out
of the compute API _create_image() method, and into nova.utils.

Fix this by moving the handing back into the compute API in its
original location.

Closes-bug: #1459760
Change-Id: Id630fe68678c4aa469ddbfdb3c757b264519e918
This commit is contained in:
Daniel P. Berrange 2015-05-29 11:03:02 +01:00
parent 9491f8be82
commit 9fc47e6346
4 changed files with 47 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/compute/api.py
View File

@ -2171,6 +2171,12 @@ class API(base.Base):
sent_meta = compute_utils.get_image_metadata(
context, self.image_api, image_ref, instance)
# Delete properties that are non-inheritable
image_props = sent_meta.get("properties", {})
for key in image_props.keys():
if key in CONF.non_inheritable_image_properties:
del image_props[key]
sent_meta['name'] = name
sent_meta['is_public'] = False

80
nova/tests/unit/compute/test_compute_api.py
View File

@ -1719,20 +1719,49 @@ class _ComputeAPIUnitTestMixIn(object):
min_disk=None,
create_fails=False,
instance_vm_state=vm_states.ACTIVE):
params = dict(locked=True)
instance = self._create_instance_obj(params=params)
instance.vm_state = instance_vm_state
# 'cache_in_nova' is for testing non-inheritable properties
# 'user_id' should also not be carried from sys_meta into
# image property...since it should be set explicitly by
# _create_image() in compute api.
fake_sys_meta = dict(image_foo='bar', blah='bug?',
image_cache_in_nova='dropped',
cache_in_nova='dropped',
user_id='meow')
if with_base_ref:
fake_sys_meta['image_base_image_ref'] = 'fake-base-ref'
params = dict(system_metadata=fake_sys_meta, locked=True)
instance = self._create_instance_obj(params=params)
instance.vm_state = instance_vm_state
fake_sys_meta.update(instance.system_metadata)
fake_image_meta = {
'is_public': True,
'name': 'base-name',
'properties': {
'user_id': 'meow',
'foo': 'bar',
'blah': 'bug?',
'cache_in_nova': 'dropped',
},
}
image_type = is_snapshot and 'snapshot' or 'backup'
sent_meta = {
'is_public': False,
'name': 'fake-name',
'properties': {
'user_id': self.context.user_id,
'instance_uuid': instance.uuid,
'image_type': image_type,
'foo': 'bar',
'blah': 'bug?',
'cow': 'moo',
'cat': 'meow',
},
}
if is_snapshot:
if min_ram is not None:
fake_image_meta['min_ram'] = min_ram
sent_meta['min_ram'] = min_ram
if min_disk is not None:
fake_image_meta['min_disk'] = min_disk
sent_meta['min_disk'] = min_disk
else:
sent_meta['properties']['backup_type'] = 'fake-backup-type'
extra_props = dict(cow='moo', cat='meow')
self.mox.StubOutWithMock(compute_utils, 'get_image_metadata')
@ -1751,40 +1780,13 @@ class _ComputeAPIUnitTestMixIn(object):
self.compute_api.is_volume_backed_instance(self.context,
instance).AndReturn(False)
image_type = is_snapshot and 'snapshot' or 'backup'
expected_sys_meta = dict(fake_sys_meta)
expected_sys_meta.pop('cache_in_nova')
expected_sys_meta.pop('image_cache_in_nova')
expected_sys_meta.pop('user_id')
expected_sys_meta['foo'] = expected_sys_meta.pop('image_foo')
if with_base_ref:
expected_sys_meta['base_image_ref'] = expected_sys_meta.pop(
'image_base_image_ref')
expected_props = {'instance_uuid': instance.uuid,
'user_id': self.context.user_id,
'image_type': image_type}
expected_props.update(extra_props)
expected_props.update(expected_sys_meta)
expected_meta = {'name': 'fake-name',
'is_public': False,
'properties': expected_props}
if is_snapshot:
if min_ram is not None:
expected_meta['min_ram'] = min_ram
if min_disk is not None:
expected_meta['min_disk'] = min_disk
else:
expected_props['backup_type'] = 'fake-backup-type'
compute_utils.get_image_metadata(
self.context, self.compute_api.image_api,
FAKE_IMAGE_REF, instance).AndReturn(expected_meta)
FAKE_IMAGE_REF, instance).AndReturn(fake_image_meta)
fake_image = dict(id='fake-image-id')
mock_method = self.compute_api.image_api.create(
self.context, expected_meta)
self.context, sent_meta)
if create_fails:
mock_method.AndRaise(test.TestingException())
else:

11
nova/tests/unit/test_utils.py
View File

@ -900,17 +900,6 @@ class GetImageFromSystemMetadataTestCase(test.NoDBTestCase):
for key in utils.SM_INHERITABLE_KEYS:
self.assertNotIn(key, image)
def test_non_inheritable_image_properties(self):
sys_meta = self.get_system_metadata()
sys_meta["%soo1" % utils.SM_IMAGE_PROP_PREFIX] = "bar"
self.flags(non_inheritable_image_properties=["foo1"])
image = utils.get_image_from_system_metadata(sys_meta)
# Verify that the foo1 key has not been inherited
self.assertNotIn("foo1", image)
class VersionTestCase(test.NoDBTestCase):
def test_convert_version_to_int(self):

3
nova/utils.py
View File

@ -1116,9 +1116,6 @@ def get_image_from_system_metadata(system_meta):
if key in SM_INHERITABLE_KEYS:
image_meta[key] = value
else:
# Skip properties that are non-inheritable
if key in CONF.non_inheritable_image_properties:
continue
properties[key] = value
image_meta['properties'] = properties