diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-21 23:02:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-21 23:02:03 +0000 |
| commit | 42cc03d8233fede7ed6ad5fa3b5fd351bd21c687 (patch) | |
| tree | a7edf916650fcff15475b3f1c0c1e3171821ad14 | |
| parent | 0f2dc94e9894649e3ff64dc3f8dd333930afe643 (diff) | |
| parent | 9860891a09eb58adadbd519644906e1c6215bf3b (diff) | |
| download | nova-42cc03d8233fede7ed6ad5fa3b5fd351bd21c687.tar.gz nova-42cc03d8233fede7ed6ad5fa3b5fd351bd21c687.tar.xz nova-42cc03d8233fede7ed6ad5fa3b5fd351bd21c687.zip | |
Merge "libvirt: Fix typo in configdrive implementation"
| -rw-r--r-- | nova/tests/test_libvirt.py | 14 | ||||
| -rw-r--r-- | nova/virt/libvirt/driver.py | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index c4816d202..83b7f43bc 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -769,6 +769,20 @@ class LibvirtConnTestCase(test.TestCase): vconfig.LibvirtConfigGuestDisk) self.assertEquals(cfg.devices[3].target_dev, 'vdd') + def test_get_guest_config_with_configdrive(self): + conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True) + instance_ref = db.instance_create(self.context, self.test_instance) + + # make configdrive.enabled_for() return True + instance_ref['config_drive'] = 'ANY_ID' + + cfg = conn.get_guest_config(instance_ref, [], None, None) + + self.assertEquals(type(cfg.devices[2]), + vconfig.LibvirtConfigGuestDisk) + self.assertEquals(cfg.devices[2].target_dev, + conn.default_last_device) + def test_get_guest_config_with_vnc(self): self.flags(libvirt_type='kvm', vnc_enabled=True, diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 115c6cd02..9931f8e4c 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -1646,7 +1646,7 @@ class LibvirtDriver(driver.ComputeDriver): diskconfig.driver_format = "raw" diskconfig.driver_cache = self.disk_cachemode diskconfig.source_path = os.path.join( - libvirt_utils.get_instance_path(instane), "disk.config") + libvirt_utils.get_instance_path(instance), "disk.config") diskconfig.target_dev = self.default_last_device diskconfig.target_bus = default_disk_bus devices.append(diskconfig) |