Skip to content

VPC restart cleanup for Public networks with multi-CIDR data #12622

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

Merged
sureshanaparti merged 7 commits into from
Apr 13, 2026
Merged

VPC restart cleanup for Public networks with multi-CIDR data #12622

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a68680a
Fix VPC restart with multi-CIDR networks: handle comma-separated CIDR…
Feb 9, 2026
af5341f
Update engine/schema/src/main/java/com/cloud/network/dao/NetworkVO.java
jeanvetorello Mar 10, 2026
c9e7a8b
Fix root cause: skip CIDR/gateway updates for Public traffic type net…
Mar 10, 2026
ab3f662
Revert "Update engine/schema/src/main/java/com/cloud/network/dao/Netw…
Mar 19, 2026
1a22d35
Revert "Fix VPC restart with multi-CIDR networks: handle comma-separa…
Mar 19, 2026
f6d618b
Sanitize legacy network-level addressing fields for Public networks
Mar 20, 2026
ca2c325
Merge branch '4.22' into fix/vpc-restart-cidr-minimal
DaanHoogland Apr 1, 2026
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
5 changes: 4 additions & 1 deletion engine/schema/src/main/java/com/cloud/network/dao/NetworkVO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,10 @@ public boolean equals(Object obj) {
return true;
}

return NetUtils.isNetworkAWithinNetworkB(cidr, that.cidr);
final String normalizedCidr = com.cloud.utils.StringUtils.getFirstValueFromCommaSeparatedString(cidr);
Comment thread
DaanHoogland marked this conversation as resolved.
Outdated
final String normalizedThatCidr = com.cloud.utils.StringUtils.getFirstValueFromCommaSeparatedString(that.cidr);

return NetUtils.isNetworkAWithinNetworkB(normalizedCidr, normalizedThatCidr);
}

@Override
Expand Down
13 changes: 8 additions & 5 deletions server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5425,7 +5425,7 @@ public Vlan createVlanAndPublicIpRange(final long zoneId, final long networkId,
final VlanVO vlan = commitVlanAndIpRange(zoneId, networkId, physicalNetworkId, podId, startIP, endIP, vlanGateway, vlanNetmask, vlanId, domain, vlanOwner, vlanIp6Gateway, vlanIp6Cidr,
ipv4, zone, vlanType, ipv6Range, ipRange, forSystemVms, provider);

if (vlan != null) {
if (vlan != null && network.getTrafficType() != TrafficType.Public) {
if (ipv4) {
addCidrAndGatewayForIpv4(networkId, vlanGateway, vlanNetmask);
} else if (ipv6) {
Expand Down Expand Up @@ -6504,11 +6504,14 @@ private boolean deleteAndPublishVlanAndPublicIpRange(final long userId, final lo
final boolean ipv4 = deletedVlan.getVlanGateway() != null;
final boolean ipv6 = deletedVlan.getIp6Gateway() != null;
final long networkId = deletedVlan.getNetworkId();
final NetworkVO networkVO = _networkDao.findById(networkId);

if (ipv4) {
removeCidrAndGatewayForIpv4(networkId, deletedVlan);
} else if (ipv6) {
removeCidrAndGatewayForIpv6(networkId, deletedVlan);
if (networkVO != null && networkVO.getTrafficType() != TrafficType.Public) {
if (ipv4) {
removeCidrAndGatewayForIpv4(networkId, deletedVlan);
Comment on lines +6510 to +6514
Copy link

Copilot AI Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

networkVO is fetched here to check traffic type, but removeCidrAndGatewayForIpv4/Ipv6 immediately re-fetch the same NetworkVO again. To avoid the extra DB hit (and keep the code easier to follow), consider passing the already-fetched NetworkVO into the remove* helpers or moving the traffic-type guard into those helpers.

Copilot uses AI. Check for mistakes.
} else if (ipv6) {
removeCidrAndGatewayForIpv6(networkId, deletedVlan);
}
}

messageBus.publish(_name, MESSAGE_DELETE_VLAN_IP_RANGE_EVENT, PublishScope.LOCAL, deletedVlan);
Expand Down
Loading