From 143b72d67ecf25f9ee3d5f3785a9e17d234236b6 Mon Sep 17 00:00:00 2001 From: dahn Date: Wed, 9 Feb 2022 10:19:47 +0100 Subject: [PATCH] cleanup: Network Throttling for Additional Networks code in DirectVifDriver.java (#5875) --- .../cloud/hypervisor/kvm/resource/DirectVifDriver.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/DirectVifDriver.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/DirectVifDriver.java index 86a45ecc8aa..5037ad1aec7 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/DirectVifDriver.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/DirectVifDriver.java @@ -19,6 +19,7 @@ package com.cloud.hypervisor.kvm.resource; +import org.apache.commons.compress.utils.Sets; import org.apache.log4j.Logger; import org.libvirt.LibvirtException; @@ -47,12 +48,8 @@ public class DirectVifDriver extends VifDriverBase { public LibvirtVMDef.InterfaceDef plug(NicTO nic, String guestOsType, String nicAdapter, Map extraConfig) throws InternalErrorException, LibvirtException { LibvirtVMDef.InterfaceDef intf = new LibvirtVMDef.InterfaceDef(); - if (nic.getType() == Networks.TrafficType.Guest) { - Integer networkRateKBps = (nic.getNetworkRateMbps() != null && nic.getNetworkRateMbps().intValue() != -1) ? nic.getNetworkRateMbps().intValue() * 128 : 0; - intf.defDirectNet(_libvirtComputingResource.getNetworkDirectDevice(), null, nic.getMac(), getGuestNicModel(guestOsType, nicAdapter), - _libvirtComputingResource.getNetworkDirectSourceMode(), networkRateKBps); - - } else if (nic.getType() == Networks.TrafficType.Public) { + if (Sets.newHashSet(Networks.TrafficType.Guest, + Networks.TrafficType.Public).contains(nic.getType())) { Integer networkRateKBps = (nic.getNetworkRateMbps() != null && nic.getNetworkRateMbps().intValue() != -1) ? nic.getNetworkRateMbps().intValue() * 128 : 0; intf.defDirectNet(_libvirtComputingResource.getNetworkDirectDevice(), null, nic.getMac(), getGuestNicModel(guestOsType, nicAdapter), _libvirtComputingResource.getNetworkDirectSourceMode(), networkRateKBps);