Addressed comments

apache · Aug 30, 2024 · 524f382 · 524f382
1 parent 6f209d8
commit 524f382
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CopySnapshotCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CopySnapshotCmd.java
@@ -91,7 +91,7 @@ public class CopySnapshotCmd extends BaseAsyncCmd implements UserCmd {
             entityType = StoragePoolResponse.class,
             required = false,
             description = "A comma-separated list of IDs of the storage pools in other zones in which the snapshot will be made available. " +
-                    "The snapshot will always be made available in the zone in which the volume is present.")
+                    "The snapshot will always be made available in the zone in which the volume is present. Currently supported for StorPool only")
     protected List<Long> storagePoolIds;
 
     /////////////////////////////////////////////////////

diff --git a/...c/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreCapabilities.java b/...c/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreCapabilities.java
@@ -44,7 +44,7 @@ public enum DataStoreCapabilities {
     /**
     * indicates that the driver supports copying snapshot between zones on pools of the same type
     */
-    CAN_COPY_SNAPSHOT_BETWEEN_ZONES,
+    CAN_COPY_SNAPSHOT_BETWEEN_ZONES_AND_SAME_POOL_TYPE,
     /**
      * indicates that the storage does not need to delete the snapshot when creating a volume/template from it
      * and the setting `snapshot.backup.to.secondary` is enabled

diff --git a/...n/java/org/apache/cloudstack/storage/datastore/driver/StorPoolPrimaryDataStoreDriver.java b/...n/java/org/apache/cloudstack/storage/datastore/driver/StorPoolPrimaryDataStoreDriver.java
@@ -185,7 +185,7 @@ private SnapshotDataStoreVO getSnapshotImageStoreRef(long snapshotId, long zoneI
     @Override
     public Map<String, String> getCapabilities() {
         Map<String, String> mapCapabilities = new HashMap<>();
-        mapCapabilities.put(DataStoreCapabilities.CAN_COPY_SNAPSHOT_BETWEEN_ZONES.toString(), Boolean.TRUE.toString());
+        mapCapabilities.put(DataStoreCapabilities.CAN_COPY_SNAPSHOT_BETWEEN_ZONES_AND_SAME_POOL_TYPE.toString(), Boolean.TRUE.toString());
         mapCapabilities.put(DataStoreCapabilities.KEEP_SNAPSHOT_ON_PRIMARY_AND_BACKUP.toString(), Boolean.TRUE.toString());
         return mapCapabilities;
     }

diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
@@ -3867,7 +3867,7 @@ private boolean canCopyOnPrimary(List<Long> poolIds, VolumeInfo volume, boolean
                 DataStore dataStore = dataStoreMgr.getDataStore(poolId, DataStoreRole.Primary);
                 StoragePoolVO sPool = _storagePoolDao.findById(poolId);
                 if (dataStore != null
-                        && !dataStore.getDriver().getCapabilities().containsKey(DataStoreCapabilities.CAN_COPY_SNAPSHOT_BETWEEN_ZONES.toString())
+                        && !dataStore.getDriver().getCapabilities().containsKey(DataStoreCapabilities.CAN_COPY_SNAPSHOT_BETWEEN_ZONES_AND_SAME_POOL_TYPE.toString())
                         && sPool.getPoolType() != volume.getStoragePoolType()
                 && volume.getPoolId() == poolId) {
                     throw new InvalidParameterValueException("The specified pool doesn't support copying snapshots between zones" + poolId);

diff --git a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
@@ -2137,7 +2137,7 @@ private boolean canCopyOnPrimary(List<Long> poolIds, Snapshot snapshot) {
                 continue;
             }
             if (!dataStore.getDriver().getCapabilities()
-                    .containsKey(DataStoreCapabilities.CAN_COPY_SNAPSHOT_BETWEEN_ZONES.toString())
+                    .containsKey(DataStoreCapabilities.CAN_COPY_SNAPSHOT_BETWEEN_ZONES_AND_SAME_POOL_TYPE.toString())
                     && dataStore.getPoolType() != volume.getPoolType()) {
                 poolsToBeRemoved.add(poolId);
                 logger.debug(String.format("The %s  does not support copy to %s between zones", dataStore.getPoolType(), volume.getPoolType()));