diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-01 11:35:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-01 11:35:00 +0000 |
| commit | 11764e5250dc2ea4a92cf7402271e7d4e407113f (patch) | |
| tree | a77a97e9e85df72629685920aa909b439e382a62 | |
| parent | 957a2a6909fb6b5d9773ef74160543f4d984cc96 (diff) | |
| parent | 2c9eba280a78e4159267d4a56a09df9076c844d3 (diff) | |
| download | nova-11764e5250dc2ea4a92cf7402271e7d4e407113f.tar.gz nova-11764e5250dc2ea4a92cf7402271e7d4e407113f.tar.xz nova-11764e5250dc2ea4a92cf7402271e7d4e407113f.zip | |
Merge "Add a 'hw_' namespace to glance hardware config properties"
| -rw-r--r-- | nova/tests/test_libvirt_blockinfo.py | 8 | ||||
| -rw-r--r-- | nova/tests/test_libvirt_vif.py | 4 | ||||
| -rw-r--r-- | nova/virt/libvirt/blockinfo.py | 2 | ||||
| -rw-r--r-- | nova/virt/libvirt/vif.py | 3 |
4 files changed, 9 insertions, 8 deletions
diff --git a/nova/tests/test_libvirt_blockinfo.py b/nova/tests/test_libvirt_blockinfo.py index 62db1fbf0..0165d77b6 100644 --- a/nova/tests/test_libvirt_blockinfo.py +++ b/nova/tests/test_libvirt_blockinfo.py @@ -419,13 +419,13 @@ class LibvirtBlockInfoTest(test.TestCase): device_type='cdrom') 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', image_meta) self.assertEqual(bus, 'scsi') - image_meta = {'properties': {'disk_bus': 'usb', - 'cdrom_bus': 'scsi'}} + image_meta = {'properties': {'hw_disk_bus': 'usb', + 'hw_cdrom_bus': 'scsi'}} bus = blockinfo.get_disk_bus_for_device_type('kvm', image_meta, device_type='cdrom') @@ -435,7 +435,7 @@ class LibvirtBlockInfoTest(test.TestCase): image_meta) self.assertEqual(bus, 'usb') - image_meta = {'properties': {'disk_bus': 'xen'}} + image_meta = {'properties': {'hw_disk_bus': 'xen'}} self.assertRaises(exception.UnsupportedHardware, blockinfo.get_disk_bus_for_device_type, 'kvm', diff --git a/nova/tests/test_libvirt_vif.py b/nova/tests/test_libvirt_vif.py index 026e55e9c..6160105ce 100644 --- a/nova/tests/test_libvirt_vif.py +++ b/nova/tests/test_libvirt_vif.py @@ -277,7 +277,7 @@ class LibvirtVifTestCase(test.TestCase): return fakelibvirt.Connection("qemu:///session", False) d = vif.LibvirtGenericVIFDriver(get_connection) - image_meta = {'properties': {'vif_model': 'e1000'}} + image_meta = {'properties': {'hw_vif_model': 'e1000'}} xml = self._get_instance_xml(d, self.net_bridge, self.mapping_bridge, @@ -301,7 +301,7 @@ class LibvirtVifTestCase(test.TestCase): return fakelibvirt.Connection("qemu:///session", False) d = vif.LibvirtGenericVIFDriver(get_connection) - image_meta = {'properties': {'vif_model': 'acme'}} + image_meta = {'properties': {'hw_vif_model': 'acme'}} self.assertRaises(exception.UnsupportedHardware, self._get_instance_xml, d, diff --git a/nova/virt/libvirt/blockinfo.py b/nova/virt/libvirt/blockinfo.py index 09e3809d9..3e4b3995c 100644 --- a/nova/virt/libvirt/blockinfo.py +++ b/nova/virt/libvirt/blockinfo.py @@ -201,7 +201,7 @@ def get_disk_bus_for_device_type(virt_type, # Prefer a disk bus set against the image first of all if image_meta: - key = device_type + "_bus" + key = "hw_" + device_type + "_bus" disk_bus = image_meta.get('properties', {}).get(key) if disk_bus is not None: if not is_disk_bus_valid_for_virt(virt_type, disk_bus): diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py index e13af6cce..68b0505aa 100644 --- a/nova/virt/libvirt/vif.py +++ b/nova/virt/libvirt/vif.py @@ -101,7 +101,8 @@ class LibvirtBaseVIFDriver(object): # If the user has specified a 'vif_model' against the # image then honour that model if image_meta: - vif_model = image_meta.get('properties', {}).get('vif_model') + vif_model = image_meta.get('properties', + {}).get('hw_vif_model') if vif_model is not None: model = vif_model |