openstack/nova
Code Issues Proposed changes

Merge "libvirt: Mark e1000e VIF as supported"

Browse Source
This commit is contained in:
Zuul 2020-06-18 13:20:17 +00:00 committed by Gerrit Code Review
commit 63a03d8481
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/tests/unit/virt/libvirt/test_vif.py
View File

@ -839,12 +839,14 @@ class LibvirtVifTestCase(test.NoDBTestCase):
network_model.VIF_MODEL_PCNET, network_model.VIF_MODEL_PCNET,
network_model.VIF_MODEL_RTL8139, network_model.VIF_MODEL_RTL8139,
network_model.VIF_MODEL_E1000, network_model.VIF_MODEL_E1000,
network_model.VIF_MODEL_E1000E,
network_model.VIF_MODEL_SPAPR_VLAN) network_model.VIF_MODEL_SPAPR_VLAN)
else: else:
supported = (network_model.VIF_MODEL_NE2K_PCI, supported = (network_model.VIF_MODEL_NE2K_PCI,
network_model.VIF_MODEL_PCNET, network_model.VIF_MODEL_PCNET,
network_model.VIF_MODEL_RTL8139, network_model.VIF_MODEL_RTL8139,
network_model.VIF_MODEL_E1000, network_model.VIF_MODEL_E1000,
network_model.VIF_MODEL_E1000E,
network_model.VIF_MODEL_SPAPR_VLAN) network_model.VIF_MODEL_SPAPR_VLAN)
for model in supported: for model in supported:
image_meta = objects.ImageMeta.from_dict( image_meta = objects.ImageMeta.from_dict(

2
nova/virt/libvirt/vif.py
View File

@ -65,6 +65,7 @@ SUPPORTED_VIF_MODELS = {
network_model.VIF_MODEL_PCNET, network_model.VIF_MODEL_PCNET,
network_model.VIF_MODEL_RTL8139, network_model.VIF_MODEL_RTL8139,
network_model.VIF_MODEL_E1000, network_model.VIF_MODEL_E1000,
network_model.VIF_MODEL_E1000E,
network_model.VIF_MODEL_LAN9118, network_model.VIF_MODEL_LAN9118,
network_model.VIF_MODEL_SPAPR_VLAN], network_model.VIF_MODEL_SPAPR_VLAN],
'kvm': [ 'kvm': [
@ -73,6 +74,7 @@ SUPPORTED_VIF_MODELS = {
network_model.VIF_MODEL_PCNET, network_model.VIF_MODEL_PCNET,
network_model.VIF_MODEL_RTL8139, network_model.VIF_MODEL_RTL8139,
network_model.VIF_MODEL_E1000, network_model.VIF_MODEL_E1000,
network_model.VIF_MODEL_E1000E,
network_model.VIF_MODEL_SPAPR_VLAN], network_model.VIF_MODEL_SPAPR_VLAN],
'xen': [ 'xen': [
network_model.VIF_MODEL_NETFRONT, network_model.VIF_MODEL_NETFRONT,

7
releasenotes/notes/bug-1882919-support-e1000e-vif-5437a45c13dff978.yaml Normal file
View File

@ -0,0 +1,7 @@
---
fixes:
- |
Previously, attempting to configure an instance with the ``e1000e`` or
legacy ``VirtualE1000e`` VIF types on a host using the QEMU/KVM driver
would result in an incorrect ``UnsupportedHardware`` exception. These
interfaces are now correctly marked as supported.