Merge "Add migration_update to conductor."

2 files changed, 14 insertions, 4 deletions

diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index 32cd3ca3e..96d1f4250 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -2754,10 +2754,10 @@ class ComputeTestCase(BaseTestCase):
             self.assertEqual(dest_compute, CONF.host)
             return migrations
 
-        def fake_migration_update(context, migration_id, values):
+        def fake_migration_update(context, m, status):
             for migration in migrations:
-                if migration['id'] == migration_id and 'status' in values:
-                    migration['status'] = values['status']
+                if migration['id'] == m['id']:
+                    migration['status'] = status
 
         def fake_confirm_resize(context, instance):
             # raise exception for 'fake_uuid4' to check migration status
@@ -2772,7 +2772,7 @@ class ComputeTestCase(BaseTestCase):
                 fake_instance_get_by_uuid)
         self.stubs.Set(db, 'migration_get_unconfirmed_by_dest_compute',
                 fake_migration_get_unconfirmed_by_dest_compute)
-        self.stubs.Set(db, 'migration_update',
+        self.stubs.Set(self.compute.conductor_api, 'migration_update',
                 fake_migration_update)
         self.stubs.Set(self.compute.compute_api, 'confirm_resize',
                 fake_confirm_resize)
diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py
index e3138fd34..d3c555822 100644
--- a/nova/tests/conductor/test_conductor.py
+++ b/nova/tests/conductor/test_conductor.py
@@ -24,6 +24,7 @@ from nova import context
 from nova import db
 from nova.db.sqlalchemy import models
 from nova import notifications
+from nova.openstack.common import jsonutils
 from nova import test
 
 
@@ -88,6 +89,15 @@ class ConductorTestCase(BaseTestCase):
             self.assertRaises(KeyError,
                               self._do_update, 'any-uuid', foobar=1)
 
+    def test_migration_update(self):
+        migration = db.migration_create(self.context.elevated(),
+                {'instance_uuid': 'fake-uuid',
+                 'status': 'migrating'})
+        migration_p = jsonutils.to_primitive(migration)
+        migration = self.conductor.migration_update(self.context, migration_p,
+                                                    'finished')
+        self.assertEqual(migration['status'], 'finished')
+
 
 class ConductorRPCAPITestCase(ConductorTestCase):
     """Conductor RPC API Tests"""