Skip to content

Netris: Fix inactive VPCs deletion #11618

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
nvazquez merged 1 commit into from
Sep 18, 2025
Merged

Netris: Fix inactive VPCs deletion #11618

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions ...work-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisApiClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,16 +1131,17 @@ private VPCResponseObjectOK deleteVpcInternal(VPCListing vpcResource) {
public boolean deleteVpc(DeleteNetrisVpcCommand cmd) {
String suffix = String.valueOf(cmd.getId());
String vpcName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.VPC);
VPCListing vpcResource = getVpcByNameAndTenant(vpcName);
if (vpcResource == null) {
logger.error("Could not find the Netris VPC resource with name {} and tenant ID {}", vpcName, tenantId);
return false;
}
String snatRuleName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.SNAT, suffix);
NatGetBody existingNatRule = netrisNatRuleExists(snatRuleName);
boolean ruleExists = Objects.nonNull(existingNatRule);
if (ruleExists) {
deleteNatRule(snatRuleName, existingNatRule.getId(), vpcResource.getName());
deleteNatRule(snatRuleName, existingNatRule.getId(), vpcName);
}

VPCListing vpcResource = getVpcByNameAndTenant(vpcName);
if (vpcResource == null) {
logger.warn("The Netris VPC resource with name {} and tenant ID {} does not exist, cannot be removed", vpcName, tenantId);
return true;
}

String vpcAllocationName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.IPAM_ALLOCATION, cmd.getCidr());
Expand Down
Loading