diff --git a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java index d0711a9fcf90..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) { @@ -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()); } } 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()); }