fix test

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java

@@ -19,25 +19,23 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.cloudstack.api.ApiArgValidator;
-import org.apache.cloudstack.api.ApiErrorCode;
-import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.response.DomainResponse;
-import org.apache.cloudstack.api.response.ManagementServerResponse;
-import org.apache.commons.lang3.StringUtils;
-
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseListCmd;
 import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.AccountResponse;
 import org.apache.cloudstack.api.response.ClusterResponse;
 import org.apache.cloudstack.api.response.ConfigurationResponse;
+import org.apache.cloudstack.api.response.DomainResponse;
 import org.apache.cloudstack.api.response.ImageStoreResponse;
 import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.ManagementServerResponse;
 import org.apache.cloudstack.api.response.StoragePoolResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
 import org.apache.cloudstack.config.Configuration;
+import org.apache.commons.lang3.StringUtils;
 
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.utils.Pair;
@@ -100,7 +98,6 @@ public class ListCfgsByCmd extends BaseListCmd {
             type = CommandType.UUID,
             entityType = ManagementServerResponse.class,
             description = "the ID of the Management Server to update the parameter value for corresponding management server",
-            validations = ApiArgValidator.PositiveNumber,
             since = "4.21.0")
     private Long managementServerId;
 

api/src/main/java/org/apache/cloudstack/api/command/admin/config/ResetCfgCmd.java

@@ -23,17 +23,16 @@
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.response.ImageStoreResponse;
-import org.apache.cloudstack.api.response.ManagementServerResponse;
-import org.apache.cloudstack.framework.config.ConfigKey;
-
 import org.apache.cloudstack.api.response.AccountResponse;
 import org.apache.cloudstack.api.response.ClusterResponse;
 import org.apache.cloudstack.api.response.ConfigurationResponse;
 import org.apache.cloudstack.api.response.DomainResponse;
+import org.apache.cloudstack.api.response.ImageStoreResponse;
+import org.apache.cloudstack.api.response.ManagementServerResponse;
 import org.apache.cloudstack.api.response.StoragePoolResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
 import org.apache.cloudstack.config.Configuration;
+import org.apache.cloudstack.framework.config.ConfigKey;
 
 import com.cloud.user.Account;
 import com.cloud.utils.Pair;
@@ -89,7 +88,6 @@ public class ResetCfgCmd extends BaseCmd {
             type = CommandType.UUID,
             entityType = ManagementServerResponse.class,
             description = "the ID of the Management Server to update the parameter value for corresponding management server",
-            validations = ApiArgValidator.PositiveNumber,
             since = "4.21.0")
     private Long managementServerId;
 

server/src/test/java/com/cloud/configuration/ConfigurationManagerImplTest.java

@@ -866,14 +866,9 @@ public void shouldValidateConfigRangeTestValueIsNotNullAndConfigHasRangeReturnTr
     @Test
     public void testResetConfigurations() {
         Long poolId = 1L;
-        ResetCfgCmd cmd = Mockito.mock(ResetCfgCmd.class);
-        Mockito.when(cmd.getCfgName()).thenReturn("pool.storage.capacity.disablethreshold");
-        Mockito.when(cmd.getStoragepoolId()).thenReturn(poolId);
-        Mockito.when(cmd.getZoneId()).thenReturn(null);
-        Mockito.when(cmd.getClusterId()).thenReturn(null);
-        Mockito.when(cmd.getAccountId()).thenReturn(null);
-        Mockito.when(cmd.getDomainId()).thenReturn(null);
-        Mockito.when(cmd.getImageStoreId()).thenReturn(null);
+        ResetCfgCmd cmd = new ResetCfgCmd();
+        ReflectionTestUtils.setField(cmd, "storagePoolId", poolId);
+        ReflectionTestUtils.setField(cmd, "cfgName", "pool.storage.capacity.disablethreshold");
 
         ConfigurationVO cfg = new ConfigurationVO("Advanced", "DEFAULT", "test", "pool.storage.capacity.disablethreshold", null, "description");
         cfg.setScope(10);

server/src/test/java/com/cloud/server/ManagementServerImplTest.java

@@ -716,14 +716,9 @@ public void testSearchForConfigurationsMultipleIds() {
     @Test
     public void testSearchForConfigurations() {
         Long poolId = 1L;
-        ListCfgsByCmd cmd = Mockito.mock(ListCfgsByCmd.class);
-        Mockito.when(cmd.getConfigName()).thenReturn("pool.storage.capacity.disablethreshold");
-        Mockito.when(cmd.getStoragepoolId()).thenReturn(poolId);
-        Mockito.when(cmd.getZoneId()).thenReturn(null);
-        Mockito.when(cmd.getClusterId()).thenReturn(null);
-        Mockito.when(cmd.getAccountId()).thenReturn(null);
-        Mockito.when(cmd.getDomainId()).thenReturn(null);
-        Mockito.when(cmd.getImageStoreId()).thenReturn(null);
+        ListCfgsByCmd cmd = new ListCfgsByCmd();
+        ReflectionTestUtils.setField(cmd, "storagePoolId", poolId);
+        ReflectionTestUtils.setField(cmd, "configName", "pool.storage.capacity.disablethreshold");
 
         SearchCriteria<ConfigurationVO> sc = Mockito.mock(SearchCriteria.class);
         Mockito.when(configDao.createSearchCriteria()).thenReturn(sc);