From 26bcb9afd81077ab41e363e69546b251bb5bd6be Mon Sep 17 00:00:00 2001
From: Nitesh Sarda <nitesh_sarda@accelerite.com>
Date: Wed, 31 May 2017 18:19:08 +0530
Subject: [PATCH] CLOUDSTACK-9935 : Search in VPN Customer Gateway not working

(cherry picked from commit fdadc7b7607e9f3b78d0577a09986fab346c1788)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 .../com/cloud/network/vpn/Site2SiteVpnManagerImpl.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
index 37465262e16..2e722753f63 100644
--- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
@@ -586,6 +586,7 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn
         boolean listAll = cmd.listAll();
         long startIndex = cmd.getStartIndex();
         long pageSizeVal = cmd.getPageSizeVal();
+        String keyword = cmd.getKeyword();
 
         Account caller = CallContext.current().getCallingAccount();
         List<Long> permittedAccounts = new ArrayList<Long>();
@@ -602,12 +603,17 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn
         _accountMgr.buildACLSearchBuilder(sb, domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria);
 
         sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
+        sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE);
 
         SearchCriteria<Site2SiteCustomerGatewayVO> sc = sb.create();
         _accountMgr.buildACLSearchCriteria(sc, domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria);
 
         if (id != null) {
-            sc.addAnd("id", SearchCriteria.Op.EQ, id);
+            sc.setParameters("id", id);
+        }
+        if(keyword != null && !keyword.isEmpty())
+        {
+            sc.setParameters("name", "%" + keyword + "%");
         }
 
         Pair<List<Site2SiteCustomerGatewayVO>, Integer> result = _customerGatewayDao.searchAndCount(sc, searchFilter);