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
openstack · Feb 18, 2013 · 376dafd · 376dafd
1 parent 9e2b990
commit 376dafd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
@@ -472,7 +472,7 @@ def _init_instance(self, context, instance):
 
             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
@@ -3551,7 +3551,7 @@ def test_init_instance_failed_resume_sets_error(self):
                 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)