openstack
/
nova
Code Issues Proposed changes

Merge "Remove cells v2 transition code from update_instance"

This commit is contained in:
Zuul 2019-05-13 17:35:14 +00:00 committed by Gerrit Code Review
parent c4216b805d 4eafb901a8
commit c84896c016
2 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nova/compute/api.py
View File

@ -2947,14 +2947,11 @@ class API(base.Base):
instance.update(updates)
instance.save()
else:
# If inst_map.cell_mapping does not point at a cell then
# cell migration has not happened yet.
# TODO(alaski): Make this a failure case after we put in
# a block that requires migrating to cellsv2.
instance = objects.Instance.get_by_uuid(
context, instance.uuid, expected_attrs=expected_attrs)
instance.update(updates)
instance.save()
# Conductor doesn't delete the BuildRequest until after the
# InstanceMapping record is created, so if we didn't get
# that and the BuildRequest doesn't exist, then the
# instance is already gone and we need to just error out.
raise exception.InstanceNotFound(instance_id=instance.uuid)
return instance
# NOTE(melwitt): We don't check instance lock for backup because lock is

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

@ -6363,13 +6363,11 @@ class _ComputeAPIUnitTestMixIn(object):
mock_inst_save.assert_called_once_with()
self.assertEqual('foo_updated', returned_instance.display_name)
@mock.patch.object(objects.Instance, 'get_by_uuid')
@mock.patch.object(objects.InstanceMapping, 'get_by_instance_uuid')
@mock.patch.object(objects.BuildRequest, 'get_by_instance_uuid')
def test_update_instance_not_in_cell_in_transition_state(self,
mock_buildreq_get,
mock_instmap_get,
mock_inst_get):
mock_instmap_get):
# This test is for covering the following case:
# - when we lookup the instance initially, that one is not yet mapped
@ -6377,7 +6375,7 @@ class _ComputeAPIUnitTestMixIn(object):
# - when we update the instance, that one could have been mapped
# meanwhile and the BuildRequest was deleted
# - if the instance is not mapped, lookup the API DB to find whether
# the instance was deleted, or if the cellv2 migration is not done
# the instance was deleted
self.useFixture(nova_fixtures.AllServicesCurrent())
@ -6389,24 +6387,15 @@ class _ComputeAPIUnitTestMixIn(object):
uuid=instance.uuid)
mock_instmap_get.side_effect = exception.InstanceMappingNotFound(
uuid='fake')
mock_inst_get.return_value = instance
updates = {'display_name': 'foo_updated'}
with mock.patch.object(instance, 'save') as mock_inst_save:
returned_instance = self.compute_api.update_instance(
self.context, instance, updates)
self.assertRaises(exception.InstanceNotFound,
self.compute_api.update_instance,
self.context, instance, updates)
mock_buildreq_get.assert_called_once_with(self.context, instance.uuid)
mock_inst_save.assert_called_once_with()
self.assertEqual('foo_updated', returned_instance.display_name)
# Let's do a quick verification on the same unittest to see what
# happens if the instance was deleted meanwhile.
mock_inst_get.side_effect = exception.InstanceNotFound(
instance_id=instance.uuid)
self.assertRaises(exception.InstanceNotFound,
self.compute_api.update_instance,
self.context, instance, updates)
mock_inst_save.assert_not_called()
def test_populate_instance_for_create_neutron_secgroups(self):
"""Tests that a list of security groups passed in do not actually get