From 32ddb6e8bd82548f51130a88c06e27bcf80680be Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 23 Jan 2025 12:07:17 +0100 Subject: [PATCH 1/2] VPC: fix private mtu of vpc tier --- server/src/main/java/com/cloud/network/NetworkServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java index d0711a9fcf90..0726a409c9c8 100644 --- a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java @@ -1902,7 +1902,7 @@ protected void mtuCheckForVpcNetwork(Long vpcId, Pair interfac } 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()); } } From 74505a8907356cc4fe3548193636ed30da6e2c88 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 27 Feb 2025 13:18:08 +0100 Subject: [PATCH 2/2] PR10257: remove privateMtu form method mtuCheckForVpcNetwork --- .../src/main/java/com/cloud/network/NetworkServiceImpl.java | 4 ++-- .../test/java/com/cloud/network/NetworkServiceImplTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java index 0726a409c9c8..771dd7dd18f0 100644 --- a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java @@ -1635,7 +1635,7 @@ public Network createGuestNetwork(CreateNetworkCmd cmd) throws InsufficientCapac } Pair interfaceMTUs = validateMtuConfig(publicMtu, privateMtu, zone.getId()); - mtuCheckForVpcNetwork(vpcId, interfaceMTUs, publicMtu, privateMtu); + mtuCheckForVpcNetwork(vpcId, interfaceMTUs, publicMtu); Network associatedNetwork = null; if (associatedNetworkId != null) { @@ -1894,7 +1894,7 @@ private NetworkOffering getAndValidateNetworkOffering(Long networkOfferingId) { 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) { diff --git a/server/src/test/java/com/cloud/network/NetworkServiceImplTest.java b/server/src/test/java/com/cloud/network/NetworkServiceImplTest.java index c1e95874d73f..234b3b359e64 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 void testUpdatePublicInterfaceMtuViaNetworkTiersForVpcNetworks() { 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()); }