Set migration_type for existing cold migrations and resizes
Related to blueprint robustify-evacuate Change-Id: I7393df1d8fc751295c744805ac53f0cf5c61fcd5
This commit is contained in:
parent
13fb2d26d4
commit
4ee98501a1
|
@ -2549,6 +2549,9 @@ class API(base.Base):
|
||||||
mig.old_instance_type_id = current_instance_type['id']
|
mig.old_instance_type_id = current_instance_type['id']
|
||||||
mig.new_instance_type_id = new_instance_type['id']
|
mig.new_instance_type_id = new_instance_type['id']
|
||||||
mig.status = 'finished'
|
mig.status = 'finished'
|
||||||
|
mig.migration_type = (
|
||||||
|
mig.old_instance_type_id != mig.new_instance_type_id and
|
||||||
|
'resize' or 'migration')
|
||||||
mig.create()
|
mig.create()
|
||||||
|
|
||||||
@wrap_check_policy
|
@wrap_check_policy
|
||||||
|
|
|
@ -206,6 +206,9 @@ class ResourceTracker(object):
|
||||||
migration.instance_uuid = instance['uuid']
|
migration.instance_uuid = instance['uuid']
|
||||||
migration.source_compute = instance['host']
|
migration.source_compute = instance['host']
|
||||||
migration.source_node = instance['node']
|
migration.source_node = instance['node']
|
||||||
|
migration.migration_type = (
|
||||||
|
migration.old_instance_type_id != migration.new_instance_type_id
|
||||||
|
and 'resize' or 'migration')
|
||||||
migration.create()
|
migration.create()
|
||||||
return migration
|
return migration
|
||||||
|
|
||||||
|
|
|
@ -7001,6 +7001,7 @@ class ComputeTestCase(BaseTestCase):
|
||||||
migration = objects.Migration(context=self.context.elevated())
|
migration = objects.Migration(context=self.context.elevated())
|
||||||
migration.instance_uuid = instance.uuid
|
migration.instance_uuid = instance.uuid
|
||||||
migration.status = 'finished'
|
migration.status = 'finished'
|
||||||
|
migration.migration_type = 'resize'
|
||||||
migration.create()
|
migration.create()
|
||||||
|
|
||||||
instance.task_state = task_states.DELETING
|
instance.task_state = task_states.DELETING
|
||||||
|
|
|
@ -1329,6 +1329,10 @@ class _ComputeAPIUnitTestMixIn(object):
|
||||||
self.assertEqual(new_flavor.id,
|
self.assertEqual(new_flavor.id,
|
||||||
mig.new_instance_type_id)
|
mig.new_instance_type_id)
|
||||||
self.assertEqual('finished', mig.status)
|
self.assertEqual('finished', mig.status)
|
||||||
|
if new_flavor.id != current_flavor.id:
|
||||||
|
self.assertEqual('resize', mig.migration_type)
|
||||||
|
else:
|
||||||
|
self.assertEqual('migration', mig.migration_type)
|
||||||
|
|
||||||
self.stubs.Set(objects, 'Migration', _get_migration)
|
self.stubs.Set(objects, 'Migration', _get_migration)
|
||||||
self.mox.StubOutWithMock(self.context, 'elevated')
|
self.mox.StubOutWithMock(self.context, 'elevated')
|
||||||
|
|
Loading…
Reference in New Issue