Merge "Use CONF.long_rpc_timeout in post_live_migration_at_destination"

Author: Zuul

nova/compute/rpcapi.py

@@ -695,7 +695,9 @@ def post_live_migration_at_destination(self, ctxt, instance,
             block_migration, host):
         version = '5.0'
         cctxt = self.router.client(ctxt).prepare(
-                server=host, version=version)
+                server=host, version=version,
+                call_monitor_timeout=CONF.rpc_response_timeout,
+                timeout=CONF.long_rpc_timeout)
         return cctxt.call(ctxt, 'post_live_migration_at_destination',
             instance=instance, block_migration=block_migration)
 

nova/tests/unit/compute/test_rpcapi.py

@@ -342,9 +342,11 @@ def test_live_migration_abort(self):
                 migration_id='1', version='5.0')
 
     def test_post_live_migration_at_destination(self):
+        self.flags(long_rpc_timeout=1234)
         self._test_compute_api('post_live_migration_at_destination', 'call',
                 instance=self.fake_instance_obj,
-                block_migration='block_migration', host='host', version='5.0')
+                block_migration='block_migration', host='host', version='5.0',
+                timeout=1234, call_monitor_timeout=60)
 
     def test_pause_instance(self):
         self._test_compute_api('pause_instance', 'cast',