Add check for volume state in REST clone create path

This adds an extra check for volume state during for clone create operations in REST.

Author: ntap-rippy

storage_drivers/ontap/ontap_common.go

@@ -2692,18 +2692,10 @@ func cloneFlexvol(
 		return err
 	}
 
-	// NVMe clone is not ready by the time we return from VolumeCloneCreate.
-	// This check here makes sure that we don't fail the clone operation during the time clone is not ready
-	// Currently this change is done only for NVMe volumes but it should work with other volumes too if needed
-	if config.SANType == sa.NVMe {
-
-		desiredNVMeVolStates := []string{"online"}
-		abortNVMeVolStates := []string{"error"}
-		volState, err := client.VolumeWaitForStates(ctx, name, desiredNVMeVolStates, abortNVMeVolStates,
-			maxFlexvolCloneWait)
-		if err != nil {
-			return fmt.Errorf("unable to create flexClone for NVMe volume %v, volState:%v", name, volState)
-		}
+	desiredStates, abortStates := []string{"online"}, []string{"error"}
+	volState, err := client.VolumeWaitForStates(ctx, name, desiredStates, abortStates, maxFlexvolCloneWait)
+	if err != nil {
+		return fmt.Errorf("unable to create flexClone for volume %v, volState:%v", name, volState)
 	}
 
 	if err = client.VolumeSetComment(ctx, name, name, labels); err != nil {

storage_drivers/ontap/ontap_nas_test.go

@@ -675,6 +675,8 @@ func TestOntapNasStorageDriverVolumeClone(t *testing.T) {
 			mockAPI.EXPECT().VolumeExists(ctx, "").Return(false, nil)
 			mockAPI.EXPECT().VolumeCloneCreate(ctx, volConfig.InternalName, volConfig.CloneSourceVolumeInternal,
 				volConfig.CloneSourceSnapshotInternal, false).Return(nil)
+			mockAPI.EXPECT().VolumeWaitForStates(ctx, volConfig.InternalName, gomock.Any(), gomock.Any(),
+				maxFlexvolCloneWait).Return("online", nil)
 			mockAPI.EXPECT().VolumeSetComment(ctx, volConfig.InternalName, volConfig.InternalName, "flexvol").
 				Return(nil)
 			mockAPI.EXPECT().VolumeMount(ctx, volConfig.InternalName, "/"+volConfig.InternalName).Return(nil)
@@ -946,6 +948,8 @@ func TestOntapNasStorageDriverVolumeClone_SMBShareCreateFail(t *testing.T) {
 	mockAPI.EXPECT().VolumeExists(ctx, "").Return(false, nil)
 	mockAPI.EXPECT().VolumeCloneCreate(ctx, volConfig.InternalName, volConfig.CloneSourceVolumeInternal,
 		volConfig.CloneSourceSnapshotInternal, false).Return(nil)
+	mockAPI.EXPECT().VolumeWaitForStates(ctx, volConfig.InternalName, gomock.Any(), gomock.Any(),
+		maxFlexvolCloneWait).Return("online", nil)
 	mockAPI.EXPECT().VolumeSetComment(ctx, volConfig.InternalName, volConfig.InternalName, "flexvol").Return(nil)
 	mockAPI.EXPECT().VolumeMount(ctx, volConfig.InternalName, "/"+volConfig.InternalName).Return(nil)
 	mockAPI.EXPECT().SMBShareExists(ctx, volConfig.InternalName).Return(false, nil)