Merge "Rename imagebackend arguments."

This commit is contained in:
Jenkins
2012-09-03 14:49:36 +00:00
committed by Gerrit Code Review
2 changed files with 5 additions and 5 deletions

View File

@@ -34,11 +34,11 @@ class Backend(object):
size, *args, **kwargs): size, *args, **kwargs):
pass pass
def cache(self, fn, fname, size=None, *args, **kwargs): def cache(self, fetch_func, filename, size=None, *args, **kwargs):
pass pass
def libvirt_info(self, disk_bus, disk_dev, def libvirt_info(self, disk_bus, disk_dev, device_type,
device_type, cache_mode): cache_mode):
info = config.LibvirtConfigGuestDisk() info = config.LibvirtConfigGuestDisk()
info.source_type = 'file' info.source_type = 'file'
info.source_device = device_type info.source_device = device_type

View File

@@ -1882,8 +1882,8 @@ class LibvirtConnTestCase(test.TestCase):
# large disk space. # large disk space.
self.mox.StubOutWithMock(imagebackend.Image, 'cache') self.mox.StubOutWithMock(imagebackend.Image, 'cache')
imagebackend.Image.cache(context=mox.IgnoreArg(), imagebackend.Image.cache(context=mox.IgnoreArg(),
fn=mox.IgnoreArg(), fetch_func=mox.IgnoreArg(),
fname='otherdisk', filename='otherdisk',
image_id=123456, image_id=123456,
project_id='fake', project_id='fake',
size=10737418240L, size=10737418240L,