diff --git a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java index 66773389dfd..37f1c397075 100644 --- a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java +++ b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java @@ -118,6 +118,7 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ String name = cmd.getName(); Long networkId = cmd.getNetworkId(); Long vpcId = cmd.getVpcId(); + String keyword = cmd.getKeyword(); SearchBuilder sb = _networkACLDao.createSearchBuilder(); sb.and("id", sb.entity().getId(), Op.EQ); sb.and("name", sb.entity().getName(), Op.EQ); @@ -132,6 +133,14 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ } SearchCriteria sc = sb.create(); + + if (keyword != null) { + SearchCriteria ssc = _networkACLDao.createSearchCriteria(); + ssc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%"); + ssc.addOr("description", SearchCriteria.Op.LIKE, "%" + keyword + "%"); + sc.addAnd("name", SearchCriteria.Op.SC, ssc); + } + if(id != null){ sc.setParameters("id", id); }