cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kis...@apache.org
Subject [2/2] git commit: updated refs/heads/master to 0e315f1
Date Thu, 09 Jan 2014 16:40:56 GMT
CLOUDSTACK-5656: Removed Filtering of revoked rules while listing. API returns state as Deleting
for revoked rules.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0e315f16
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0e315f16
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0e315f16

Branch: refs/heads/master
Commit: 0e315f16c0e57169277800ca89cda8dd31a0b253
Parents: 7c8facf
Author: Kishan Kavala <kishan@cloud.com>
Authored: Thu Jan 9 22:00:32 2014 +0530
Committer: Kishan Kavala <kishan@cloud.com>
Committed: Thu Jan 9 22:01:59 2014 +0530

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0e315f16/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
index af055fb..448abe3 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());


Mime
View raw message