Revert method signature change done for unit test

Author: sudo87

engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java

@@ -204,7 +204,7 @@ public List<StoragePool> reorderPools(List<StoragePool> pools, VirtualMachinePro
             account = vmProfile.getOwner();
         }
 
-        pools = reorderStoragePoolsBasedOnAlgorithm(pools, plan, account, VolumeOrchestrationService.VolumeAllocationAlgorithm.value());
+        pools = reorderStoragePoolsBasedOnAlgorithm(pools, plan, account);
 
         if (vmProfile.getVirtualMachine() == null) {
             if (logger.isTraceEnabled()) {
@@ -221,7 +221,8 @@ public List<StoragePool> reorderPools(List<StoragePool> pools, VirtualMachinePro
         return pools;
     }
 
-    List<StoragePool> reorderStoragePoolsBasedOnAlgorithm(List<StoragePool> pools, DeploymentPlan plan, Account account, String volumeAllocationAlgorithm) {
+    List<StoragePool> reorderStoragePoolsBasedOnAlgorithm(List<StoragePool> pools, DeploymentPlan plan, Account account) {
+        String volumeAllocationAlgorithm = VolumeOrchestrationService.VolumeAllocationAlgorithm.value();
         logger.debug("Using volume allocation algorithm {} to reorder pools.", volumeAllocationAlgorithm);
         if (volumeAllocationAlgorithm.equals("random") || volumeAllocationAlgorithm.equals("userconcentratedpod_random") || (account == null)) {
             reorderRandomPools(pools);

engine/storage/src/test/java/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocatorTest.java

@@ -26,6 +26,8 @@
 import com.cloud.vm.DiskProfile;
 import com.cloud.vm.VirtualMachineProfile;
 
+import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService;
+import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 
 import org.junit.After;
@@ -37,6 +39,7 @@
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
 
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -74,26 +77,28 @@ public void tearDown() {
     }
 
     @Test
-    public void reorderStoragePoolsBasedOnAlgorithm_random() {
-        allocator.reorderStoragePoolsBasedOnAlgorithm(pools, plan, account, "random");
+    public void reorderStoragePoolsBasedOnAlgorithm_random() throws Exception {
+        overrideDefaultConfigValue( VolumeOrchestrationService.VolumeAllocationAlgorithm, "random");
+        allocator.reorderStoragePoolsBasedOnAlgorithm(pools, plan, account);
         Mockito.verify(allocator, Mockito.times(0)).reorderPoolsByCapacity(plan, pools);
         Mockito.verify(allocator, Mockito.times(0)).reorderPoolsByNumberOfVolumes(plan, pools, account);
         Mockito.verify(allocator, Mockito.times(1)).reorderRandomPools(pools);
     }
 
     @Test
-    public void reorderStoragePoolsBasedOnAlgorithm_userdispersing() {
+    public void reorderStoragePoolsBasedOnAlgorithm_userdispersing() throws Exception {
+        overrideDefaultConfigValue(VolumeOrchestrationService.VolumeAllocationAlgorithm, "userdispersing");
         Mockito.doReturn(pools).when(allocator).reorderPoolsByNumberOfVolumes(plan, pools, account);
-        allocator.reorderStoragePoolsBasedOnAlgorithm(pools, plan, account,"userdispersing");
+        allocator.reorderStoragePoolsBasedOnAlgorithm(pools, plan, account);
         Mockito.verify(allocator, Mockito.times(0)).reorderPoolsByCapacity(plan, pools);
         Mockito.verify(allocator, Mockito.times(1)).reorderPoolsByNumberOfVolumes(plan, pools, account);
         Mockito.verify(allocator, Mockito.times(0)).reorderRandomPools(pools);
     }
 
     @Test
-    public void reorderStoragePoolsBasedOnAlgorithm_userdispersing_reorder_check() {
+    public void reorderStoragePoolsBasedOnAlgorithm_userdispersing_reorder_check() throws Exception {
+        overrideDefaultConfigValue(VolumeOrchestrationService.VolumeAllocationAlgorithm, "userdispersing");
         allocator.volumeDao = volumeDao;
-
         when(plan.getDataCenterId()).thenReturn(1l);
         when(plan.getPodId()).thenReturn(1l);
         when(plan.getClusterId()).thenReturn(1l);
@@ -103,7 +108,7 @@ public void reorderStoragePoolsBasedOnAlgorithm_userdispersing_reorder_check() {
         poolIds.add(9l);
         when(volumeDao.listPoolIdsByVolumeCount(1l,1l,1l,1l)).thenReturn(poolIds);
 
-        List<StoragePool> reorderedPools = allocator.reorderStoragePoolsBasedOnAlgorithm(pools, plan, account, "userdispersing");
+        List<StoragePool> reorderedPools = allocator.reorderStoragePoolsBasedOnAlgorithm(pools, plan, account);
         Assert.assertEquals(poolIds.size(),reorderedPools.size());
 
         Mockito.verify(allocator, Mockito.times(0)).reorderPoolsByCapacity(plan, pools);
@@ -113,9 +118,10 @@ public void reorderStoragePoolsBasedOnAlgorithm_userdispersing_reorder_check() {
     }
 
     @Test
-    public void reorderStoragePoolsBasedOnAlgorithm_firstfitleastconsumed() {
+    public void reorderStoragePoolsBasedOnAlgorithm_firstfitleastconsumed() throws Exception {
+        overrideDefaultConfigValue(VolumeOrchestrationService.VolumeAllocationAlgorithm, "firstfitleastconsumed");
         Mockito.doReturn(pools).when(allocator).reorderPoolsByCapacity(plan, pools);
-        allocator.reorderStoragePoolsBasedOnAlgorithm(pools, plan, account, "firstfitleastconsumed");
+        allocator.reorderStoragePoolsBasedOnAlgorithm(pools, plan, account);
         Mockito.verify(allocator, Mockito.times(1)).reorderPoolsByCapacity(plan, pools);
         Mockito.verify(allocator, Mockito.times(0)).reorderPoolsByNumberOfVolumes(plan, pools, account);
         Mockito.verify(allocator, Mockito.times(0)).reorderRandomPools(pools);
@@ -130,6 +136,12 @@ public void reorderRandomPools() {
         }
         Assert.assertTrue(firstchoice.size() > 2);
     }
+
+    private void overrideDefaultConfigValue(final ConfigKey configKey, final String value) throws IllegalAccessException, NoSuchFieldException {
+        final Field f = ConfigKey.class.getDeclaredField("_defaultValue");
+        f.setAccessible(true);
+        f.set(configKey, value);
+    }
 }
 
 class MockStorapoolAllocater extends AbstractStoragePoolAllocator {