[CSTACKEX-129] NFS3 Primary storage-pool is not failing even if NFS3 protocol is not enabled at the storage VM

Author: Gupta, Surya

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

@@ -239,11 +239,9 @@ public void testConnect_svmNotFound() {
 
         when(svmFeignClient.getSvmResponse(anyMap(), anyString())).thenReturn(svmResponse);
 
-        // Execute
-        boolean result = storageStrategy.connect();
-
-        // Verify
-        assertFalse(result, "connect() should return false when SVM is not found");
+        // Execute & Verify
+        CloudRuntimeException ex = assertThrows(CloudRuntimeException.class, () -> storageStrategy.connect());
+        assertTrue(ex.getMessage().contains("No SVM found"));
     }
 
     @Test
@@ -259,11 +257,9 @@ public void testConnect_svmNotRunning() {
 
         when(svmFeignClient.getSvmResponse(anyMap(), anyString())).thenReturn(svmResponse);
 
-        // Execute
-        boolean result = storageStrategy.connect();
-
-        // Verify
-        assertFalse(result, "connect() should return false when SVM is not running");
+        // Execute & Verify
+        CloudRuntimeException ex = assertThrows(CloudRuntimeException.class, () -> storageStrategy.connect());
+        assertTrue(ex.getMessage().contains("not in running state"));
     }
 
     @Test
@@ -285,8 +281,8 @@ public void testConnect_nfsNotEnabled() {
         when(svmFeignClient.getSvmResponse(anyMap(), anyString())).thenReturn(svmResponse);
 
         // Execute & Verify
-        boolean result = storageStrategy.connect();
-        assertFalse(result, "connect() should fail when NFS is disabled");
+        CloudRuntimeException ex = assertThrows(CloudRuntimeException.class, () -> storageStrategy.connect());
+        assertTrue(ex.getMessage().contains("NFS protocol is not enabled"));
     }
 
     @Test
@@ -314,8 +310,8 @@ public void testConnect_iscsiNotEnabled() {
         when(svmFeignClient.getSvmResponse(anyMap(), anyString())).thenReturn(svmResponse);
 
         // Execute & Verify
-        boolean result = storageStrategy.connect();
-        assertFalse(result, "connect() should fail when iSCSI is disabled");
+        CloudRuntimeException ex = assertThrows(CloudRuntimeException.class, () -> storageStrategy.connect());
+        assertTrue(ex.getMessage().contains("iSCSI protocol is not enabled"));
     }
 
     @Test
@@ -332,23 +328,19 @@ public void testConnect_noAggregates() {
 
         when(svmFeignClient.getSvmResponse(anyMap(), anyString())).thenReturn(svmResponse);
 
-        // Execute
-        boolean result = storageStrategy.connect();
-
-        // Verify
-        assertFalse(result, "connect() should return false when no aggregates are assigned");
+        // Execute & Verify
+        CloudRuntimeException ex = assertThrows(CloudRuntimeException.class, () -> storageStrategy.connect());
+        assertTrue(ex.getMessage().contains("No aggregates"));
     }
 
     @Test
     public void testConnect_nullSvmResponse() {
         // Setup
         when(svmFeignClient.getSvmResponse(anyMap(), anyString())).thenReturn(null);
 
-        // Execute
-        boolean result = storageStrategy.connect();
-
-        // Verify
-        assertFalse(result, "connect() should return false when SVM response is null");
+        // Execute & Verify
+        CloudRuntimeException ex = assertThrows(CloudRuntimeException.class, () -> storageStrategy.connect());
+        assertTrue(ex.getMessage().contains("No SVM found"));
     }
 
     // ========== createStorageVolume() Tests ==========