From 7388a9ed6ea3cdab2cd876f471c4108a48ed4514 Mon Sep 17 00:00:00 2001 From: Ishita Jaiswal Date: Sat, 7 Dec 2024 23:23:26 +0530 Subject: [PATCH 1/3] 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 d0cf2b0295dacd741414ea929cca42604f3849cf Mon Sep 17 00:00:00 2001 From: Ishita Jaiswal Date: Sun, 15 Dec 2024 02:16:55 +0530 Subject: [PATCH 2/3] 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; + } } From 94cff955062e04808718379e9d6b120da5a7cc56 Mon Sep 17 00:00:00 2001 From: Ishita Jaiswal Date: Sat, 21 Dec 2024 16:24:30 +0530 Subject: [PATCH 3/3] Update VMwareTrafficLabel for vSwitch type handling --- .../java/com/cloud/network/VmwareTrafficLabel.java | 14 ++------------ .../com/cloud/network/VmwareTrafficLabelTest.java | 0 2 files changed, 2 insertions(+), 12 deletions(-) create mode 100644 plugins/hypervisors/vmware/src/main/java/com/cloud/network/VmwareTrafficLabelTest.java 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 323cc500a1f0..e775ee11b1d9 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,31 +34,25 @@ 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 + _trafficType = trafficType; _parseLabel(null, defVswitchType); - isTrafficShapingConsistent = true; // Ensure consistency across NICs } public VmwareTrafficLabel(TrafficType trafficType) { - _trafficType = trafficType; // Define traffic label with specific traffic type + _trafficType = trafficType; _parseLabel(null, VirtualSwitchType.StandardVirtualSwitch); - isTrafficShapingConsistent = true; // Ensure consistency across NICs } public VmwareTrafficLabel() { @@ -126,8 +120,4 @@ public void setVirtualSwitchName(String vSwitchName) { public void setVirtualSwitchType(VirtualSwitchType vSwitchType) { _vSwitchType = vSwitchType; } - - // Getter to ensure traffic shaping consistency across all NICs - - } } diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/network/VmwareTrafficLabelTest.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/network/VmwareTrafficLabelTest.java new file mode 100644 index 000000000000..e69de29bb2d1