Skip to content

Commit a7ccbdc

Browse files
anuragawyadvr
authored andcommitted
api: allow keyword search in listSSHKeyPairs (#2920) (#3098)
Adds support for keyword search that was ignored by listsshkeypairs command. Fixes: #2920
1 parent 8d53557 commit a7ccbdc

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

server/src/com/cloud/server/ManagementServerImpl.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3655,6 +3655,7 @@ public boolean deleteSSHKeyPair(final DeleteSSHKeyPairCmd cmd) {
36553655
public Pair<List<? extends SSHKeyPair>, Integer> listSSHKeyPairs(final ListSSHKeyPairsCmd cmd) {
36563656
final String name = cmd.getName();
36573657
final String fingerPrint = cmd.getFingerprint();
3658+
final String keyword = cmd.getKeyword();
36583659

36593660
final Account caller = getCaller();
36603661
final List<Long> permittedAccounts = new ArrayList<Long>();
@@ -3681,6 +3682,11 @@ public Pair<List<? extends SSHKeyPair>, Integer> listSSHKeyPairs(final ListSSHKe
36813682
sc.addAnd("fingerprint", SearchCriteria.Op.EQ, fingerPrint);
36823683
}
36833684

3685+
if (keyword != null) {
3686+
sc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%");
3687+
sc.addOr("fingerprint", SearchCriteria.Op.LIKE, "%" + keyword + "%");
3688+
}
3689+
36843690
final Pair<List<SSHKeyPairVO>, Integer> result = _sshKeyPairDao.searchAndCount(sc, searchFilter);
36853691
return new Pair<List<? extends SSHKeyPair>, Integer>(result.first(), result.second());
36863692
}

0 commit comments

Comments
 (0)