From 581fd68d8b8e49e8da8e8bfd497306bfdfa2971e Mon Sep 17 00:00:00 2001
From: Anurag Awasthi <anuraga.iitk@gmail.com>
Date: Tue, 18 Dec 2018 13:29:15 +0530
Subject: [PATCH] Add support for keyword in listSSHKeyPairs command search
 (#2920)

---
 server/src/com/cloud/server/ManagementServerImpl.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 56c912d29c12..38a84bb2dad3 100644
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -3655,6 +3655,7 @@ public boolean deleteSSHKeyPair(final DeleteSSHKeyPairCmd cmd) {
     public Pair<List<? extends SSHKeyPair>, Integer> listSSHKeyPairs(final ListSSHKeyPairsCmd cmd) {
         final String name = cmd.getName();
         final String fingerPrint = cmd.getFingerprint();
+        final String keyword = cmd.getKeyword();
 
         final Account caller = getCaller();
         final List<Long> permittedAccounts = new ArrayList<Long>();
@@ -3681,6 +3682,11 @@ public Pair<List<? extends SSHKeyPair>, Integer> listSSHKeyPairs(final ListSSHKe
             sc.addAnd("fingerprint", SearchCriteria.Op.EQ, fingerPrint);
         }
 
+        if (keyword != null) {
+            sc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%");
+            sc.addOr("fingerprint", SearchCriteria.Op.LIKE, "%" + keyword + "%");
+        }
+
         final Pair<List<SSHKeyPairVO>, Integer> result = _sshKeyPairDao.searchAndCount(sc, searchFilter);
         return new Pair<List<? extends SSHKeyPair>, Integer>(result.first(), result.second());
     }