[CSTACKEX-279] Resolved Review Comments

Author: Gupta, Surya

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java

@@ -721,6 +721,10 @@ public boolean canCopy(DataObject srcData, DataObject destData) {
         return false;
     }
 
+    /**
+     * Applies IOPS/QoS on resize. Capacity (LUN/file size) is not updated here.
+     * TODO: apply volume size change once size-resize support is merged.
+     */
     @Override
     public void resize(DataObject data, AsyncCompletionCallback<CreateCmdResult> callback) {
         String errMsg = null;

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/StorageStrategy.java

@@ -242,12 +242,13 @@ public boolean isAff() {
         Map<String, Object> query = new HashMap<>();
         query.put(OntapStorageConstants.FIELDS, OntapStorageConstants.CLUSTER_NODE_ASUP_FIELDS);
         OntapResponse<ClusterNode> response = clusterFeignClient.getClusterNodes(getAuthHeader(), query);
-        if (response == null || response.getRecords() == null || response.getRecords().isEmpty()) {
+        if (response == null || response.getRecords() == null
+                || response.getRecords().stream().allMatch(node -> node == null)) {
             throw new CloudRuntimeException(
                     "Unable to determine whether the ONTAP cluster is AFF or FAS");
         }
         for (ClusterNode node : response.getRecords()) {
-            if (node == null || Boolean.FALSE.equals(node.getAllFlashOptimized())) {
+            if (node != null && Boolean.FALSE.equals(node.getAllFlashOptimized())) {
                 return false;
             }
         }
@@ -1007,6 +1008,10 @@ public void deleteVolumeQosPolicy(String policyUuid) {
             return;
         }
         VolumeQosPolicy policy = getVolumeQosPolicyByUuid(policyUuid);
+        if (policy == null) {
+            logger.info("QoS policy [{}] not found on ONTAP; skipping delete", policyUuid);
+            return;
+        }
         if (policy.getObjectCount() != null && policy.getObjectCount() > 0) {
             logger.info("QoS policy [{}] still has object_count={}; skipping delete",
                     policyUuid, policy.getObjectCount());

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/UnifiedSANStrategy.java

@@ -313,7 +313,8 @@ public void resizeCloudStackVolume(CloudStackVolume cloudstackVolume, long sizeI
             lunSpace.setSize(sizeInBytes);
             Lun patch = new Lun();
             patch.setSpace(lunSpace);
-            sanFeignClient.updateLun(authHeader, lunUuid, patch);
+            JobResponse response = sanFeignClient.updateLun(authHeader, lunUuid, patch);
+            pollJobIfPresent(response, "resize Lun [" + lunUuid + "]");
             logger.debug("resizeCloudStackVolume: Lun {} resized to {} bytes", lunUuid, sizeInBytes);
         } catch (FeignException e) {
             throw new CloudRuntimeException("Failed to resize Lun: " + e.getMessage(), e);