Browse Source

Merge "libvirt: Mark e1000e VIF as supported" into stable/train

changes/15/742415/1
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
13704fae83
3 changed files with 11 additions and 0 deletions
  1. +2
    -0
      nova/tests/unit/virt/libvirt/test_vif.py
  2. +2
    -0
      nova/virt/libvirt/vif.py
  3. +7
    -0
      releasenotes/notes/bug-1882919-support-e1000e-vif-5437a45c13dff978.yaml

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

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


+ 2
- 0
nova/virt/libvirt/vif.py View File

@@ -67,6 +67,7 @@ def is_vif_model_valid_for_virt(virt_type, vif_model):
network_model.VIF_MODEL_PCNET,
network_model.VIF_MODEL_RTL8139,
network_model.VIF_MODEL_E1000,
network_model.VIF_MODEL_E1000E,
network_model.VIF_MODEL_LAN9118,
network_model.VIF_MODEL_SPAPR_VLAN],
'kvm': [network_model.VIF_MODEL_VIRTIO,
@@ -74,6 +75,7 @@ def is_vif_model_valid_for_virt(virt_type, vif_model):
network_model.VIF_MODEL_PCNET,
network_model.VIF_MODEL_RTL8139,
network_model.VIF_MODEL_E1000,
network_model.VIF_MODEL_E1000E,
network_model.VIF_MODEL_SPAPR_VLAN],
'xen': [network_model.VIF_MODEL_NETFRONT,
network_model.VIF_MODEL_NE2K_PCI,


+ 7
- 0
releasenotes/notes/bug-1882919-support-e1000e-vif-5437a45c13dff978.yaml 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.

Loading…
Cancel
Save