← Back to branch summary

~gandelman-a/ubuntu/precise/nova/UCA_2012.2.1

« back to all changes in this revision

Viewing changes to nova/tests/fake_imagebackend.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2012-08-16 14:04:11 UTC
  • mfrom: (1.1.59)
  • Revision ID: package-import@ubuntu.com-20120816140411-8dvudjblnx1w0mwx
Tags: 2012.2~f3-0ubuntu1
https://launchpad.net/bugs/1002111
[ Chuck Short ]
* New upstream version.
* debian/rules: Re-enable testsuite.
* debian/control:
  - Add python-quantumclient as a build depends.
  - Bump standards to 3.9.3
  - Fix lintian warnings.
  - Recommend python-glanceclient and python-keystoneclient.
  - Add dependency of iptables for nova-network.
* debian/watch: Update
* debian/rules: Do not run pep8 tests since upstream is still using an
  older pep8.
* debian/patches/0001-Update-tools-hacking-for-pep8-1.2-and-
  beyond.patch: Get the testsuite running again.
* debian/nova-volume.install, debian/nova_tgt: Add support for
  persistent volumes.

[ Adam Gandelman ]
* debian/{nova-api.install, nova-api-metadata.install}: Install
  api-metadata.filters. (LP: #1002111)
* debian/control: Added python-glanceclient.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/fake_imagebackend.py
25
25
    def __init__(self, use_cow):
26
26
        pass
27
27
 
28
 
    def image(self, instance, name, suffix='', image_type=''):
 
28
    def image(self, instance, name, image_type=''):
29
29
        class FakeImage(imagebackend.Image):
30
 
            def __init__(self, instance, name, suffix=''):
31
 
                self.path = os.path.join(instance, name + suffix)
 
30
            def __init__(self, instance, name):
 
31
                self.path = os.path.join(instance, name)
32
32
 
33
33
            def create_image(self, prepare_template, base,
34
34
                              size, *args, **kwargs):
37
37
            def cache(self, fn, fname, size=None, *args, **kwargs):
38
38
                pass
39
39
 
40
 
            def libvirt_info(self, device_type):
 
40
            def libvirt_info(self, disk_bus, disk_dev,
 
41
                             device_type, cache_mode):
41
42
                info = config.LibvirtConfigGuestDisk()
42
43
                info.source_type = 'file'
43
44
                info.source_device = device_type
 
45
                info.target_bus = disk_bus
 
46
                info.target_dev = disk_dev
 
47
                info.driver_cache = cache_mode
44
48
                info.driver_format = 'raw'
45
49
                info.source_path = self.path
46
50
                return info
47
51
 
48
 
        return FakeImage(instance, name, suffix)
 
52
        return FakeImage(instance, name)