diff options
| -rw-r--r-- | nova/compute/manager.py | 2 | ||||
| -rw-r--r-- | nova/tests/unit/compute/test_compute.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index f0614962f3..8e7b888559 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -794,7 +794,7 @@ class ComputeManager(manager.Manager): if data: shared_storage = (self.compute_rpcapi. check_instance_shared_storage(context, - instance, data, host=host)) + data, instance=instance, host=host)) except NotImplementedError: LOG.debug('Hypervisor driver does not support ' 'instance shared storage check, ' diff --git a/nova/tests/unit/compute/test_compute.py b/nova/tests/unit/compute/test_compute.py index 02bcbd8f31..67d459b645 100644 --- a/nova/tests/unit/compute/test_compute.py +++ b/nova/tests/unit/compute/test_compute.py @@ -7654,8 +7654,9 @@ class ComputeTestCase(BaseTestCase, mock_get_blk.assert_called_once_with(fake_context, evacuated_instance) mock_check_local.assert_called_once_with(fake_context, evacuated_instance) - mock_check.assert_called_once_with(fake_context, evacuated_instance, + mock_check.assert_called_once_with(fake_context, {'filename': 'tmpfilename'}, + instance=evacuated_instance, host=None) mock_check_clean.assert_called_once_with(fake_context, {'filename': 'tmpfilename'}) |