From 0c04007e047d7e5720b55e477aa8f55ded68ba70 Mon Sep 17 00:00:00 2001 From: alena Date: Wed, 9 Mar 2011 13:15:20 -0800 Subject: [PATCH] bug 8734: search by keyword in listPublicIpAddresses command status 8734: resolved fixed --- api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java | 1 - server/src/com/cloud/server/ManagementServerImpl.java | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java b/api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java index e92994636ee..ac3eab837c0 100644 --- a/api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java +++ b/api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java @@ -26,7 +26,6 @@ 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; diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index fc5a5d5bf33..3d8d72fdecc 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -2474,6 +2474,7 @@ public class ManagementServerImpl implements ManagementServer { sb.and("accountIdEQ", sb.entity().getAllocatedToAccountId(), SearchCriteria.Op.EQ); sb.and("dataCenterId", sb.entity().getDataCenterId(), SearchCriteria.Op.EQ); sb.and("address", sb.entity().getAddress(), SearchCriteria.Op.EQ); + sb.and("addressLike", sb.entity().getAddress(), SearchCriteria.Op.LIKE); sb.and("vlanDbId", sb.entity().getVlanId(), SearchCriteria.Op.EQ); sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ); @@ -2516,7 +2517,7 @@ public class ManagementServerImpl implements ManagementServer { } if ((address == null) && (keyword != null)) { - address = keyword; + sc.setParameters("addressLike", "%" + keyword + "%"); } if (address != null) {