Version changes

harikrishna-patnala · harikrishna-patnala · commit 711ec3a05c85 · 2025-05-16T15:04:30.000+05:30
diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
@@ -498,6 +498,9 @@ public class ApiConstants {
     public static final String STORAGE_TAGS = "storagetags";
     public static final String STORAGE_ACCESS_GROUPS = "storageaccessgroups";
     public static final String STORAGE_ACCESS_GROUP = "storageaccessgroup";
+    public static final String CLUSTER_STORAGE_ACCESS_GROUPS = "clusterstorageaccessgroups";
+    public static final String POD_STORAGE_ACCESS_GROUPS = "podstorageaccessgroups";
+    public static final String ZONE_STORAGE_ACCESS_GROUPS = "zonestorageaccessgroups";
     public static final String SUCCESS = "success";
     public static final String SUITABLE_FOR_VM = "suitableforvirtualmachine";
     public static final String SUPPORTS_STORAGE_SNAPSHOT = "supportsstoragesnapshot";
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
@@ -74,7 +74,9 @@ public class ListClustersCmd extends BaseListCmd {
             since = "4.20.1")
     private String arch;
 
-    @Parameter(name = ApiConstants.STORAGE_ACCESS_GROUP, type = CommandType.STRING, description = "the name of the storage access group")
+    @Parameter(name = ApiConstants.STORAGE_ACCESS_GROUP, type = CommandType.STRING,
+            description = "the name of the storage access group",
+            since = "4.21.0")
     private String storageAccessGroup;
 
     /////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
@@ -113,7 +113,9 @@ public class ListHostsCmd extends BaseListCmd {
     @Parameter(name = ApiConstants.ARCH, type = CommandType.STRING, description = "CPU Arch of the host", since = "4.20.1")
     private String arch;
 
-    @Parameter(name = ApiConstants.STORAGE_ACCESS_GROUP, type = CommandType.STRING, description = "the name of the storage access group")
+    @Parameter(name = ApiConstants.STORAGE_ACCESS_GROUP, type = CommandType.STRING,
+            description = "the name of the storage access group",
+            since = "4.21.0")
     private String storageAccessGroup;
 
     /////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java
@@ -55,7 +55,9 @@ public class ListPodsByCmd extends BaseListCmd {
     @Parameter(name = ApiConstants.SHOW_CAPACITIES, type = CommandType.BOOLEAN, description = "flag to display the capacity of the pods")
     private Boolean showCapacities;
 
-    @Parameter(name = ApiConstants.STORAGE_ACCESS_GROUP, type = CommandType.STRING, description = "the name of the storage access group")
+    @Parameter(name = ApiConstants.STORAGE_ACCESS_GROUP, type = CommandType.STRING,
+            description = "the name of the storage access group",
+            since = "4.21.0")
     private String storageAccessGroup;
 
     /////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ConfigureStorageAccessCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ConfigureStorageAccessCmd.java
@@ -60,7 +60,8 @@ public class ConfigureStorageAccessCmd extends BaseAsyncCmd {
     private Long storageId;
 
     @Parameter(name = ApiConstants.STORAGE_ACCESS_GROUPS, type = CommandType.LIST, collectionType = CommandType.STRING,
-            description = "comma separated list of storage access groups for connecting the storage pools and the hosts")
+            description = "comma separated list of storage access groups for connecting the storage pools and the hosts",
+            since = "4.21.0")
     private List<String> storageAccessGroups;
 
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/zone/ListZonesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/zone/ListZonesCmd.java
@@ -69,7 +69,9 @@ public class ListZonesCmd extends BaseListCmd implements UserCmd {
     @Parameter(name = ApiConstants.SHOW_RESOURCE_ICON, type = CommandType.BOOLEAN, description = "flag to display the resource image for the zones")
     private Boolean showIcon;
 
-    @Parameter(name = ApiConstants.STORAGE_ACCESS_GROUP, type = CommandType.STRING, description = "the name of the storage access group")
+    @Parameter(name = ApiConstants.STORAGE_ACCESS_GROUP, type = CommandType.STRING,
+            description = "the name of the storage access group",
+            since = "4.21.0")
     private String storageAccessGroup;
 
     /////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/ClusterResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ClusterResponse.java
@@ -96,15 +96,15 @@ public class ClusterResponse extends BaseResponseWithAnnotations {
     private String arch;
 
     @SerializedName(ApiConstants.STORAGE_ACCESS_GROUPS)
-    @Param(description = "comma-separated list of storage access groups for the host", since = "4.20.1")
+    @Param(description = "comma-separated list of storage access groups for the host", since = "4.21.0")
     private String storageAccessGroups;
 
-    @SerializedName("podstorageaccessgroups")
-    @Param(description = "comma-separated list of storage access groups on the pod", since = "4.20.1")
+    @SerializedName(ApiConstants.POD_STORAGE_ACCESS_GROUPS)
+    @Param(description = "comma-separated list of storage access groups on the pod", since = "4.21.0")
     private String podStorageAccessGroups;
 
-    @SerializedName("zonestorageaccessgroups")
-    @Param(description = "comma-separated list of storage access groups on the zone", since = "4.20.1")
+    @SerializedName(ApiConstants.ZONE_STORAGE_ACCESS_GROUPS)
+    @Param(description = "comma-separated list of storage access groups on the zone", since = "4.21.0")
     private String zoneStorageAccessGroups;
 
     public String getId() {
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java
@@ -303,19 +303,19 @@ public class HostResponse extends BaseResponseWithAnnotations {
     private String arch;
 
     @SerializedName(ApiConstants.STORAGE_ACCESS_GROUPS)
-    @Param(description = "comma-separated list of storage access groups for the host", since = "4.20.1")
+    @Param(description = "comma-separated list of storage access groups for the host", since = "4.21.0")
     private String storageAccessGroups;
 
-    @SerializedName("clusterstorageaccessgroups")
-    @Param(description = "comma-separated list of storage access groups on the cluster", since = "4.20.1")
+    @SerializedName(ApiConstants.CLUSTER_STORAGE_ACCESS_GROUPS)
+    @Param(description = "comma-separated list of storage access groups on the cluster", since = "4.21.0")
     private String clusterStorageAccessGroups;
 
-    @SerializedName("podstorageaccessgroups")
-    @Param(description = "comma-separated list of storage access groups on the pod", since = "4.20.1")
+    @SerializedName(ApiConstants.POD_STORAGE_ACCESS_GROUPS)
+    @Param(description = "comma-separated list of storage access groups on the pod", since = "4.21.0")
     private String podStorageAccessGroups;
 
-    @SerializedName("zonestorageaccessgroups")
-    @Param(description = "comma-separated list of storage access groups on the zone", since = "4.20.1")
+    @SerializedName(ApiConstants.ZONE_STORAGE_ACCESS_GROUPS)
+    @Param(description = "comma-separated list of storage access groups on the zone", since = "4.21.0")
     private String zoneStorageAccessGroups;
 
     @Override
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/PodResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/PodResponse.java
@@ -89,7 +89,7 @@ public class PodResponse extends BaseResponseWithAnnotations {
     @Param(description = "comma-separated list of storage access groups for the pod", since = "4.21.0")
     private String storageAccessGroups;
 
-    @SerializedName("zonestorageaccessgroups")
+    @SerializedName(ApiConstants.ZONE_STORAGE_ACCESS_GROUPS)
     @Param(description = "comma-separated list of storage access groups on the zone", since = "4.21.0")
     private String zoneStorageAccessGroups;
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/StoragePoolResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/StoragePoolResponse.java
@@ -110,7 +110,7 @@ public class StoragePoolResponse extends BaseResponseWithAnnotations {
     private String tags;
 
     @SerializedName(ApiConstants.STORAGE_ACCESS_GROUPS)
-    @Param(description = "the storage access groups for the storage pool")
+    @Param(description = "the storage access groups for the storage pool", since = "4.21.0")
     private String storageAccessGroups;
 
     @SerializedName(ApiConstants.NFS_MOUNT_OPTIONS)
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/ZoneResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ZoneResponse.java
@@ -162,7 +162,7 @@ public class ZoneResponse extends BaseResponseWithAnnotations implements SetReso
     private boolean routedModeEnabled = false;
 
     @SerializedName(ApiConstants.STORAGE_ACCESS_GROUPS)
-    @Param(description = "comma-separated list of storage access groups for the zone", since = "4.20.1")
+    @Param(description = "comma-separated list of storage access groups for the zone", since = "4.21.0")
     private String storageAccessGroups;
 
 
diff --git a/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java b/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java
@@ -617,15 +617,15 @@ public static List<ServiceOfferingResponse> createServiceOfferingResponse(Servic
 
     public static List<ZoneResponse> createDataCenterResponse(ResponseView view, Boolean showCapacities, Boolean showResourceImage, DataCenterJoinVO... dcs) {
         List<ZoneResponse> respList = new ArrayList<ZoneResponse>();
-        for (DataCenterJoinVO vt : dcs){
+        for (DataCenterJoinVO vt : dcs) {
             respList.add(ApiDBUtils.newDataCenterResponse(view, vt, showCapacities, showResourceImage));
         }
         return respList;
     }
 
     public static List<ZoneResponse> createMinimalDataCenterResponse(ResponseView view, DataCenterJoinVO... dcs) {
         List<ZoneResponse> respList = new ArrayList<ZoneResponse>();
-        for (DataCenterJoinVO vt : dcs){
+        for (DataCenterJoinVO vt : dcs) {
             respList.add(ApiDBUtils.newMinimalDataCenterResponse(view, vt));
         }
         return respList;
diff --git a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
@@ -2255,15 +2255,15 @@ public void updateStoragePoolConnectionsOnHosts(Long poolId, List<String> storag
         }
 
         if (!hostsToConnect.isEmpty()) {
-            logger.debug(String.format("Hosts to connect to storage pool [%s]: %s", storagePool.getUuid(), hostsToConnect));
             for (HostVO host : hostsToConnect) {
+                logger.debug(String.format("Connecting host [%s] to storage pool [%s]: %s", host, storagePool.getUuid()));
                 connectHostToStoragePool(host, storagePool);
             }
         }
 
         if (!hostsToDisconnect.isEmpty()) {
-            logger.debug(String.format("Hosts to disconnect from storage pool [%s]: %s", storagePool.getUuid(), hostsToDisconnect));
             for (HostVO host : hostsToDisconnect) {
+                logger.debug(String.format("Disconnecting host [%s] from storage pool [%s]: %s", host, storagePool.getUuid()));
                 disconnectHostFromStoragePool(host, storagePool);
             }
         }
diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -6648,7 +6648,7 @@ public VirtualMachine vmStorageMigration(Long vmId, StoragePool destPool) {
         VMInstanceVO vm = preVmStorageMigrationCheck(vmId);
         Map<Long, Long> volumeToPoolIds = new HashMap<>();
         checkDestinationHypervisorType(destPool, vm);
-        checkIfDestinationPoolHasSameStoragePool(destPool, vm);
+        checkIfDestinationPoolHasSameStorageAccessGroups(destPool, vm);
         List<VolumeVO> volumes = _volsDao.findByInstance(vm.getId());
         StoragePoolVO destinationPoolVo = _storagePoolDao.findById(destPool.getId());
         Long destPoolPodId = ScopeType.CLUSTER.equals(destinationPoolVo.getScope()) || ScopeType.HOST.equals(destinationPoolVo.getScope()) ?
@@ -6703,12 +6703,12 @@ public VirtualMachine vmStorageMigration(Long vmId, Map<String, String> volumeTo
         return findMigratedVm(vm.getId(), vm.getType());
     }
 
-    private void checkIfDestinationPoolHasSameStoragePool(StoragePool destPool, VMInstanceVO vm) {
+    private void checkIfDestinationPoolHasSameStorageAccessGroups(StoragePool destPool, VMInstanceVO vm) {
         Long hostId = vm.getHostId();
         if (hostId != null) {
             Host host = _hostDao.findById(hostId);
             if (!storageManager.checkIfHostAndStoragePoolHasCommonStorageAccessGroups(host, destPool)) {
-                throw new InvalidParameterValueException(String.format("Destination pool %s does not have matching storage tags as host %s", destPool.getName(), host.getName()));
+                throw new InvalidParameterValueException(String.format("Destination pool %s does not have matching storage access groups as host %s", destPool.getName(), host.getName()));
             }
         }
     }
@@ -7296,7 +7296,7 @@ private Map<Long, Long> getVolumePoolMappingForMigrateVmWithStorage(VMInstanceVO
                 }
                 HostVO host = _hostDao.findById(vm.getHostId());
                 if (!storageManager.checkIfHostAndStoragePoolHasCommonStorageAccessGroups(host, pool)) {
-                    throw new InvalidParameterValueException(String.format("Destination pool %s for the volume %s does not have matching storage tags as host %s", pool.getName(), volume.getName(), host.getName()));
+                    throw new InvalidParameterValueException(String.format("Destination pool %s for the volume %s does not have matching storage access groups as host %s", pool.getName(), volume.getName(), host.getName()));
                 }
 
                 HypervisorType hypervisorType = _volsDao.getHypervisorType(volume.getId());
