Addition of type and VM filter in the backup listing API (#13644)

Author: GeanJair

api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupsCmd.java

@@ -95,6 +95,12 @@ public class ListBackupsCmd extends BaseListProjectAndAccountResourcesCmd {
             description = "list backups by status")
     private String backupStatus;
 
+    @Parameter(name = ApiConstants.TYPE,
+            type = CommandType.STRING,
+            since = "4.24.0",
+            description = "list backups by type")
+    private String backupType;
+
     @Parameter(name = ApiConstants.LIST_VM_DETAILS,
             type = CommandType.BOOLEAN,
             since = "4.21.0",
@@ -129,6 +135,10 @@ public String getBackupStatus() {
         return backupStatus;
     }
 
+    public String getBackupType() {
+        return backupType;
+    }
+
     public Boolean getListVmDetails() {
         return listVmDetails;
     }

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

@@ -1203,6 +1203,7 @@ public Pair<List<Backup>, Integer> listBackups(final ListBackupsCmd cmd) {
         final Long zoneId = cmd.getZoneId();
         final Long backupOfferingId = cmd.getBackupOfferingId();
         final Backup.Status backupStatus = validateBackupStatus(cmd.getBackupStatus());
+        final String backupType = cmd.getBackupType();
         final Account caller = CallContext.current().getCallingAccount();
         final String keyword = cmd.getKeyword();
         List<Long> permittedAccounts = new ArrayList<Long>();
@@ -1235,6 +1236,7 @@ public Pair<List<Backup>, Integer> listBackups(final ListBackupsCmd cmd) {
         // incremental chain GC can sweep them once their last descendant is deleted.
         sb.and("statusNeq", sb.entity().getStatus(), SearchCriteria.Op.NEQ);
         sb.and("backupStatus", sb.entity().getStatus(), SearchCriteria.Op.EQ);
+        sb.and("backupType", sb.entity().getType(), SearchCriteria.Op.EQ);
 
         if (keyword != null) {
             sb.and().op("keywordName", sb.entity().getName(), SearchCriteria.Op.LIKE);
@@ -1270,6 +1272,8 @@ public Pair<List<Backup>, Integer> listBackups(final ListBackupsCmd cmd) {
 
         sc.setParametersIfNotNull("backupStatus", backupStatus);
 
+        sc.setParametersIfNotNull("backupType", backupType);
+
         if (keyword != null) {
             String keywordMatch = "%" + keyword + "%";
             sc.setParameters("keywordName", keywordMatch);

ui/src/components/view/SearchView.vue

@@ -334,7 +334,7 @@ export default {
         }
         if (['zoneid', 'domainid', 'imagestoreid', 'storageid', 'state', 'account', 'hypervisor', 'level',
           'clusterid', 'podid', 'groupid', 'entitytype', 'accounttype', 'systemvmtype', 'scope', 'provider',
-          'type', 'scope', 'managementserverid', 'serviceofferingid',
+          'scope', 'managementserverid', 'serviceofferingid',
           'diskofferingid', 'networkid', 'usagetype', 'restartrequired', 'gpuenabled',
           'displaynetwork', 'guestiptype', 'usersource', 'arch', 'oscategoryid', 'templatetype', 'gpucardid', 'vgpuprofileid',
           'extensionid', 'backupoffering', 'volumeid', 'virtualmachineid', 'hsmprofileid', 'kmskeyid', 'status'].includes(item)

ui/src/config/section/storage.js

@@ -495,10 +495,7 @@ export default {
       params: { listvmdetails: 'true' },
       columns: ['name', 'status', 'compressionstatus', 'validationstatus', 'size', 'virtualsize', 'virtualmachinename', 'backupofferingname', 'intervaltype', 'type', 'created', 'account', 'domain', 'zone'],
       details: ['name', 'description', 'virtualmachinename', 'id', 'intervaltype', 'type', 'externalid', 'size', 'virtualsize', 'volumes', 'backupofferingname', 'zone', 'account', 'domain', 'created'],
-      searchFilters: () => {
-        var filters = ['name', 'zoneid', 'domainid', 'account', 'backupofferingid', 'status']
-        return filters
-      },
+      searchFilters: ['name', 'zoneid', 'domainid', 'account', 'backupofferingid', 'status', 'type', 'virtualmachineid'],
       tabs: [
         {
           name: 'details',