Default embedded instance.flavor.disabled attribute

Before we stored flavors in instance_extra, certain fields, defined
in nova.compute.flavors.system_metadata_flavor_props, were stored
in the instance.system_metadata for the embedded instance.flavor.
The "disabled" field wasn't one of those keys, however, so really
old instances that had their embedded flavor converted to the
serialized instance_extra form won't have the disabled attribute
set and we need to default those here so callers, like the
versioned notfication FlavorPayload, don't explode trying to load
instance.flavor.disabled.

Change-Id: I72f8c11b8b2df1416dec8e2d9250eac0693a30e9
Closes-Bug: #1739325
(cherry picked from commit 8df21c1e5f)
(cherry picked from commit b2146b02a9)
This commit is contained in:
Matt Riedemann 2018-07-03 13:03:54 -04:00
parent 966a5a2154
commit 06387be590
2 changed files with 32 additions and 0 deletions

View File

@ -320,17 +320,32 @@ class Instance(base.NovaPersistentObject, base.NovaObject,
def _flavor_from_db(self, db_flavor):
"""Load instance flavor information from instance_extra."""
# Before we stored flavors in instance_extra, certain fields, defined
# in nova.compute.flavors.system_metadata_flavor_props, were stored
# in the instance.system_metadata for the embedded instance.flavor.
# The "disabled" field wasn't one of those keys, however, so really
# old instances that had their embedded flavor converted to the
# serialized instance_extra form won't have the disabled attribute
# set and we need to default those here so callers don't explode trying
# to load instance.flavor.disabled.
def _default_disabled(flavor):
if 'disabled' not in flavor:
flavor.disabled = False
flavor_info = jsonutils.loads(db_flavor)
self.flavor = objects.Flavor.obj_from_primitive(flavor_info['cur'])
_default_disabled(self.flavor)
if flavor_info['old']:
self.old_flavor = objects.Flavor.obj_from_primitive(
flavor_info['old'])
_default_disabled(self.old_flavor)
else:
self.old_flavor = None
if flavor_info['new']:
self.new_flavor = objects.Flavor.obj_from_primitive(
flavor_info['new'])
_default_disabled(self.new_flavor)
else:
self.new_flavor = None
self.obj_reset_changes(['flavor', 'old_flavor', 'new_flavor'])

View File

@ -350,6 +350,23 @@ class _TestInstanceObject(object):
inst.key_name,
localonly=True)
@mock.patch.object(db, 'instance_get_by_uuid')
def test_lazy_load_flavor_from_extra(self, mock_get):
inst = objects.Instance(context=self.context, uuid=uuids.instance)
# These disabled values are only here for logic testing purposes to
# make sure we default the "new" flavor's disabled value to False on
# load from the database.
fake_flavor = jsonutils.dumps(
{'cur': objects.Flavor(disabled=False).obj_to_primitive(),
'old': objects.Flavor(disabled=True).obj_to_primitive(),
'new': objects.Flavor().obj_to_primitive()})
fake_inst = dict(self.fake_instance, extra={'flavor': fake_flavor})
mock_get.return_value = fake_inst
# Assert the disabled values on the flavors.
self.assertFalse(inst.flavor.disabled)
self.assertTrue(inst.old_flavor.disabled)
self.assertFalse(inst.new_flavor.disabled)
@mock.patch.object(db, 'instance_get_by_uuid')
def test_get_remote(self, mock_get):
# isotime doesn't have microseconds and is always UTC