x/python-ganttclient
Code Issues Proposed changes

Add a 'hw_' namespace to glance hardware config properties

Browse Source 
This updates the libvirt driver to use a 'hw_' prefix on
the names of hardware config properties it looks up for
glance images. Thus the new syntax for setting custom
hardware properties is

      # glance image-update \
               --property hw_disk_bus=ide \
               --property hw_cdrom_bus=ide \
               --property hw_vif_model=e1000 \
               f16-x86_64-openstack-sda

There is no back-compat support for the previous 'disk_bus',
'cdrom_bus' and 'vif_model' names, since they were never
made available in any formal release, only development
snapshots.

DocImpact
Blueprint: libvirt-custom-hardware
Fixes bug 1132739
Change-Id: Ic15ef0eba065113b35bbb2713be2532c858c3534
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange
2013-02-25 15:47:35 +00:00
parent a16836a013
commit 1d90ab49e1
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nova/tests/test_libvirt_blockinfo.py
View File

@@ -419,13 +419,13 @@ class LibvirtBlockInfoTest(test.TestCase):
device_type='cdrom') device_type='cdrom')
self.assertEqual(bus, 'ide') self.assertEqual(bus, 'ide')
image_meta = {'properties': {'disk_bus': 'scsi'}} image_meta = {'properties': {'hw_disk_bus': 'scsi'}}
bus = blockinfo.get_disk_bus_for_device_type('kvm', bus = blockinfo.get_disk_bus_for_device_type('kvm',
image_meta) image_meta)
self.assertEqual(bus, 'scsi') self.assertEqual(bus, 'scsi')
image_meta = {'properties': {'disk_bus': 'usb', image_meta = {'properties': {'hw_disk_bus': 'usb',
'cdrom_bus': 'scsi'}} 'hw_cdrom_bus': 'scsi'}}
bus = blockinfo.get_disk_bus_for_device_type('kvm', bus = blockinfo.get_disk_bus_for_device_type('kvm',
image_meta, image_meta,
device_type='cdrom') device_type='cdrom')
@@ -435,7 +435,7 @@ class LibvirtBlockInfoTest(test.TestCase):
image_meta) image_meta)
self.assertEqual(bus, 'usb') self.assertEqual(bus, 'usb')
image_meta = {'properties': {'disk_bus': 'xen'}} image_meta = {'properties': {'hw_disk_bus': 'xen'}}
self.assertRaises(exception.UnsupportedHardware, self.assertRaises(exception.UnsupportedHardware,
blockinfo.get_disk_bus_for_device_type, blockinfo.get_disk_bus_for_device_type,
'kvm', 'kvm',

4
nova/tests/test_libvirt_vif.py
View File

@@ -277,7 +277,7 @@ class LibvirtVifTestCase(test.TestCase):
return fakelibvirt.Connection("qemu:///session", return fakelibvirt.Connection("qemu:///session",
False) False)
d = vif.LibvirtGenericVIFDriver(get_connection) d = vif.LibvirtGenericVIFDriver(get_connection)
image_meta = {'properties': {'vif_model': 'e1000'}} image_meta = {'properties': {'hw_vif_model': 'e1000'}}
xml = self._get_instance_xml(d, xml = self._get_instance_xml(d,
self.net_bridge, self.net_bridge,
self.mapping_bridge, self.mapping_bridge,
@@ -301,7 +301,7 @@ class LibvirtVifTestCase(test.TestCase):
return fakelibvirt.Connection("qemu:///session", return fakelibvirt.Connection("qemu:///session",
False) False)
d = vif.LibvirtGenericVIFDriver(get_connection) d = vif.LibvirtGenericVIFDriver(get_connection)
image_meta = {'properties': {'vif_model': 'acme'}} image_meta = {'properties': {'hw_vif_model': 'acme'}}
self.assertRaises(exception.UnsupportedHardware, self.assertRaises(exception.UnsupportedHardware,
self._get_instance_xml, self._get_instance_xml,
d, d,