openstack/nova
Code Issues Proposed changes

Merge "Default embedded instance.flavor.disabled attribute" into stable/ocata

Browse Source
This commit is contained in:
Zuul 2018-08-28 15:24:53 +00:00 committed by Gerrit Code Review
commit 7c684d47ad
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nova/objects/instance.py
View File

@ -315,17 +315,32 @@ class Instance(base.NovaPersistentObject, base.NovaObject,
def _flavor_from_db(self, db_flavor): def _flavor_from_db(self, db_flavor):
"""Load instance flavor information from instance_extra.""" """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) flavor_info = jsonutils.loads(db_flavor)
self.flavor = objects.Flavor.obj_from_primitive(flavor_info['cur']) self.flavor = objects.Flavor.obj_from_primitive(flavor_info['cur'])
_default_disabled(self.flavor)
if flavor_info['old']: if flavor_info['old']:
self.old_flavor = objects.Flavor.obj_from_primitive( self.old_flavor = objects.Flavor.obj_from_primitive(
flavor_info['old']) flavor_info['old'])
_default_disabled(self.old_flavor)
else: else:
self.old_flavor = None self.old_flavor = None
if flavor_info['new']: if flavor_info['new']:
self.new_flavor = objects.Flavor.obj_from_primitive( self.new_flavor = objects.Flavor.obj_from_primitive(
flavor_info['new']) flavor_info['new'])
_default_disabled(self.new_flavor)
else: else:
self.new_flavor = None self.new_flavor = None
self.obj_reset_changes(['flavor', 'old_flavor', 'new_flavor']) self.obj_reset_changes(['flavor', 'old_flavor', 'new_flavor'])

17
nova/tests/unit/objects/test_instance.py
View File

@ -332,6 +332,23 @@ class _TestInstanceObject(object):
inst.key_name, inst.key_name,
localonly=True) 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') @mock.patch.object(db, 'instance_get_by_uuid')
def test_get_remote(self, mock_get): def test_get_remote(self, mock_get):
# isotime doesn't have microseconds and is always UTC # isotime doesn't have microseconds and is always UTC