From ac68ebd6310fc1f68e87e9dfacfd07ed393ad782 Mon Sep 17 00:00:00 2001
From: Kishan Kavala <kishan@cloud.com>
Date: Thu, 9 Jan 2014 22:00:32 +0530
Subject: [PATCH] CLOUDSTACK-5656: Removed Filtering of revoked rules while
 listing. API returns state as Deleting for revoked rules.

---
 server/src/com/cloud/network/firewall/FirewallManagerImpl.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
index af606bc5517..0a98062b847 100644
--- a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
+++ b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
@@ -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());