openstack/nova
Code Issues Proposed changes

Merge "libvirt: vif: Remove MIN_LIBVIRT_MACVTAP_PASSTHROUGH_VLAN"

Browse Source
This commit is contained in:
Zuul 2019-07-05 23:00:13 +00:00 committed by Gerrit Code Review
commit ed49947d5a
2 changed files with 0 additions and 9 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

@ -1203,8 +1203,6 @@ class LibvirtVifTestCase(test.NoDBTestCase):
self._assertTypeEquals(node, "direct", "source", self._assertTypeEquals(node, "direct", "source",
"mode", "passthrough") "mode", "passthrough")
self._assertMacEquals(node, self.vif_hw_veb_macvtap) self._assertMacEquals(node, self.vif_hw_veb_macvtap)
vlan = node.find("vlan")
self.assertIsNone(vlan)
def test_driver_macvtap_vlan(self): def test_driver_macvtap_vlan(self):
d = vif.LibvirtGenericVIFDriver() d = vif.LibvirtGenericVIFDriver()

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

@ -48,8 +48,6 @@ LOG = logging.getLogger(__name__)
CONF = nova.conf.CONF CONF = nova.conf.CONF
# vlan tag for macvtap passthrough mode on SRIOV VFs
MIN_LIBVIRT_MACVTAP_PASSTHROUGH_VLAN = (1, 3, 5)
# setting interface mtu was intoduced in libvirt 3.3, We also need to # setting interface mtu was intoduced in libvirt 3.3, We also need to
# check for QEMU that because libvirt is configuring in same time # check for QEMU that because libvirt is configuring in same time
# host_mtu for virtio-net, fails if not supported. # host_mtu for virtio-net, fails if not supported.
@ -357,11 +355,6 @@ class LibvirtGenericVIFDriver(object):
conf, net_type, profile['pci_slot'], conf, net_type, profile['pci_slot'],
vif_details[network_model.VIF_DETAILS_VLAN]) vif_details[network_model.VIF_DETAILS_VLAN])
# NOTE(vladikr): Not setting vlan tags for macvtap on SR-IOV VFs
# as vlan tag is not supported in Libvirt until version 1.3.5
if (vif['vnic_type'] == network_model.VNIC_TYPE_MACVTAP and not
host.has_min_version(MIN_LIBVIRT_MACVTAP_PASSTHROUGH_VLAN)):
conf.vlan = None
designer.set_vif_bandwidth_config(conf, inst_type) designer.set_vif_bandwidth_config(conf, inst_type)
return conf return conf