CSTACKEX-198: revert workflows should also have lun path in ONTAP pattern

Author: rajiv-jain-netapp

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

@@ -565,6 +565,9 @@ public JobResponse revertSnapshotForCloudStackVolume(String snapshotName, String
         logger.trace("revertSnapshotForCloudStackVolume [iSCSI]: Reverting LUN [{}] from clone [{}] on FlexVol [{}]",
                 volumePath, snapshotName, flexVolName);
 
+        if (snapshotName == null || snapshotName.isEmpty()) {
+            throw new CloudRuntimeException("Source clone LUN name is required for iSCSI snapshot revert");
+        }
         if (volumePath == null || volumePath.isEmpty()) {
             throw new CloudRuntimeException("Destination LUN name is required for iSCSI snapshot revert");
         }
@@ -574,10 +577,25 @@ public JobResponse revertSnapshotForCloudStackVolume(String snapshotName, String
         if (lunUuid == null || lunUuid.isEmpty()) {
             throw new CloudRuntimeException("Source clone LUN UUID is required for iSCSI snapshot revert");
         }
+        if (storage.getSvmName() == null || storage.getSvmName().isEmpty()) {
+            throw new CloudRuntimeException("SVM name is required for iSCSI snapshot revert");
+        }
+
+        String sourceLunPath = snapshotName.startsWith(OntapStorageConstants.VOLUME_PATH_PREFIX)
+                ? snapshotName : OntapStorageUtils.getLunName(flexVolName, snapshotName);
+        String destinationLunPath = volumePath.startsWith(OntapStorageConstants.VOLUME_PATH_PREFIX)
+                ? volumePath : OntapStorageUtils.getLunName(flexVolName, volumePath);
+
+        if (!sourceLunPath.startsWith(OntapStorageConstants.VOLUME_PATH_PREFIX)) {
+            throw new CloudRuntimeException("Invalid source LUN path for iSCSI snapshot revert: " + sourceLunPath);
+        }
+        if (!destinationLunPath.startsWith(OntapStorageConstants.VOLUME_PATH_PREFIX)) {
+            throw new CloudRuntimeException("Invalid destination LUN path for iSCSI snapshot revert: " + destinationLunPath);
+        }
 
         String authHeader = getAuthHeader();
         Lun revertCloneRequest = new Lun();
-        revertCloneRequest.setName(volumePath);
+        revertCloneRequest.setName(destinationLunPath);
         Svm svm = new Svm();
         svm.setName(storage.getSvmName());
         revertCloneRequest.setSvm(svm);
@@ -588,13 +606,14 @@ public JobResponse revertSnapshotForCloudStackVolume(String snapshotName, String
         revertCloneRequest.setLocation(location);
         Lun.Clone clone = new Lun.Clone();
         Lun.Source source = new Lun.Source();
+        source.setName(sourceLunPath);
         source.setUuid(lunUuid);
         clone.setSource(source);
         revertCloneRequest.setClone(clone);
         revertCloneRequest.setIsOverride(Boolean.TRUE);
 
-        logger.debug("revertSnapshotForCloudStackVolume [iSCSI]: lun clone sourceUuid={} destinationLun={} isOverride=true",
-                lunUuid, volumePath);
+        logger.debug("revertSnapshotForCloudStackVolume [iSCSI]: lun clone sourcePath={} sourceUuid={} destinationLun={} isOverride=true",
+                sourceLunPath, lunUuid, destinationLunPath);
         return sanFeignClient.cloneLun(authHeader, revertCloneRequest);
     }
 }

plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/service/UnifiedSANStrategyTest.java

@@ -1816,6 +1816,10 @@ void testRevertSnapshotForCloudStackVolume_UsesLunCloneWithOverride() {
         try (MockedStatic<OntapStorageUtils> utilityMock = mockStatic(OntapStorageUtils.class)) {
             utilityMock.when(() -> OntapStorageUtils.generateAuthHeader("admin", "password"))
                     .thenReturn(authHeader);
+            utilityMock.when(() -> OntapStorageUtils.getLunName("flexvol1", "clone-snap-1"))
+                    .thenReturn("/vol/flexvol1/clone-snap-1");
+            utilityMock.when(() -> OntapStorageUtils.getLunName("flexvol1", "dest-lun-1"))
+                    .thenReturn("/vol/flexvol1/dest-lun-1");
 
             JobResponse result = unifiedSANStrategy.revertSnapshotForCloudStackVolume(
                     "clone-snap-1", "flexvol-uuid-1", "clone-lun-uuid-1", "dest-lun-1", "clone-lun-uuid-1", "flexvol1");
@@ -1824,9 +1828,10 @@ void testRevertSnapshotForCloudStackVolume_UsesLunCloneWithOverride() {
             verify(sanFeignClient).cloneLun(eq(authHeader), argThat(lun ->
                     lun != null
                             && Boolean.TRUE.equals(lun.getIsOverride())
-                            && "dest-lun-1".equals(lun.getName())
+                            && "/vol/flexvol1/dest-lun-1".equals(lun.getName())
                             && lun.getClone() != null
                             && lun.getClone().getSource() != null
+                            && "/vol/flexvol1/clone-snap-1".equals(lun.getClone().getSource().getName())
                             && "clone-lun-uuid-1".equals(lun.getClone().getSource().getUuid())
                             && lun.getLocation() != null
                             && lun.getLocation().getVolume() != null