From 61823c24f658eb0fe3f1246e61d4a6b9f308cb00 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   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
index 2e234746487..a60ca42443b 100644
--- a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
@@ -590,6 +590,7 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc
     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>();
 
@@ -605,6 +606,7 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc
 
         sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
         sb.and("username", sb.entity().getUsername(), SearchCriteria.Op.EQ);
+        sb.and("keyword", sb.entity().getUsername(), SearchCriteria.Op.LIKE);
         sb.and("state", sb.entity().getState(), Op.IN);
 
         SearchCriteria<VpnUserVO> sc = sb.create();
@@ -613,6 +615,10 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc
         //list only active users
         sc.setParameters("state", State.Active, State.Add);
 
+        if(keyword != null){
+            sc.setParameters("keyword", "%" + keyword + "%");
+        }
+
         if (id != null) {
             sc.setParameters("id", id);
         }