Merge "Make compute rpcapi 'live_migration' backward compatible"

nova/compute/rpcapi.py

@@ -628,6 +628,7 @@ class ComputeAPI(object):
                     pre_migration_result=True)
         if not self.client.can_send_version(version):
             version = '4.0'
+            args.pop('migration')
         cctxt = self.client.prepare(server=host, version=version)
         cctxt.cast(ctxt, 'live_migration', instance=instance,
                    dest=dest, block_migration=block_migration,

nova/tests/unit/compute/test_rpcapi.py

@@ -620,7 +620,6 @@ class ComputeRpcAPITestCase(test.NoDBTestCase):
                                callargs={'instance': 'foo',
                                          'dest': 'foo',
                                          'block_migration': False,
-                                         'migration': None,
                                          'migrate_data': {
                                              'pre_live_migration_result': {}}},
                                callret=None,