(cloudstack) branch main updated: Fix inactive VPCs deletion (#11618)

[nvazquez]

This is an automated email from the ASF dual-hosted git repository.

nvazquez pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/main by this push:
     new 8eb6ddd9203 Fix inactive VPCs deletion (#11618)
8eb6ddd9203 is described below

commit 8eb6ddd920311cc152b591a2e1e16a7598656195
Author: Pearl Dsilva <pearl1...@gmail.com>
AuthorDate: Thu Sep 18 07:25:48 2025 -0400

    Fix inactive VPCs deletion (#11618)
    
    Co-authored-by: Nicolas Vazquez <nicovazque...@gmail.com>
---
 .../org/apache/cloudstack/service/NetrisApiClientImpl.java  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git 
a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisApiClientImpl.java
 
b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisApiClientImpl.java
index 6b047f8df4b..9d3ff953ee1 100644
--- 
a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisApiClientImpl.java
+++ 
b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisApiClientImpl.java
@@ -1131,16 +1131,17 @@ public class NetrisApiClientImpl implements 
NetrisApiClient {
     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());