apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix inactive VPCs deletion (#11618)

Browse Source 
Co-authored-by: Nicolas Vazquez <nicovazquez90@gmail.com>
This commit is contained in:
Pearl Dsilva 2025-09-18 07:25:48 -04:00 committed by GitHub
parent 0526ec0d82
commit 8eb6ddd920
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisApiClientImpl.java
View File

@ -1131,16 +1131,17 @@ public class NetrisApiClientImpl implements NetrisApiClient {
public boolean deleteVpc(DeleteNetrisVpcCommand cmd) { public boolean deleteVpc(DeleteNetrisVpcCommand cmd) {
String suffix = String.valueOf(cmd.getId()); String suffix = String.valueOf(cmd.getId());
String vpcName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.VPC); 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); String snatRuleName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.SNAT, suffix);
NatGetBody existingNatRule = netrisNatRuleExists(snatRuleName); NatGetBody existingNatRule = netrisNatRuleExists(snatRuleName);
boolean ruleExists = Objects.nonNull(existingNatRule); boolean ruleExists = Objects.nonNull(existingNatRule);
if (ruleExists) { 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()); String vpcAllocationName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.IPAM_ALLOCATION, cmd.getCidr());