summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorRussell Bryant <rbryant@redhat.com>2012-11-15 12:43:55 -0500
committerRussell Bryant <rbryant@redhat.com>2012-11-19 20:07:06 -0500
commit2f6873deea0084998a9514f892e6b50ebef47174 (patch)
tree5545902704e7b5648d35fd72e8719cb982257a61 /nova/tests
parentf5119ca582e5fd5f42ab32a765352314aa5ae28b (diff)
Move db lookup for block device mappings.
This patch moves the db blookup for block device mappings for an instance out of the _setup_block_device_mapping() function in the compute manager. The db lookups are now done much closer to the rpc entry-points to the compute manager. There are two rpc methods that eventually call down into this function: run_instance and rebuild_instance. This bit of refactoring will make it a bit easier to update these methods to take in the block device mappings over rpc. Part of blueprint no-db-messaging. Change-Id: Id7d061e10ddc9e0d081e0ee97331631796b47729
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/compute/test_compute.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index 662a90be4..087411112 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -1480,7 +1480,7 @@ class ComputeTestCase(BaseTestCase):
self.mox.StubOutWithMock(self.compute, "_setup_block_device_mapping")
self.compute._setup_block_device_mapping(
- mox.IgnoreArg(),
+ mox.IgnoreArg(), mox.IgnoreArg(),
mox.IgnoreArg()).AndRaise(rpc.common.RemoteError('', '', ''))
self.mox.ReplayAll()