etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-5656: Removed Filtering of revoked rules while listing. API returns state as Deleting for revoked rules.

This commit is contained in:
Kishan Kavala 2014-01-09 22:00:32 +05:30
parent d5277a81e6
commit ac68ebd631
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/network/firewall/FirewallManagerImpl.java
View File

@ -284,7 +284,6 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService,
sb.and("networkId", sb.entity().getNetworkId(), Op.EQ);
sb.and("ip", sb.entity().getSourceIpAddressId(), Op.EQ);
sb.and("purpose", sb.entity().getPurpose(), Op.EQ);
sb.and("state", sb.entity().getState(), Op.NEQ);
if (tags != null && !tags.isEmpty()) {
SearchBuilder<ResourceTagVO> tagSearch = _resourceTagDao.createSearchBuilder();
@ -325,7 +324,6 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService,
sc.setParameters("purpose", Purpose.Firewall);
sc.setParameters("trafficType", trafficType);
sc.setParameters("state", State.Revoke);
Pair<List<FirewallRuleVO>, Integer> result = _firewallDao.searchAndCount(sc, filter);
return new Pair<List<? extends FirewallRule>, Integer>(result.first(), result.second());