← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nova/saucy-proposed

« 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: 2013-02-22 09:27:29 UTC
  • mfrom: (1.1.68)
  • Revision ID: package-import@ubuntu.com-20130222092729-nn3gt8rf97uvts77
Tags: 2013.1.g3-0ubuntu1
https://launchpad.net/bugs/1110567
[ Chuck Short ]
* New usptream release. 
* debian/patches/debian/patches/fix-ubuntu-tests.patch: Refreshed.
* debian/nova-baremetal.logrotate: Fix logfile path.
* debian/control, debian/nova-spiceproxy.{install, logrotate, upstart}:
  Add spice html5 proxy support.
* debian/nova-novncproxy.upstart: Start on runlevel [2345]
* debian/rules: Call testr directly since run_tests.sh -N gives weird return
  value when tests pass.
* debian/pyddist-overrides: Add websockify.
* debian/nova-common.postinst: Removed config file conversion, since
  the option is no longer available. (LP: #1110567)
* debian/control: Add python-pyasn1 as a dependency.
* debian/control: Add python-oslo-config as a dependency.
* debian/control: Suggest sysfsutils, sg3-utils, multipath-tools for fibre
  channel support.

[ Adam Gandelman ]
* debian/control: Fix typo (websocikfy -> websockify).

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/fake_imagebackend.py
28
28
    def image(self, instance, name, image_type=''):
29
29
        class FakeImage(imagebackend.Image):
30
30
            def __init__(self, instance, name):
31
 
                self.path = os.path.join(instance, name)
 
31
                self.path = os.path.join(instance['name'], name)
32
32
 
33
33
            def create_image(self, prepare_template, base,
34
34
                              size, *args, **kwargs):
41
41
                pass
42
42
 
43
43
            def libvirt_info(self, disk_bus, disk_dev, device_type,
44
 
                             cache_mode):
 
44
                             cache_mode, extra_specs):
45
45
                info = config.LibvirtConfigGuestDisk()
46
46
                info.source_type = 'file'
47
47
                info.source_device = device_type