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

CLOUDSTACK-7398 SecurityGroup Rule related tags cleanup on rule deletion

Browse Source 
Signed-off-by: Ilia Shakitko <i.shakitko@tech.leaseweb.com>
This commit is contained in:
Ilia Shakitko 2014-08-22 10:55:44 +02:00 committed by Wei Zhou
parent 656fc69f39
commit 09b09c18cf
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
engine/schema/src/com/cloud/network/security/dao/SecurityGroupRuleDaoImpl.java
View File

@ -23,6 +23,8 @@ import javax.ejb.Local;
import javax.inject.Inject; import javax.inject.Inject;
import javax.naming.ConfigurationException; import javax.naming.ConfigurationException;
import com.cloud.server.ResourceTag.ResourceObjectType;
import com.cloud.tags.dao.ResourceTagDao;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.cloud.network.security.SecurityGroupRuleVO; import com.cloud.network.security.SecurityGroupRuleVO;
@ -32,6 +34,8 @@ import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.JoinBuilder; import com.cloud.utils.db.JoinBuilder;
import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.db.DB;
@Component @Component
@Local(value = {SecurityGroupRuleDao.class}) @Local(value = {SecurityGroupRuleDao.class})
@ -39,6 +43,8 @@ public class SecurityGroupRuleDaoImpl extends GenericDaoBase<SecurityGroupRuleVO
@Inject @Inject
SecurityGroupDao _securityGroupDao; SecurityGroupDao _securityGroupDao;
@Inject
ResourceTagDao _tagsDao;
protected SearchBuilder<SecurityGroupRuleVO> securityGroupIdSearch; protected SearchBuilder<SecurityGroupRuleVO> securityGroupIdSearch;
protected SearchBuilder<SecurityGroupRuleVO> securityGroupIdAndTypeSearch; protected SearchBuilder<SecurityGroupRuleVO> securityGroupIdAndTypeSearch;
@ -174,4 +180,18 @@ public class SecurityGroupRuleDaoImpl extends GenericDaoBase<SecurityGroupRuleVO
sc.setParameters("allowedNetworkId", allowedGroupId); sc.setParameters("allowedNetworkId", allowedGroupId);
return findOneIncludingRemovedBy(sc); return findOneIncludingRemovedBy(sc);
} }
@Override
@DB
public boolean remove(Long id) {
TransactionLegacy txn = TransactionLegacy.currentTxn();
txn.start();
SecurityGroupRuleVO entry = findById(id);
if (entry != null) {
_tagsDao.removeByIdAndType(id, ResourceObjectType.SecurityGroupRule);
}
boolean result = super.remove(id);
txn.commit();
return result;
}
} }