CSTACKEX-112 Fix Test case issues

Author: Gupta, Surya

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

@@ -178,7 +178,7 @@ void disableLogicalAccess(Map<String, String> values) {
     void setUp() {
         // Create OntapStorage using constructor (immutable object)
         OntapStorage ontapStorage = new OntapStorage("admin", "password", "192.168.1.100",
-                "svm1", null, ProtocolType.NFS3, false);
+                "svm1", null, ProtocolType.NFS3);
 
         // Note: In real implementation, StorageStrategy constructor creates Feign clients
         // For testing, we'll need to mock the FeignClientFactory behavior
@@ -277,7 +277,7 @@ public void testConnect_iscsiNotEnabled() {
         // Note: Protocol validation is currently broken in StorageStrategy (enum vs string comparison)
         // so this test verifies connection succeeds even when iSCSI is disabled
         OntapStorage iscsiStorage = new OntapStorage("admin", "password", "192.168.1.100",
-                "svm1", null, ProtocolType.ISCSI, false);
+                "svm1", null, ProtocolType.ISCSI);
         storageStrategy = new TestableStorageStrategy(iscsiStorage,
                 aggregateFeignClient, volumeFeignClient, svmFeignClient,
                 jobFeignClient, networkFeignClient, sanFeignClient);
@@ -594,7 +594,7 @@ public void testDeleteStorageVolume_feignException() {
     public void testGetStoragePath_iscsi() {
         // Setup - recreate with iSCSI protocol
         OntapStorage iscsiStorage = new OntapStorage("admin", "password", "192.168.1.100",
-                "svm1", null, ProtocolType.ISCSI, false);
+                "svm1", null, ProtocolType.ISCSI);
         storageStrategy = new TestableStorageStrategy(iscsiStorage,
                 aggregateFeignClient, volumeFeignClient, svmFeignClient,
                 jobFeignClient, networkFeignClient, sanFeignClient);
@@ -624,7 +624,7 @@ public void testGetStoragePath_iscsi() {
     public void testGetStoragePath_iscsi_noService() {
         // Setup - recreate with iSCSI protocol
         OntapStorage iscsiStorage = new OntapStorage("admin", "password", "192.168.1.100",
-                "svm1", null, ProtocolType.ISCSI, false);
+                "svm1", null, ProtocolType.ISCSI);
         storageStrategy = new TestableStorageStrategy(iscsiStorage,
                 aggregateFeignClient, volumeFeignClient, svmFeignClient,
                 jobFeignClient, networkFeignClient, sanFeignClient);
@@ -645,7 +645,7 @@ public void testGetStoragePath_iscsi_noService() {
     public void testGetStoragePath_iscsi_noTargetIqn() {
         // Setup - recreate with iSCSI protocol
         OntapStorage iscsiStorage = new OntapStorage("admin", "password", "192.168.1.100",
-                "svm1", null, ProtocolType.ISCSI, false);
+                "svm1", null, ProtocolType.ISCSI);
         storageStrategy = new TestableStorageStrategy(iscsiStorage,
                 aggregateFeignClient, volumeFeignClient, svmFeignClient,
                 jobFeignClient, networkFeignClient, sanFeignClient);
@@ -695,7 +695,7 @@ public void testGetNetworkInterface_nfs() {
     public void testGetNetworkInterface_iscsi() {
         // Setup - recreate with iSCSI protocol
         OntapStorage iscsiStorage = new OntapStorage("admin", "password", "192.168.1.100",
-                "svm1", null, ProtocolType.ISCSI, false);
+                "svm1", null, ProtocolType.ISCSI);
         storageStrategy = new TestableStorageStrategy(iscsiStorage,
                 aggregateFeignClient, volumeFeignClient, svmFeignClient,
                 jobFeignClient, networkFeignClient, sanFeignClient);

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

@@ -122,8 +122,7 @@ public void setUp() throws Exception {
             "192.168.1.100",
             "svm1",
             100L,
-            ProtocolType.NFS3,
-            false
+            ProtocolType.NFS3
         );
         strategy = new TestableUnifiedNASStrategy(ontapStorage, nasFeignClient, volumeFeignClient, jobFeignClient, aggregateFeignClient, svmFeignClient, networkFeignClient, sanFeignClient);
         injectField("volumeDao", volumeDao);