diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-23 03:35:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-23 03:35:20 +0000 |
| commit | 4a88dee0f64d5bee3970511c6937011151051531 (patch) | |
| tree | 2e2854f808938f69beadc01052a6cb77f2d91349 | |
| parent | 6c5cc62a8a9546a20cbc410eff039a8b0af791c3 (diff) | |
| parent | edf15fdd38c670482848d2407a013a2ec4addd17 (diff) | |
| download | nova-4a88dee0f64d5bee3970511c6937011151051531.tar.gz nova-4a88dee0f64d5bee3970511c6937011151051531.tar.xz nova-4a88dee0f64d5bee3970511c6937011151051531.zip | |
Merge "Removes unnecessary qemu-img dependency on powervm driver"
| -rw-r--r-- | nova/tests/test_powervm.py | 6 | ||||
| -rw-r--r-- | nova/virt/powervm/blockdev.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nova/tests/test_powervm.py b/nova/tests/test_powervm.py index ad0e4539c..640497fb0 100644 --- a/nova/tests/test_powervm.py +++ b/nova/tests/test_powervm.py @@ -151,11 +151,11 @@ class PowerVMDriverTestCase(test.TestCase): self.assertTrue(self.powervm_connection.instance_exists(name)) def test_spawn(self): - def fake_image_fetch_to_raw(context, image_id, file_path, + def fake_image_fetch(context, image_id, file_path, user_id, project_id): pass self.flags(powervm_img_local_path='/images/') - self.stubs.Set(images, 'fetch_to_raw', fake_image_fetch_to_raw) + self.stubs.Set(images, 'fetch', fake_image_fetch) image_meta = {} image_meta['id'] = '666' fake_net_info = network_model.NetworkInfo([ @@ -173,7 +173,7 @@ class PowerVMDriverTestCase(test.TestCase): raise ex self.flags(powervm_img_local_path='/images/') - self.stubs.Set(images, 'fetch_to_raw', lambda *x, **y: None) + self.stubs.Set(images, 'fetch', lambda *x, **y: None) self.stubs.Set( self.powervm_connection._powervm._disk_adapter, 'create_volume_from_image', diff --git a/nova/virt/powervm/blockdev.py b/nova/virt/powervm/blockdev.py index 58ad29099..6c8e4b9a5 100644 --- a/nova/virt/powervm/blockdev.py +++ b/nova/virt/powervm/blockdev.py @@ -159,9 +159,9 @@ class PowerVMLocalVolumeAdapter(PowerVMDiskAdapter): if not os.path.isfile(file_path): LOG.debug(_("Fetching image '%s' from glance") % image_id) - images.fetch_to_raw(context, image_id, file_path, - instance['user_id'], - project_id=instance['project_id']) + images.fetch(context, image_id, file_path, + instance['user_id'], + instance['project_id']) else: LOG.debug((_("Using image found at '%s'") % file_path)) |