CSTACKEX-200: incorporate one round of review comments

Author: rajiv-jain-netapp

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

@@ -352,11 +352,11 @@ private long resolveSnapshotPoolId(String poolIdStr, long snapshotId) {
         }
         SnapshotVO snapshotVO = snapshotDao.findById(snapshotId);
         if (snapshotVO == null) {
-            throw new CloudRuntimeException("Cannot resolve storage pool for snapshot [" + snapshotId + "]");
+            throw new CloudRuntimeException("Snapshot not found for snapshot [" + snapshotId + "]");
         }
         VolumeVO volumeVO = volumeDao.findByIdIncludingRemoved(snapshotVO.getVolumeId());
         if (volumeVO == null) {
-            throw new CloudRuntimeException("Cannot resolve storage pool for snapshot [" + snapshotId + "]");
+            throw new CloudRuntimeException("CloudStack Volume not found for snapshot [" + snapshotId + "]");
         }
         Long poolId = volumeVO.getPoolId() != null ? volumeVO.getPoolId() : volumeVO.getLastPoolId();
         if (poolId == null || poolId <= 0) {
@@ -685,7 +685,7 @@ public void takeSnapshot(SnapshotInfo snapshot, AsyncCompletionCallback<CreateCm
 
             VolumeVO volumeVO = volumeDao.findById(volumeInfo.getId());
             if (volumeVO == null) {
-                throw new CloudRuntimeException("VolumeVO not found for id: " + volumeInfo.getId());
+                throw new CloudRuntimeException("CloudStack Volume not found for id: " + volumeInfo.getId());
             }
 
             StoragePoolVO storagePool = storagePoolDao.findById(volumeVO.getPoolId());
@@ -718,11 +718,10 @@ public void takeSnapshot(SnapshotInfo snapshot, AsyncCompletionCallback<CreateCm
             String lunUuid = null;
             if (ProtocolType.ISCSI.name().equalsIgnoreCase(protocol)) {
                 VolumeDetailVO lunDetail = volumeDetailsDao.findDetail(volumeVO.getId(), OntapStorageConstants.LUN_DOT_UUID);
-                String lunUUID = lunDetail != null ? lunDetail.getValue() : null;
-                if (lunUUID == null) {
+                if (lunDetail.getValue() == null) {
                     throw new CloudRuntimeException("LUN UUID not found for iSCSI volume " + volumeVO.getId());
                 }
-                lunUuid = lunUUID;
+                lunUuid = lunDetail.getValue();
             }
 
             // Create FlexVolume snapshot via ONTAP REST API

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

@@ -143,7 +143,7 @@ public boolean connect(boolean validateAggregatesForVolumeCreation) {
             if (Objects.equals(storage.getProtocol(), ProtocolType.NFS3) && !svm.getNfsEnabled()) {
                 logger.error("NFS protocol is not enabled on SVM " + svmName);
                 throw new CloudRuntimeException("NFS protocol is not enabled on SVM " + svmName);
-            } else             if (Objects.equals(storage.getProtocol(), ProtocolType.ISCSI) && !svm.getIscsiEnabled()) {
+            } else if (Objects.equals(storage.getProtocol(), ProtocolType.ISCSI) && !svm.getIscsiEnabled()) {
                 logger.error("ISCSI protocol is not enabled on SVM " + svmName);
                 throw new CloudRuntimeException("ISCSI protocol is not enabled on SVM " + svmName);
             }

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/OntapStorageUtils.java

@@ -166,7 +166,7 @@ public static String getLunName(String volName, String lunName) {
     /**
      * Builds an ONTAP-safe name token from user-provided snapshot text.
      */
-    public static String getOntapCloneName(String cloudStackSnapshotName) {
+    public static String getOntapSnapshotName(String cloudStackSnapshotName) {
         if (cloudStackSnapshotName == null || cloudStackSnapshotName.trim().isEmpty()) {
             throw new InvalidParameterValueException("Snapshot name cannot be null or blank");
         }
@@ -190,7 +190,7 @@ public static String getOntapCloneName(String cloudStackSnapshotName) {
     public static String buildOntapSnapshotName(String cloudStackSnapshotName, String uniquenessSuffix) {
         String normalizedBase = (cloudStackSnapshotName == null || cloudStackSnapshotName.trim().isEmpty())
                 ? "snapshot"
-                : getOntapCloneName(cloudStackSnapshotName);
+                : getOntapSnapshotName(cloudStackSnapshotName);
         String suffix = (uniquenessSuffix == null || uniquenessSuffix.isEmpty())
                 ? ""
                 : "_" + uniquenessSuffix.replaceAll("[^a-zA-Z0-9_]", "_");

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/vmsnapshot/OntapVMSnapshotStrategy.java

@@ -677,7 +677,7 @@ void createVmSnapshotsViaSingleFlexVol(VMSnapshot vmSnapshot, UserVm userVm,
                         flexVolUuid, snapshotUuid, snapshotNameBase, volumePath, groupInfo.poolId, protocol));
             }
 
-            logger.info("takeVMSnapshot: [FlexVol] Snapshot [{}] (uuid={}) on FlexVol [{}] completed in {} ms. Covers volumes: {}",
+            logger.debug("takeVMSnapshot: [FlexVol] Snapshot [{}] (uuid={}) on FlexVol [{}] completed in {} ms. Covers volumes: {}",
                     snapshotNameBase, snapshotUuid, flexVolUuid,
                     TimeUnit.MILLISECONDS.convert(System.nanoTime() - startSnapshot, TimeUnit.NANOSECONDS),
                     groupInfo.volumeIds);