From 1f0ffee8583e1476ef9799a726e17a8aab686860 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 7 Mar 2025 15:04:14 +0100 Subject: [PATCH] VPC: fix private mtu of vpc tier (#10257) --- .../src/main/java/com/cloud/network/NetworkServiceImpl.java | 6 +++--- .../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 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 interfaceMTUs, Integer publicMtu, Integer privateMtu) { + protected void mtuCheckForVpcNetwork(Long vpcId, Pair 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 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()); }