openstack/nova
Code Issues Proposed changes

Merge "Set migration_type for existing cold migrations and resizes"

Browse Source
This commit is contained in:
Jenkins 2015-05-15 17:39:55 +00:00 committed by Gerrit Code Review
commit a443494024
4 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nova/compute/api.py
View File

@ -2549,6 +2549,9 @@ class API(base.Base):
mig.old_instance_type_id = current_instance_type['id']
mig.new_instance_type_id = new_instance_type['id']
mig.status = 'finished'
mig.migration_type = (
mig.old_instance_type_id != mig.new_instance_type_id and
'resize' or 'migration')
mig.create()
@wrap_check_policy

3
nova/compute/resource_tracker.py
View File

@ -206,6 +206,9 @@ class ResourceTracker(object):
migration.instance_uuid = instance['uuid']
migration.source_compute = instance['host']
migration.source_node = instance['node']
migration.migration_type = (
migration.old_instance_type_id != migration.new_instance_type_id
and 'resize' or 'migration')
migration.create()
return migration

1
nova/tests/unit/compute/test_compute.py
View File

@ -7001,6 +7001,7 @@ class ComputeTestCase(BaseTestCase):
migration = objects.Migration(context=self.context.elevated())
migration.instance_uuid = instance.uuid
migration.status = 'finished'
migration.migration_type = 'resize'
migration.create()
instance.task_state = task_states.DELETING

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

@ -1329,6 +1329,10 @@ class _ComputeAPIUnitTestMixIn(object):
self.assertEqual(new_flavor.id,
mig.new_instance_type_id)
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.mox.StubOutWithMock(self.context, 'elevated')