Merge "libvirt: Mark e1000e VIF as supported" into stable/train
This commit is contained in:
commit
13704fae83
|
@ -832,12 +832,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(
|
||||||
|
|
|
@ -67,6 +67,7 @@ def is_vif_model_valid_for_virt(virt_type, vif_model):
|
||||||
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': [network_model.VIF_MODEL_VIRTIO,
|
'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_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': [network_model.VIF_MODEL_NETFRONT,
|
'xen': [network_model.VIF_MODEL_NETFRONT,
|
||||||
network_model.VIF_MODEL_NE2K_PCI,
|
network_model.VIF_MODEL_NE2K_PCI,
|
||||||
|
|
|
@ -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…
Reference in New Issue