From 058b083390870b75a49c4a764f124cad8d68cc2c Mon Sep 17 00:00:00 2001 From: Ishita Jaiswal Date: Sat, 7 Dec 2024 23:23:26 +0530 Subject: [PATCH 1/2] Fix VMware Traffic Shaping for Secondary NICs in VmwareTrafficLabel --- .../java/com/cloud/network/VmwareTrafficLabel.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/network/VmwareTrafficLabel.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/network/VmwareTrafficLabel.java index 1cfc1541e82c..244533fbf8c3 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/network/VmwareTrafficLabel.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/network/VmwareTrafficLabel.java @@ -34,25 +34,31 @@ public class VmwareTrafficLabel implements TrafficLabel { VirtualSwitchType _vSwitchType = VirtualSwitchType.StandardVirtualSwitch; String _vSwitchName = DEFAULT_VSWITCH_NAME; String _vlanId = Vlan.UNTAGGED; + // Flag to ensure traffic shaping consistency across NICs + boolean isTrafficShapingConsistent = false; public VmwareTrafficLabel(String networkLabel, TrafficType trafficType, VirtualSwitchType defVswitchType) { _trafficType = trafficType; _parseLabel(networkLabel, defVswitchType); + isTrafficShapingConsistent = true; // Ensure consistency across NICs } public VmwareTrafficLabel(String networkLabel, TrafficType trafficType) { _trafficType = trafficType; _parseLabel(networkLabel, VirtualSwitchType.StandardVirtualSwitch); + isTrafficShapingConsistent = true; // Ensure consistency across NICs } public VmwareTrafficLabel(TrafficType trafficType, VirtualSwitchType defVswitchType) { _trafficType = trafficType; // Define traffic label with specific traffic type _parseLabel(null, defVswitchType); + isTrafficShapingConsistent = true; // Ensure consistency across NICs } public VmwareTrafficLabel(TrafficType trafficType) { _trafficType = trafficType; // Define traffic label with specific traffic type _parseLabel(null, VirtualSwitchType.StandardVirtualSwitch); + isTrafficShapingConsistent = true; // Ensure consistency across NICs } public VmwareTrafficLabel() { @@ -120,4 +126,9 @@ public void setVirtualSwitchName(String vSwitchName) { public void setVirtualSwitchType(VirtualSwitchType vSwitchType) { _vSwitchType = vSwitchType; } + + // Getter to ensure traffic shaping consistency across all NICs + public boolean isTrafficShapingConsistent() { + return isTrafficShapingConsistent; + } } From cec146423856d72b98102cd344b340df144b8865 Mon Sep 17 00:00:00 2001 From: Ishita Jaiswal Date: Sun, 15 Dec 2024 02:16:55 +0530 Subject: [PATCH 2/2] Fix: Update vm.network.throttling.rate configuration --- .../src/main/java/com/cloud/network/VmwareTrafficLabel.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/network/VmwareTrafficLabel.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/network/VmwareTrafficLabel.java index 244533fbf8c3..323cc500a1f0 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/network/VmwareTrafficLabel.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/network/VmwareTrafficLabel.java @@ -128,7 +128,6 @@ public void setVirtualSwitchType(VirtualSwitchType vSwitchType) { } // Getter to ensure traffic shaping consistency across all NICs - public boolean isTrafficShapingConsistent() { - return isTrafficShapingConsistent; + } }