diff options
| author | Yun Mao <yunmao@gmail.com> | 2013-02-18 15:25:01 -0500 |
|---|---|---|
| committer | Yun Mao <yunmao@gmail.com> | 2013-02-18 17:24:49 -0500 |
| commit | 376dafd32f8b985e2af556315d9f33cfb62df96f (patch) | |
| tree | 03273127e859f0ebd2f987dba6e3ee615ab28277 | |
| parent | 9e2b990f2260dbbe1b207e853b37f6261e594fbd (diff) | |
| download | nova-376dafd32f8b985e2af556315d9f33cfb62df96f.tar.gz nova-376dafd32f8b985e2af556315d9f33cfb62df96f.tar.xz nova-376dafd32f8b985e2af556315d9f33cfb62df96f.zip | |
Fix _get_instance_volume_block_device_info call parameter
_get_instance_volume_block_device_info() is expecting an
instance dict-like object instead of instance_uuid
Fix bug 1129441
Change-Id: Id4d536553ce9858434c377653fa79562e1282a34
| -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 1b545495c..e8cf08fc3 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 6c58fffe0..87d1eb510 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) |