Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VPC: fix private mtu of vpc tier #10257

Merged
merged 2 commits into from
Mar 7, 2025
Merged

VPC: fix private mtu of vpc tier #10257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32ddb6e
VPC: fix private mtu of vpc tier
weizhouapache Jan 23, 2025
74505a8
PR10257: remove privateMtu form method mtuCheckForVpcNetwork
weizhouapache Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions server/src/main/java/com/cloud/network/NetworkServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1635,7 +1635,7 @@ public Network createGuestNetwork(CreateNetworkCmd cmd) throws InsufficientCapac
}

Pair<Integer, Integer> interfaceMTUs = validateMtuConfig(publicMtu, privateMtu, zone.getId());
mtuCheckForVpcNetwork(vpcId, interfaceMTUs, publicMtu, privateMtu);
mtuCheckForVpcNetwork(vpcId, interfaceMTUs, publicMtu);

Network associatedNetwork = null;
if (associatedNetworkId != null) {
Expand Down Expand Up @@ -1894,15 +1894,15 @@ private NetworkOffering getAndValidateNetworkOffering(Long networkOfferingId) {
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) {
throw new CloudRuntimeException(String.format("VPC with id %s not found", vpcId));
}
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());
}
}

Expand Down
2 changes: 1 addition & 1 deletion server/src/test/java/com/cloud/network/NetworkServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ public void testUpdatePublicInterfaceMtuViaNetworkTiersForVpcNetworks() {
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());
}
Expand Down
Loading