CLOUDSTACK-3124: Deletion of ACL associated with a tier/ pvt gateway should not be allowed. Check for associated tiers/gateways before deletion

Kishan Kavala · Kishan Kavala · commit da0006618f5b · 2013-06-24T17:58:29.000+05:30
diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDao.java b/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDao.java
@@ -30,4 +30,6 @@ public interface VpcGatewayDao extends GenericDao<VpcGatewayVO, Long>{
     Long getNetworkAclIdForPrivateIp(long vpcId, long networkId, String ipaddr);
 
     List<VpcGatewayVO> listByVpcIdAndType(long vpcId, VpcGateway.Type type);
+
+    List<VpcGatewayVO> listByAclIdAndType(long aclId, VpcGateway.Type type);
 }
diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java
@@ -41,6 +41,7 @@ protected VpcGatewayDaoImpl() {
         AllFieldsSearch.and("type", AllFieldsSearch.entity().getType(), SearchCriteria.Op.EQ);
         AllFieldsSearch.and("networkid", AllFieldsSearch.entity().getNetworkId(), SearchCriteria.Op.EQ);
         AllFieldsSearch.and("ipaddress", AllFieldsSearch.entity().getIp4Address(), SearchCriteria.Op.EQ);
+        AllFieldsSearch.and("aclId", AllFieldsSearch.entity().getNetworkACLId(), SearchCriteria.Op.EQ);
         AllFieldsSearch.done();
     }
 
@@ -86,4 +87,11 @@ public List<VpcGatewayVO> listByVpcIdAndType(long vpcId, VpcGateway.Type type) {
         return listBy(sc);
     }
 
+    @Override
+    public List<VpcGatewayVO> listByAclIdAndType(long aclId, VpcGateway.Type type) {
+        SearchCriteria<VpcGatewayVO> sc = AllFieldsSearch.create();
+        sc.setParameters("aclId", aclId);
+        sc.setParameters("type", type);
+        return listBy(sc);
+    }
 }
diff --git a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
@@ -122,6 +122,18 @@ public boolean deleteNetworkACL(NetworkACL acl) {
         if(aclItems.size() > 0){
             throw new CloudRuntimeException("ACL is not empty. Cannot delete network ACL: "+acl.getUuid());
         }
+
+        List<NetworkVO> networks = _networkDao.listByAclId(acl.getId());
+        if(networks != null && networks.size() > 0){
+            throw new CloudRuntimeException("ACL is still associated with "+networks.size()+" tier(s). Cannot delete network ACL: "+acl.getUuid());
+        }
+
+        List<VpcGatewayVO> pvtGateways = _vpcGatewayDao.listByAclIdAndType(acl.getId(), VpcGateway.Type.Private);
+
+        if(pvtGateways != null && pvtGateways.size() > 0){
+            throw new CloudRuntimeException("ACL is still associated with "+pvtGateways.size()+" private gateway(s). Cannot delete network ACL: "+acl.getUuid());
+        }
+
         return _networkACLDao.remove(acl.getId());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,6 @@ public interface VpcGatewayDao extends GenericDao<VpcGatewayVO, Long>{`
`30`	`30`	`Long getNetworkAclIdForPrivateIp(long vpcId, long networkId, String ipaddr);`
`31`	`31`
`32`	`32`	`List<VpcGatewayVO> listByVpcIdAndType(long vpcId, VpcGateway.Type type);`
	`33`	`+`
	`34`	`+ List<VpcGatewayVO> listByAclIdAndType(long aclId, VpcGateway.Type type);`
`33`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ protected VpcGatewayDaoImpl() {`
`41`	`41`	`AllFieldsSearch.and("type", AllFieldsSearch.entity().getType(), SearchCriteria.Op.EQ);`
`42`	`42`	`AllFieldsSearch.and("networkid", AllFieldsSearch.entity().getNetworkId(), SearchCriteria.Op.EQ);`
`43`	`43`	`AllFieldsSearch.and("ipaddress", AllFieldsSearch.entity().getIp4Address(), SearchCriteria.Op.EQ);`
	`44`	`+ AllFieldsSearch.and("aclId", AllFieldsSearch.entity().getNetworkACLId(), SearchCriteria.Op.EQ);`
`44`	`45`	`AllFieldsSearch.done();`
`45`	`46`	`}`
`46`	`47`
`@@ -86,4 +87,11 @@ public List<VpcGatewayVO> listByVpcIdAndType(long vpcId, VpcGateway.Type type) {`
`86`	`87`	`return listBy(sc);`
`87`	`88`	`}`
`88`	`89`
	`90`	`+ @Override`
	`91`	`+ public List<VpcGatewayVO> listByAclIdAndType(long aclId, VpcGateway.Type type) {`
	`92`	`+ SearchCriteria<VpcGatewayVO> sc = AllFieldsSearch.create();`
	`93`	`+ sc.setParameters("aclId", aclId);`
	`94`	`+ sc.setParameters("type", type);`
	`95`	`+ return listBy(sc);`
	`96`	`+ }`
`89`	`97`	`}`