From 9727548dbc2103f7728ec601bfe0fa3d17ef136c Mon Sep 17 00:00:00 2001 From: mbrashearnttglobalnet <64442865+mbrashearnttglobalnet@users.noreply.github.com> Date: Thu, 11 Jun 2020 21:47:36 -0700 Subject: [PATCH] kvm: Add support for DPDK trunk interfaces (#4048) Update to support trunk interfaces for DPDK enabled hosts --- .../com/cloud/hypervisor/kvm/dpdk/DpdkDriverImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/dpdk/DpdkDriverImpl.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/dpdk/DpdkDriverImpl.java index cd962b620a7..b5886a1ceda 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/dpdk/DpdkDriverImpl.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/dpdk/DpdkDriverImpl.java @@ -70,9 +70,11 @@ public class DpdkDriverImpl extends AdapterBase implements DpdkDriver { dpdkPortVhostUserClientType; StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append(String.format("ovs-vsctl add-port %s %s " + - "vlan_mode=access tag=%s " + - "-- set Interface %s type=%s", bridgeName, port, vlan, port, type)); + stringBuilder.append(String.format("ovs-vsctl add-port %s %s ", bridgeName, port)); + if (Integer.parseInt(vlan) > 0 && Integer.parseInt(vlan) < 4095) { + stringBuilder.append(String.format("vlan_mode=access tag=%s ", vlan)); + } + stringBuilder.append(String.format("-- set Interface %s type=%s", port, type)); if (vHostUserMode == DpdkHelper.VHostUserMode.CLIENT) { stringBuilder.append(String.format(" options:vhost-server-path=%s/%s",