diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-14 04:14:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-14 04:14:48 +0000 |
| commit | f69489b9937cfb8c2cddab6325dc9b04f79766f4 (patch) | |
| tree | 5442e39722a3fa302cd8dda2bca68c0222580392 | |
| parent | 2d22fa1c67b30f30ebb847eb07c96458650d6a73 (diff) | |
| parent | e354bc81e06c08d43e6635d98a3e8c60558a2867 (diff) | |
Merge "Use a more specific error reporting invalid disk hardware"
| -rw-r--r-- | nova/tests/test_libvirt_blockinfo.py | 2 | ||||
| -rw-r--r-- | nova/virt/libvirt/blockinfo.py | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/nova/tests/test_libvirt_blockinfo.py b/nova/tests/test_libvirt_blockinfo.py index e8d548399..68f1fa394 100644 --- a/nova/tests/test_libvirt_blockinfo.py +++ b/nova/tests/test_libvirt_blockinfo.py @@ -421,7 +421,7 @@ class LibvirtBlockInfoTest(test.TestCase): self.assertEqual(bus, 'usb') image_meta = {'properties': {'disk_bus': 'xen'}} - self.assertRaises(exception.NovaException, + self.assertRaises(exception.UnsupportedHardware, blockinfo.get_disk_bus_for_device_type, 'kvm', image_meta) diff --git a/nova/virt/libvirt/blockinfo.py b/nova/virt/libvirt/blockinfo.py index fc4a7dbfb..0098410cd 100644 --- a/nova/virt/libvirt/blockinfo.py +++ b/nova/virt/libvirt/blockinfo.py @@ -175,8 +175,7 @@ def is_disk_bus_valid_for_virt(virt_type, disk_bus): } if virt_type not in valid_bus: - raise exception.NovaException( - _("Unsupported virt type %s") % virt_type) + raise exception.UnsupportedVirtType(virt=virt_type) return disk_bus in valid_bus[virt_type] @@ -200,9 +199,8 @@ def get_disk_bus_for_device_type(virt_type, 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): - raise exception.NovaException( - _("Disk bus %(disk_bus)s is not valid for %(virt)s") % - {'disk_bus': disk_bus, 'virt': virt_type}) + raise exception.UnsupportedHardware(model=disk_bus, + virt=virt_type) return disk_bus # Otherwise pick a hypervisor default disk bus |