CSTACKEX-198: Lun path needs to be in a pattern

Author: rajiv-jain-netapp

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

@@ -694,8 +694,10 @@ public void takeSnapshot(SnapshotInfo snapshot, AsyncCompletionCallback<CreateCm
                 if (lunUuid == null) {
                     throw new CloudRuntimeException("LUN UUID not found for iSCSI volume " + volumeVO.getId());
                 }
+                String cloneLunPath = OntapStorageUtils.getLunName(
+                        poolDetails.get(OntapStorageConstants.VOLUME_NAME), cloneName);
                 Lun cloneRequest = new Lun();
-                cloneRequest.setName(cloneName);
+                cloneRequest.setName(cloneLunPath);
                 Svm svm = new Svm();
                 svm.setName(poolDetails.get(OntapStorageConstants.SVM_NAME));
                 cloneRequest.setSvm(svm);
@@ -727,8 +729,10 @@ public void takeSnapshot(SnapshotInfo snapshot, AsyncCompletionCallback<CreateCm
             }
 
             if (ProtocolType.ISCSI.name().equalsIgnoreCase(protocol)) {
+                String cloneLunPath = OntapStorageUtils.getLunName(
+                        poolDetails.get(OntapStorageConstants.VOLUME_NAME), cloneName);
                 cloneId = resolveLunUuidByName(storageStrategy, authHeader,
-                        poolDetails.get(OntapStorageConstants.SVM_NAME), cloneName);
+                        poolDetails.get(OntapStorageConstants.SVM_NAME), cloneLunPath);
             }
 
             snapshotObjectTo.setPath(OntapStorageConstants.ONTAP_CLONE_NAME + "=" + cloneName);

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

@@ -409,8 +409,10 @@ public VMSnapshot takeVMSnapshot(VMSnapshot vmSnapshot) {
                             if (sourceLunUuid == null || sourceLunUuid.isEmpty()) {
                                 throw new CloudRuntimeException("Source LUN UUID missing for volume " + volumeId);
                             }
+                            String cloneLunPath = OntapStorageUtils.getLunName(
+                                    groupInfo.poolDetails.get(OntapStorageConstants.VOLUME_NAME), cloneName);
                             org.apache.cloudstack.storage.feign.model.Lun cloneRequest = new org.apache.cloudstack.storage.feign.model.Lun();
-                            cloneRequest.setName(cloneName);
+                            cloneRequest.setName(cloneLunPath);
                             org.apache.cloudstack.storage.feign.model.Svm svm = new org.apache.cloudstack.storage.feign.model.Svm();
                             svm.setName(groupInfo.poolDetails.get(OntapStorageConstants.SVM_NAME));
                             cloneRequest.setSvm(svm);
@@ -426,7 +428,8 @@ public VMSnapshot takeVMSnapshot(VMSnapshot vmSnapshot) {
                             cloneRequest.setClone(clone);
                             cloneRequest.setIsOverride(Boolean.FALSE);
                             jobResponse = storageStrategy.getSanFeignClient().cloneLun(authHeader, cloneRequest);
-                            cloneUuid = resolveLunUuid(storageStrategy, authHeader, groupInfo.poolDetails.get(OntapStorageConstants.SVM_NAME), cloneName);
+                            cloneUuid = resolveLunUuid(storageStrategy, authHeader,
+                                    groupInfo.poolDetails.get(OntapStorageConstants.SVM_NAME), cloneLunPath);
                         } else {
                             throw new CloudRuntimeException("Unsupported protocol for VM snapshot clone: " + protocol);
                         }