[Veeam] disable jobs but keep backups

api/src/main/java/com/cloud/vm/VirtualMachine.java

@@ -345,6 +345,8 @@ public boolean isUsedBySystem() {
 
     Type getType();
 
+    String getBackupName();
+
     HypervisorType getHypervisorType();
 
     Map<String, String> getDetails();
@@ -355,5 +357,4 @@ public boolean isUsedBySystem() {
     boolean isDisplay();
 
     boolean isDynamicallyScalable();
-
 }

api/src/main/java/org/apache/cloudstack/api/command/user/volume/DetachVolumeCmd.java

@@ -69,14 +69,26 @@
         return id;
     }
 
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public Long getDeviceId() {
         return deviceId;
     }
 
+    public void setDeviceId(Long deviceId) {
+        this.deviceId = deviceId;
+    }
+
     public Long getVirtualMachineId() {
         return virtualMachineId;
     }
 
+    public void setVirtualMachineId(Long virtualMachineId) {
+        this.virtualMachineId = virtualMachineId;
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////

api/src/main/java/org/apache/cloudstack/backup/Backup.java

@@ -23,7 +23,7 @@
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 
 import com.cloud.storage.Volume;
 
@@ -85,6 +85,14 @@
         private String id;
         private Date created;
         private String type;
+        private List<String> paths;
+
+        public RestorePoint(String id, Date created, String type, List<String> paths) {
+            this.id = id;
+            this.created = created;
+            this.type = type;
+            this.paths = paths;
+        }
 
         public RestorePoint(String id, Date created, String type) {
             this.id = id;
@@ -115,19 +123,29 @@
         public void setType(String type) {
             this.type = type;
         }
+
+        public void setPaths(List<String> paths) {
+            this.paths = paths;
+        }
+
+        public List<String> getPaths() {
+            return paths;
+        }
     }
 
     class VolumeInfo {
         private String uuid;
         private Volume.Type type;
         private Long size;
         private String path;
+        private Long deviceId;
 
-        public VolumeInfo(String uuid, String path, Volume.Type type, Long size) {
+        public VolumeInfo(String uuid, String path, Volume.Type type, Long size, Long deviceId) {
             this.uuid = uuid;
             this.type = type;
             this.size = size;
             this.path = path;
+            this.deviceId = deviceId;
         }
 
         public String getUuid() {
@@ -150,14 +168,21 @@
             return size;
         }
 
+        public void setDeviceId(Long deviceId) {
+            this.deviceId = deviceId;
+        }
+
+        public Long getDeviceId() {
+            return deviceId;
+        }
+
         @Override
         public String toString() {
-            return StringUtils.join(":", uuid, path, type, size);
+            return ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, "uuid", "path", "type", "size", "deviceId");
         }
     }
 
     long getVmId();
-    long getBackupOfferingId();
     String getExternalId();
     String getType();
     Date getDate();
@@ -166,4 +191,5 @@
     Long getProtectedSize();
     List<VolumeInfo> getBackedUpVolumes();
     long getZoneId();
+    long getBackupOfferingId();
 }

api/src/main/java/org/apache/cloudstack/backup/BackupProvider.java

@@ -60,7 +60,7 @@ public interface BackupProvider {
      * @param vm the machine to stop backing up
      * @return succeeded?
      */
-    boolean removeVMFromBackupOffering(VirtualMachine vm);
+    boolean removeVMFromBackupOffering(VirtualMachine vm, boolean removeBackups);
 
     /**
      * Whether the provider will delete backups on removal of VM from the offering

engine/schema/src/main/java/com/cloud/storage/dao/VolumeDao.java

@@ -102,6 +102,7 @@ public interface VolumeDao extends GenericDao<VolumeVO, Long>, StateDao<Volume.S
 
     List<VolumeVO> findIncludingRemovedByZone(long zoneId);
 
+    VolumeVO findByPath(String path);
     /**
      * Lists all volumes using a given passphrase ID
      * @param passphraseId

engine/schema/src/main/java/com/cloud/storage/dao/VolumeDaoImpl.java

@@ -159,6 +159,13 @@
         return findOneBy(sc);
     }
 
+    @Override
+    public VolumeVO findByPath(String path) {
+        SearchCriteria<VolumeVO> sc = AllFieldsSearch.create();
+        sc.setParameters("path", path);
+        return findOneBy(sc);
+    }
+
     @Override
     public List<VolumeVO> findByPoolId(long poolId, Volume.Type volumeType) {
         SearchCriteria<VolumeVO> sc = AllFieldsSearch.create();
@@ -396,6 +403,7 @@
         AllFieldsSearch.and("updatedCount", AllFieldsSearch.entity().getUpdatedCount(), Op.EQ);
         AllFieldsSearch.and("name", AllFieldsSearch.entity().getName(), Op.EQ);
         AllFieldsSearch.and("passphraseId", AllFieldsSearch.entity().getPassphraseId(), Op.EQ);
+        AllFieldsSearch.and("path", AllFieldsSearch.entity().getPath(), Op.EQ);
         AllFieldsSearch.and("iScsiName", AllFieldsSearch.entity().get_iScsiName(), Op.EQ);
         AllFieldsSearch.done();
 

engine/schema/src/main/java/com/cloud/vm/VMInstanceVO.java

@@ -202,6 +202,9 @@
     @Column(name = "backup_volumes", length = 65535)
     protected String backupVolumes;
 
+    @Column(name = "backup_name")
+    private String backupName;
+
     public VMInstanceVO(long id, long serviceOfferingId, String name, String instanceName, Type type, Long vmTemplateId, HypervisorType hypervisorType, long guestOSId,
                         long domainId, long accountId, long userId, boolean haEnabled) {
         this.id = id;
@@ -628,4 +631,12 @@
     public void setBackupVolumes(String backupVolumes) {
         this.backupVolumes = backupVolumes;
     }
+
+    public String getBackupName() {
+        return backupName;
+    }
+
+    public void setBackupName(String backupName) {
+        this.backupName = backupName;
+    }
 }

engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupDaoImpl.java

@@ -44,7 +44,6 @@
 import com.google.gson.Gson;
 
 public class BackupDaoImpl extends GenericDaoBase<BackupVO, Long> implements BackupDao {
-
     @Inject
     AccountDao accountDao;
 
@@ -194,43 +193,48 @@
 
     @Override
     public BackupResponse newBackupResponse(Backup backup) {
-        VMInstanceVO vm = vmInstanceDao.findByIdIncludingRemoved(backup.getVmId());
-        AccountVO account = accountDao.findByIdIncludingRemoved(vm.getAccountId());
-        DomainVO domain = domainDao.findByIdIncludingRemoved(vm.getDomainId());
-        DataCenterVO zone = dataCenterDao.findByIdIncludingRemoved(vm.getDataCenterId());
-        Long offeringId = backup.getBackupOfferingId();
-        if (offeringId == null) {
-            offeringId = vm.getBackupOfferingId();
-        }
-        BackupOffering offering = backupOfferingDao.findByIdIncludingRemoved(offeringId);
-
-        BackupResponse response = new BackupResponse();
-        response.setId(backup.getUuid());
-        response.setVmId(vm.getUuid());
-        response.setVmName(vm.getHostName());
-        response.setExternalId(backup.getExternalId());
-        response.setType(backup.getType());
-        response.setDate(backup.getDate());
-        response.setSize(backup.getSize());
-        response.setProtectedSize(backup.getProtectedSize());
-        response.setStatus(backup.getStatus());
-        // ACS 4.20: For backups taken prior this release the backup.backed_volumes column would be empty hence use vm_instance.backup_volumes
-        String backedUpVolumes;
-        if (Objects.isNull(backup.getBackedUpVolumes())) {
-            backedUpVolumes = new Gson().toJson(vm.getBackupVolumeList().toArray(), Backup.VolumeInfo[].class);
-        } else {
-            backedUpVolumes = new Gson().toJson(backup.getBackedUpVolumes().toArray(), Backup.VolumeInfo[].class);
+        try {
+            VMInstanceVO vm = vmInstanceDao.findByIdIncludingRemoved(backup.getVmId());
+            AccountVO account = accountDao.findByIdIncludingRemoved(vm.getAccountId());
+            DomainVO domain = domainDao.findByIdIncludingRemoved(vm.getDomainId());
+            DataCenterVO zone = dataCenterDao.findByIdIncludingRemoved(vm.getDataCenterId());
+            Long offeringId = backup.getBackupOfferingId();
+            if (offeringId == null) {
+                offeringId = vm.getBackupOfferingId();
+            }
+            BackupOffering offering = backupOfferingDao.findByIdIncludingRemoved(offeringId);
+
+            BackupResponse response = new BackupResponse();
+            response.setId(backup.getUuid());
+            response.setVmId(vm.getUuid());
+            response.setVmName(vm.getHostName());
+            response.setExternalId(backup.getExternalId());
+            response.setType(backup.getType());
+            response.setDate(backup.getDate());
+            response.setSize(backup.getSize());
+            response.setProtectedSize(backup.getProtectedSize());
+            response.setStatus(backup.getStatus());
+            // ACS 4.20: For backups taken prior this release the backup.backed_volumes column would be empty hence use vm_instance.backup_volumes
+            String backedUpVolumes;
+            if (Objects.isNull(backup.getBackedUpVolumes())) {
+                backedUpVolumes = new Gson().toJson(vm.getBackupVolumeList().toArray(), Backup.VolumeInfo[].class);
+            } else {
+                backedUpVolumes = new Gson().toJson(backup.getBackedUpVolumes().toArray(), Backup.VolumeInfo[].class);
+            }
+            response.setVolumes(backedUpVolumes);
+            response.setBackupOfferingId(offering.getUuid());
+            response.setBackupOffering(offering.getName());
+            response.setAccountId(account.getUuid());
+            response.setAccount(account.getAccountName());
+            response.setDomainId(domain.getUuid());
+            response.setDomain(domain.getName());
+            response.setZoneId(zone.getUuid());
+            response.setZone(zone.getName());
+            response.setObjectName("backup");
+            return response;
+        } catch (Exception e) {
+            logger.error("Failed to create backup response from Backup [id: {}, vmId: {}] due to: [{}].", backup.getId(), backup.getVmId(), e.getMessage(), e);
+            return null;
         }
-        response.setVolumes(backedUpVolumes);
-        response.setBackupOfferingId(offering.getUuid());
-        response.setBackupOffering(offering.getName());
-        response.setAccountId(account.getUuid());
-        response.setAccount(account.getAccountName());
-        response.setDomainId(domain.getUuid());
-        response.setDomain(domain.getName());
-        response.setZoneId(zone.getUuid());
-        response.setZone(zone.getName());
-        response.setObjectName("backup");
-        return response;
     }
 }

engine/schema/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java

@@ -189,6 +189,9 @@
     @Column(name = "backup_volumes")
     private String backupVolumes;
 
+    @Column(name = "backup_name")
+    private String backupName;
+
     @Column(name = "dynamically_scalable")
     protected boolean dynamicallyScalable;
 
@@ -591,4 +594,9 @@
     public List<Backup.VolumeInfo> getBackupVolumeList() {
         return Arrays.asList(new Gson().fromJson(this.backupVolumes, Backup.VolumeInfo[].class));
     }
+
+    @Override
+    public String getBackupName() {
+        return backupName;
+    }
 }

engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDao.java

@@ -149,6 +149,18 @@ public interface PrimaryDataStoreDao extends GenericDao<StoragePoolVO, Long> {
 
     List<StoragePoolVO> listStoragePoolsWithActiveVolumesByOfferingId(long offeringid);
 
+    /**
+     * Find storage pool by path like. If clusterId is informed, try to find by path like in specified zone and cluster.
+     * If clusterId is not informed, try to find by path like in specified zone and with clusterId null.
+     */
+    StoragePoolVO findPoolByPathLike(String datastore, Long datacenterId, Long clusterId);
+
+    /**
+     * Find storage pool by name in specified datacenter. If clusterId is informed, try to find by name in specified zone and cluster.
+     * If clusterId is not informed, try to find by name in specified zone.
+     */
+    StoragePoolVO findPoolByName(String datastore, Long datacenterId, Long clusterId);
+
     Pair<List<Long>, Integer> searchForIdsAndCount(Long storagePoolId, String storagePoolName, Long zoneId,
             String path, Long podId, Long clusterId, String address, ScopeType scopeType, StoragePoolStatus status,
             String keyword, Filter searchFilter);

engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java

@@ -62,6 +62,10 @@
     private final SearchBuilder<StoragePoolVO> DcLocalStorageSearch;
     private final GenericSearchBuilder<StoragePoolVO, Long> StatusCountSearch;
     private final SearchBuilder<StoragePoolVO> ClustersSearch;
+    private final SearchBuilder<StoragePoolVO> PathLikeSearchClusterWide;
+    private final SearchBuilder<StoragePoolVO> PathLikeSearchZoneWide;
+    private final SearchBuilder<StoragePoolVO> NameSearchClusterWide;
+    private final SearchBuilder<StoragePoolVO> NameSearchZoneWide;
     private final SearchBuilder<StoragePoolVO> IdsSearch;
 
     @Inject
@@ -155,6 +159,26 @@
         IdsSearch.and("ids", IdsSearch.entity().getId(), SearchCriteria.Op.IN);
         IdsSearch.done();
 
+        PathLikeSearchClusterWide = createSearchBuilder();
+        PathLikeSearchClusterWide.and("path", PathLikeSearchClusterWide.entity().getPath(), Op.LIKE);
+        PathLikeSearchClusterWide.and("datacenterId", PathLikeSearchClusterWide.entity().getDataCenterId(), Op.EQ);
+        PathLikeSearchClusterWide.and("clusterId", PathLikeSearchClusterWide.entity().getClusterId(), Op.EQ);
+        PathLikeSearchClusterWide.done();
+
+        PathLikeSearchZoneWide = createSearchBuilder();
+        PathLikeSearchZoneWide.and("path", PathLikeSearchZoneWide.entity().getPath(), Op.LIKE);
+        PathLikeSearchZoneWide.and("datacenterId", PathLikeSearchZoneWide.entity().getDataCenterId(), Op.EQ);
+        PathLikeSearchZoneWide.and("clusterId", PathLikeSearchZoneWide.entity().getClusterId(), Op.NULL);
+
+        NameSearchClusterWide = createSearchBuilder();
+        NameSearchClusterWide.and("name", NameSearchClusterWide.entity().getName(), Op.EQ);
+        NameSearchClusterWide.and("datacenterId", NameSearchClusterWide.entity().getDataCenterId(), Op.EQ);
+        NameSearchClusterWide.and("clusterId", NameSearchClusterWide.entity().getClusterId(), Op.EQ);
+
+        NameSearchZoneWide = createSearchBuilder();
+        NameSearchZoneWide.and("name", NameSearchZoneWide.entity().getName(), Op.EQ);
+        NameSearchZoneWide.and("datacenterId", NameSearchZoneWide.entity().getDataCenterId(), Op.EQ);
+        NameSearchZoneWide.and("clusterId", NameSearchZoneWide.entity().getClusterId(), Op.NULL);
     }
 
     @Override
@@ -713,6 +737,34 @@
         }
     }
 
+    @Override
+    public StoragePoolVO findPoolByPathLike(String datastore, Long datacenterId, Long clusterId) {
+        SearchCriteria<StoragePoolVO> sc = null;
+        if (clusterId != null) {
+            sc = PathLikeSearchClusterWide.create();
+            sc.setParameters("clusterId", clusterId);
+        } else  {
+            sc = PathLikeSearchZoneWide.create();
+        }
+        sc.setParameters("path", "%/" + datastore);
+        sc.setParameters("datacenterId", datacenterId);
+        return findOneBy(sc);
+    }
+
+    @Override
+    public StoragePoolVO findPoolByName(String datastore, Long datacenterId, Long clusterId) {
+        SearchCriteria<StoragePoolVO> sc = null;
+        if (clusterId != null) {
+            sc = NameSearchClusterWide.create();
+            sc.setParameters("clusterId", clusterId);
+        } else {
+            sc = NameSearchZoneWide.create();
+        }
+        sc.setParameters("name", datastore);
+        sc.setParameters("datacenterId", datacenterId);
+        return findOneBy(sc);
+    }
+
     @Override
     public Pair<List<Long>, Integer> searchForIdsAndCount(Long storagePoolId, String storagePoolName, Long zoneId,
             String path, Long podId, Long clusterId, String address, ScopeType scopeType, StoragePoolStatus status,