support snap / backup policy search using keyword

Author: Pearl1594

server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java

@@ -1394,6 +1394,7 @@ public Pair<List<? extends SnapshotPolicy>, Integer> listSnapshotPolicies(ListSn
         Long id = cmd.getId();
         Account caller = CallContext.current().getCallingAccount();
         List<Long> permittedAccounts = new ArrayList<>();
+        String keyword = cmd.getKeyword();
 
         // Verify parameters
         if (volumeId != null) {
@@ -1417,6 +1418,10 @@ public Pair<List<? extends SnapshotPolicy>, Integer> listSnapshotPolicies(ListSn
         policySearch.and("id", policySearch.entity().getId(), SearchCriteria.Op.EQ);
         policySearch.and("volumeId", policySearch.entity().getVolumeId(), SearchCriteria.Op.EQ);
 
+        SearchBuilder<VolumeVO> volumeSearch = _volsDao.createSearchBuilder();
+        volumeSearch.and("name", volumeSearch.entity().getName(), SearchCriteria.Op.LIKE);
+        policySearch.join("volumeJoin", volumeSearch, policySearch.entity().getVolumeId(), volumeSearch.entity().getId(), JoinBuilder.JoinType.INNER);
+
         SearchCriteria<SnapshotPolicyVO> sc = policySearch.create();
         _accountMgr.buildACLSearchCriteria(sc, domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria);
 
@@ -1426,6 +1431,9 @@ public Pair<List<? extends SnapshotPolicy>, Integer> listSnapshotPolicies(ListSn
         if (id != null) {
             sc.setParameters("id", id);
         }
+        if (keyword != null) {
+            sc.setJoinParameters("volumeJoin", "name", "%" + keyword + "%");
+        }
 
         Pair<List<SnapshotPolicyVO>, Integer> result = _snapshotPolicyDao.searchAndCount(sc, searchFilter);
         return new Pair<>(result.first(), result.second());

server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java

@@ -640,12 +640,12 @@ protected int validateAndGetDefaultBackupRetentionIfRequired(Integer maxBackups,
 
     public List<BackupSchedule> listBackupSchedules(ListBackupScheduleCmd cmd) {
         Account caller = CallContext.current().getCallingAccount();
-        boolean isRootAdmin = accountManager.isRootAdmin(caller.getId());
         Long id = cmd.getId();
         Long vmId = cmd.getVmId();
         List<Long> permittedAccounts = new ArrayList<>();
         Long domainId = null;
         Boolean isRecursive = null;
+        String keyword = cmd.getKeyword();
         Project.ListProjectResourcesCriteria listProjectResourcesCriteria = null;
 
         if (vmId != null) {
@@ -670,6 +670,11 @@ public List<BackupSchedule> listBackupSchedules(ListBackupScheduleCmd cmd) {
         if (vmId != null) {
             searchBuilder.and("vmId", searchBuilder.entity().getVmId(), SearchCriteria.Op.EQ);
         }
+        if (keyword != null && !keyword.isEmpty()) {
+            SearchBuilder<VMInstanceVO> vmSearch = vmInstanceDao.createSearchBuilder();
+            vmSearch.and("hostName", vmSearch.entity().getHostName(), SearchCriteria.Op.LIKE);
+            searchBuilder.join("vmJoin", vmSearch, searchBuilder.entity().getVmId(), vmSearch.entity().getId(), JoinBuilder.JoinType.INNER);
+        }
 
         SearchCriteria<BackupScheduleVO> sc = searchBuilder.create();
         accountManager.buildACLSearchCriteria(sc, domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria);
@@ -680,6 +685,9 @@ public List<BackupSchedule> listBackupSchedules(ListBackupScheduleCmd cmd) {
         if (vmId != null) {
             sc.setParameters("vmId", vmId);
         }
+        if (keyword != null && !keyword.isEmpty()) {
+            sc.setJoinParameters("vmJoin", "hostName", "%" + keyword + "%");
+        }
 
         Pair<List<BackupScheduleVO>, Integer> result = backupScheduleDao.searchAndCount(sc, searchFilter);
         return new ArrayList<>(result.first());