From 0752ff667db09eeb3276627baef009eb414abaf4 Mon Sep 17 00:00:00 2001
From: root <Ashadeepa Debnath>
Date: Tue, 17 Jan 2017 23:39:17 +0530
Subject: [PATCH] CLOUDSTACK-9748:VPN Users search functionality broken

---
 .../com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
index 065c097f0f8b..1d3a9c330914 100644
--- a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
@@ -582,6 +582,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
     public Pair<List<? extends VpnUser>, Integer> searchForVpnUsers(ListVpnUsersCmd cmd) {
         String username = cmd.getUsername();
         Long id = cmd.getId();
+        String keyword = cmd.getKeyword();
         Account caller = CallContext.current().getCallingAccount();
         List<Long> permittedAccounts = new ArrayList<Long>();
 
@@ -596,7 +597,7 @@ public Pair<List<? extends VpnUser>, Integer> searchForVpnUsers(ListVpnUsersCmd
 
 
         sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
-        sb.and("username", sb.entity().getUsername(), SearchCriteria.Op.EQ);
+        sb.and("username", sb.entity().getUsername(), SearchCriteria.Op.LIKE);
         sb.and("state", sb.entity().getState(), Op.IN);
 
         SearchCriteria<VpnUserVO> sc = sb.create();
@@ -613,6 +614,10 @@ public Pair<List<? extends VpnUser>, Integer> searchForVpnUsers(ListVpnUsersCmd
             sc.setParameters("username", username);
         }
 
+        if (keyword!= null) {
+            sc.setParameters("username",  "%" + keyword + "%");
+        }
+
         Pair<List<VpnUserVO>, Integer> result = _vpnUsersDao.searchAndCount(sc, searchFilter);
         return new Pair<List<? extends VpnUser>, Integer>(result.first(), result.second());
     }