small fixes

fix copy when reccuring snapshot
fix UI after rebasing

Author: slavkap

api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotPolicyCmd.java

@@ -41,6 +41,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.apache.commons.lang3.BooleanUtils;
 
 @APICommand(name = "createSnapshotPolicy", description = "Creates a snapshot policy for the account.", responseObject = SnapshotPolicyResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
@@ -92,6 +93,9 @@ public class CreateSnapshotPolicyCmd extends BaseCmd {
                     "The snapshot will always be made available in the zone in which the volume is present.",
             since = "4.21.0")
     protected List<Long> storagePoolIds;
+
+    @Parameter (name = ApiConstants.USE_STORAGE_REPLICATION, type=CommandType.BOOLEAN, required = false, since = "4.21.0", description = "This parameter enables the option the snapshot to be copied to supported primary storage")
+    protected Boolean useStorageReplication;
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -132,6 +136,10 @@ public  List<Long> getStoragePoolIds() {
         return storagePoolIds == null ? new ArrayList<>() : storagePoolIds;
     }
 
+    public Boolean useStorageReplication() {
+        return BooleanUtils.toBoolean(useStorageReplication);
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////

plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/driver/StorPoolPrimaryDataStoreDriver.java

@@ -672,6 +672,12 @@ public void copyAsync(DataObject srcData, DataObject dstData, AsyncCompletionCal
                 SpApiResponse resp = StorPoolUtil.volumeCreate(spVolume, conn);
                 if (resp.getError() == null) {
                     updateStoragePool(dstData.getDataStore().getId(), size);
+
+                    VolumeObjectTO to = (VolumeObjectTO)dstData.getTO();
+                    to.setPath(StorPoolUtil.devPath(StorPoolUtil.getNameFromResponse(resp, false)));
+                    to.setSize(size);
+
+                    answer = new CopyCmdAnswer(to);
                     StorPoolUtil.spLog("Created volume=%s with uuid=%s from snapshot=%s with uuid=%s", StorPoolUtil.getNameFromResponse(resp, false), volumeName, snapshotName, sinfo.getUuid());
                 } else if (resp.getError().getName().equals("objectDoesNotExist")) {
                     //check if snapshot is on secondary storage

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

@@ -1137,7 +1137,7 @@ protected void validatePolicyZones(List<Long> zoneIds, List<Long> poolIds, Volum
         if (!hasZones && !hasPools) {
             return;
         }
-        if (Boolean.FALSE.equals(SnapshotInfo.BackupSnapshotAfterTakingSnapshot.value()) && hasZones) {
+        if (Boolean.FALSE.equals(SnapshotInfo.BackupSnapshotAfterTakingSnapshot.value()) && hasZones && !hasPools) {
             throw new InvalidParameterValueException("Backing up of snapshot has been disabled. Snapshot can not be taken for multiple zones");
         }
         final DataCenterVO zone = dataCenterDao.findById(volume.getDataCenterId());
@@ -1258,7 +1258,9 @@ public SnapshotPolicyVO createPolicy(CreateSnapshotPolicyCmd cmd, Account policy
         }
 
         final List<Long> zoneIds = cmd.getZoneIds();
-        final List<Long> poolIds = cmd.getStoragePoolIds();
+        VolumeInfo volumeInfo = volFactory.getVolume(volumeId);
+        final List<Long> poolIds = snapshotHelper.addStoragePoolsForCopyToPrimary(volumeInfo, zoneIds, cmd.getStoragePoolIds(), cmd.useStorageReplication());
+
         validatePolicyZones(zoneIds, poolIds, volume, caller);
 
         Map<String, String> tags = cmd.getTags();
@@ -1777,7 +1779,7 @@ public BackupSnapshotTask(SnapshotInfo snap, int maxRetries, SnapshotStrategy st
         protected void runInContext() {
             try {
                 logger.debug("Value of attempts is " + (snapshotBackupRetries - attempts));
-                if (Boolean.TRUE.equals(SnapshotInfo.BackupSnapshotAfterTakingSnapshot.value()) && CollectionUtils.isEmpty(zoneIds)) {
+                if (Boolean.TRUE.equals(SnapshotInfo.BackupSnapshotAfterTakingSnapshot.value()) && CollectionUtils.isEmpty(poolIds)) {
                     SnapshotInfo backupedSnapshot = snapshotStrategy.backupSnapshot(snapshot);
 
                     if (backupedSnapshot != null) {
@@ -2228,7 +2230,7 @@ protected DataCenterVO getCheckedDestinationZoneForSnapshotCopy(long zoneId, boo
     protected StoragePoolVO getCheckedDestinationStorageForSnapshotCopy(long poolId, boolean isRootAdmin) {
         StoragePoolVO destPool = _storagePoolDao.findById(poolId);
         if (destPool == null) {
-            throw new InvalidParameterValueException("Please specify a valid destination zone.");
+            throw new InvalidParameterValueException("Please specify a valid destination pool.");
         }
         if (!StoragePoolStatus.Up.equals(destPool.getStatus()) && !isRootAdmin) {
             throw new PermissionDeniedException("Cannot perform this operation, the storage pool is not in Up state or the user is not the Root Admin " + destPool.getName());

ui/src/views/storage/FormSchedule.vue

@@ -363,7 +363,7 @@ export default {
       const params = {}
       params.showicon = true
       this.storagePoolsLoading = true
-      api('listStoragePools', params).then(json => {
+      getAPI('listStoragePools', params).then(json => {
         const listStoragePools = json.liststoragepoolsresponse.storagepool
         if (listStoragePools) {
           this.storagePools = listStoragePools

ui/src/views/storage/SnapshotZones.vue

@@ -537,7 +537,7 @@ export default {
       const params = {}
       params.showicon = true
       this.storagePoolsLoading = true
-      api('listStoragePools', params).then(json => {
+      getAPI('listStoragePools', params).then(json => {
         const listStoragePools = json.liststoragepoolsresponse.storagepool
         if (listStoragePools) {
           this.storagePools = listStoragePools

ui/src/views/storage/TakeSnapshot.vue

@@ -249,7 +249,7 @@ export default {
       const params = {}
       params.showicon = true
       this.storagePoolsLoading = true
-      api('listStoragePools', params).then(json => {
+      getAPI('listStoragePools', params).then(json => {
         const listStoragePools = json.liststoragepoolsresponse.storagepool
         if (listStoragePools) {
           this.storagePools = listStoragePools