diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-19 10:13:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-19 10:13:03 +0000 |
| commit | af65befd7edb88f7143d8cf06911e3dbeea2d97e (patch) | |
| tree | 11ad02feb15e373c03029922cf78342a8b622c4b | |
| parent | 399bfa66b77c7a423a123066aad48e691653a3dc (diff) | |
| parent | 376dafd32f8b985e2af556315d9f33cfb62df96f (diff) | |
| download | nova-af65befd7edb88f7143d8cf06911e3dbeea2d97e.tar.gz nova-af65befd7edb88f7143d8cf06911e3dbeea2d97e.tar.xz nova-af65befd7edb88f7143d8cf06911e3dbeea2d97e.zip | |
Merge "Fix _get_instance_volume_block_device_info call parameter"
| -rwxr-xr-x | nova/compute/manager.py | 2 | ||||
| -rw-r--r-- | nova/tests/compute/test_compute.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 3bedfb1f0..9d4fc0a46 100755 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -472,7 +472,7 @@ class ComputeManager(manager.SchedulerDependentManager): block_device_info = \ self._get_instance_volume_block_device_info( - context, instance['uuid']) + context, instance) try: self.driver.resume_state_on_host_boot( diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index f16ea6b5d..d1a7952f3 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -3551,7 +3551,7 @@ class ComputeTestCase(BaseTestCase): instance).AndReturn(power_state.SHUTDOWN) self.compute.driver.plug_vifs(instance, mox.IgnoreArg()) self.compute._get_instance_volume_block_device_info(mox.IgnoreArg(), - instance['uuid']).AndReturn('fake-bdm') + instance).AndReturn('fake-bdm') self.compute.driver.resume_state_on_host_boot(mox.IgnoreArg(), instance, mox.IgnoreArg(), 'fake-bdm').AndRaise(test.TestingException) |