CSTACKEX-18_2: junit fixes

Author: rajiv-jain-netapp

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

@@ -62,15 +62,15 @@
  */
 public abstract class StorageStrategy {
     // Replace @Inject Feign clients with FeignClientFactory
-    protected final FeignClientFactory feignClientFactory;
-    protected final AggregateFeignClient aggregateFeignClient;
-    protected final VolumeFeignClient volumeFeignClient;
-    protected final SvmFeignClient svmFeignClient;
-    protected final JobFeignClient jobFeignClient;
-    protected final NetworkFeignClient networkFeignClient;
-    protected final SANFeignClient sanFeignClient;
-    protected final NASFeignClient nasFeignClient;
-    protected final SnapshotFeignClient snapshotFeignClient;
+    protected FeignClientFactory feignClientFactory;
+    protected AggregateFeignClient aggregateFeignClient;
+    protected VolumeFeignClient volumeFeignClient;
+    protected SvmFeignClient svmFeignClient;
+    protected JobFeignClient jobFeignClient;
+    protected NetworkFeignClient networkFeignClient;
+    protected SANFeignClient sanFeignClient;
+    protected NASFeignClient nasFeignClient;
+    protected SnapshotFeignClient snapshotFeignClient;
 
     protected OntapStorage storage;
 

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

@@ -147,29 +147,16 @@ public TestableUnifiedNASStrategy(OntapStorage ontapStorage,
                                           NetworkFeignClient networkFeignClient,
                                           SANFeignClient sanFeignClient) {
             super(ontapStorage);
-            // Inject mocked Feign clients immediately after super() call
-            injectMockedClient("nasFeignClient", nasFeignClient);
-            injectMockedClient("volumeFeignClient", volumeFeignClient);
-            injectMockedClient("jobFeignClient", jobFeignClient);
-            // Inject parent class (StorageStrategy) mocked clients
-            injectParentMockedClient("aggregateFeignClient", aggregateFeignClient);
+            // All Feign clients are in StorageStrategy parent class
+            injectParentMockedClient("nasFeignClient", nasFeignClient);
             injectParentMockedClient("volumeFeignClient", volumeFeignClient);
-            injectParentMockedClient("svmFeignClient", svmFeignClient);
             injectParentMockedClient("jobFeignClient", jobFeignClient);
+            injectParentMockedClient("aggregateFeignClient", aggregateFeignClient);
+            injectParentMockedClient("svmFeignClient", svmFeignClient);
             injectParentMockedClient("networkFeignClient", networkFeignClient);
             injectParentMockedClient("sanFeignClient", sanFeignClient);
         }
 
-        private void injectMockedClient(String fieldName, Object mockedClient) {
-            try {
-                Field field = UnifiedNASStrategy.class.getDeclaredField(fieldName);
-                field.setAccessible(true);
-                field.set(this, mockedClient);
-            } catch (NoSuchFieldException | IllegalAccessException e) {
-                throw new RuntimeException("Failed to inject mocked client: " + fieldName, e);
-            }
-        }
-
         private void injectParentMockedClient(String fieldName, Object mockedClient) {
             try {
                 Field field = StorageStrategy.class.getDeclaredField(fieldName);

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

@@ -96,9 +96,9 @@ void setUp() {
 
         unifiedSANStrategy = new UnifiedSANStrategy(ontapStorage);
 
-        // Use reflection to inject the mock SANFeignClient
+        // Use reflection to inject the mock SANFeignClient (field is in parent StorageStrategy class)
         try {
-            java.lang.reflect.Field sanFeignClientField = UnifiedSANStrategy.class.getDeclaredField("sanFeignClient");
+            java.lang.reflect.Field sanFeignClientField = StorageStrategy.class.getDeclaredField("sanFeignClient");
             sanFeignClientField.setAccessible(true);
             sanFeignClientField.set(unifiedSANStrategy, sanFeignClient);