(cloudstack) branch 4.19 updated: VPC: fix private mtu of vpc tier (#10257)

[dahn]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.19 by this push:
     new 1f0ffee8583 VPC: fix private mtu of vpc tier (#10257)
1f0ffee8583 is described below

commit 1f0ffee8583e1476ef9799a726e17a8aab686860
Author: Wei Zhou <weiz...@apache.org>
AuthorDate: Fri Mar 7 15:04:14 2025 +0100

    VPC: fix private mtu of vpc tier (#10257)
---
 server/src/main/java/com/cloud/network/NetworkServiceImpl.java     | 6 +++---
 server/src/test/java/com/cloud/network/NetworkServiceImplTest.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java 
b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
index d4279c29112..bdb928ae919 100644
--- a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
@@ -1640,7 +1640,7 @@ public class NetworkServiceImpl extends ManagerBase 
implements NetworkService, C
         }
 
         Pair<Integer, Integer> interfaceMTUs = validateMtuConfig(publicMtu, 
privateMtu, zone.getId());
-        mtuCheckForVpcNetwork(vpcId, interfaceMTUs, publicMtu, privateMtu);
+        mtuCheckForVpcNetwork(vpcId, interfaceMTUs, publicMtu);
 
         Network associatedNetwork = null;
         if (associatedNetworkId != null) {
@@ -1899,7 +1899,7 @@ public class NetworkServiceImpl extends ManagerBase 
implements NetworkService, C
         return ntwkOff;
     }
 
-    protected void mtuCheckForVpcNetwork(Long vpcId, Pair<Integer, Integer> 
interfaceMTUs, Integer publicMtu, Integer privateMtu) {
+    protected void mtuCheckForVpcNetwork(Long vpcId, Pair<Integer, Integer> 
interfaceMTUs, Integer publicMtu) {
         if (vpcId != null && publicMtu != null) {
             VpcVO vpc = _vpcDao.findById(vpcId);
             if (vpc == null) {
@@ -1907,7 +1907,7 @@ public class NetworkServiceImpl extends ManagerBase 
implements NetworkService, C
             }
             s_logger.warn(String.format("VPC public MTU already set at VPC 
creation phase to: %s. Ignoring public MTU " +
                     "passed during VPC network tier creation ", 
vpc.getPublicMtu()));
-            interfaceMTUs.set(vpc.getPublicMtu(), privateMtu);
+            interfaceMTUs.set(vpc.getPublicMtu(), interfaceMTUs.second());
         }
     }
 
diff --git a/server/src/test/java/com/cloud/network/NetworkServiceImplTest.java 
b/server/src/test/java/com/cloud/network/NetworkServiceImplTest.java
index c1e95874d73..234b3b359e6 100644
--- a/server/src/test/java/com/cloud/network/NetworkServiceImplTest.java
+++ b/server/src/test/java/com/cloud/network/NetworkServiceImplTest.java
@@ -539,7 +539,7 @@ public class NetworkServiceImplTest {
         Mockito.when(vpcVO.getPublicMtu()).thenReturn(vpcMtu);
 
         Pair<Integer, Integer> updatedMtus = 
service.validateMtuConfig(publicMtu, privateMtu, zoneId);
-        service.mtuCheckForVpcNetwork(vpcId, updatedMtus, publicMtu, 
privateMtu);
+        service.mtuCheckForVpcNetwork(vpcId, updatedMtus, publicMtu);
         Assert.assertEquals(vpcMtu, updatedMtus.first());
         Assert.assertEquals(privateMtu, updatedMtus.second());
     }