From b0aabc1b2066b7008694f3d9e60a45d6c47eedfa Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Thu, 24 Feb 2011 09:55:03 -0800
Subject: [PATCH] bug 8682: implemented search by id in listPortForwardingRules
 status 8682: resolved fixed

---
 .../com/cloud/api/commands/ListPortForwardingRulesCmd.java | 7 +++++++
 server/src/com/cloud/network/rules/RulesManagerImpl.java   | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java b/api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java
index e0cbcbda2fb..e92994636ee 100644
--- a/api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java
+++ b/api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java
@@ -26,6 +26,7 @@ import com.cloud.api.ApiConstants;
 import com.cloud.api.BaseListCmd;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
+import com.cloud.api.BaseCmd.CommandType;
 import com.cloud.api.response.FirewallRuleResponse;
 import com.cloud.api.response.ListResponse;
 import com.cloud.network.rules.PortForwardingRule;
@@ -39,6 +40,8 @@ public class ListPortForwardingRulesCmd extends BaseListCmd {
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
     /////////////////////////////////////////////////////
+    @Parameter(name=ApiConstants.ID, type=CommandType.LONG, description="Lists rule with the specified ID.")
+    private Long id;
     
     @Parameter(name=ApiConstants.IP_ADDRESS_ID, type=CommandType.LONG, description="the id of IP address of the port forwarding services")
     private Long ipAddressId;
@@ -64,6 +67,10 @@ public class ListPortForwardingRulesCmd extends BaseListCmd {
     public Long getIpAddressId() {
         return ipAddressId;
     }
+    
+    public Long getId() {
+        return id;
+    }
 
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java b/server/src/com/cloud/network/rules/RulesManagerImpl.java
index 69472620ddc..96cbde447cf 100644
--- a/server/src/com/cloud/network/rules/RulesManagerImpl.java
+++ b/server/src/com/cloud/network/rules/RulesManagerImpl.java
@@ -582,6 +582,7 @@ public class RulesManagerImpl implements RulesManager, RulesService, Manager {
     public List<? extends PortForwardingRule> listPortForwardingRules(ListPortForwardingRulesCmd cmd) {
        Account caller = UserContext.current().getCaller();
        Long ipId = cmd.getIpAddressId();
+       Long id = cmd.getId();
        String path = null;
         
        Pair<String, Long> accountDomainPair = _accountMgr.finalizeAccountDomainForList(caller, cmd.getAccountName(), cmd.getDomainId());
@@ -603,6 +604,7 @@ public class RulesManagerImpl implements RulesManager, RulesService, Manager {
         
         Filter filter = new Filter(PortForwardingRuleVO.class, "id", false, cmd.getStartIndex(), cmd.getPageSizeVal()); 
         SearchBuilder<PortForwardingRuleVO> sb = _forwardingDao.createSearchBuilder();
+        sb.and("id", sb.entity().getId(), Op.EQ);
         sb.and("ip", sb.entity().getSourceIpAddressId(), Op.EQ);
         sb.and("accountId", sb.entity().getAccountId(), Op.EQ);
         sb.and("domainId", sb.entity().getDomainId(), Op.EQ);
@@ -617,6 +619,10 @@ public class RulesManagerImpl implements RulesManager, RulesService, Manager {
         
         SearchCriteria<PortForwardingRuleVO> sc = sb.create();
         
+        if (id != null) {
+            sc.setParameters("id", id);
+        }
+        
         if (ipId != null) {
             sc.setParameters("ip", ipId);
         }