fix build failure

Author: Pearl1594

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

@@ -65,16 +65,7 @@
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.nullable;
-import static org.mockito.Mockito.anyBoolean;
-import static org.mockito.Mockito.anyMap;
-import static org.mockito.Mockito.anyString;
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyList;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.*;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ConfigurationManagerImplTest {
@@ -364,7 +355,7 @@ public void testDeleteZoneInvokesDeleteNsxProviderWhenNSXIsEnabled() {
 
         when(nsxProviderDao.findByZoneId(anyLong())).thenReturn(nsxProviderVO);
         when(zoneDao.findById(anyLong())).thenReturn(dataCenterVO);
-        when(hostDao.findByDataCenterId(anyLong())).thenReturn(Collections.emptyList());
+        lenient().when(hostDao.findByDataCenterId(anyLong())).thenReturn(Collections.emptyList());
         when(podDao.listByDataCenterId(anyLong())).thenReturn(Collections.emptyList());
         when(ipAddressDao.countIPs(anyLong(), anyBoolean())).thenReturn(0);
         when(publicIpAddressDao.countIPs(anyLong(), anyBoolean())).thenReturn(0);
@@ -377,7 +368,7 @@ public void testDeleteZoneInvokesDeleteNsxProviderWhenNSXIsEnabled() {
         when(zoneDao.remove(anyLong())).thenReturn(true);
         when(capacityDao.removeBy(nullable(Short.class), anyLong(), nullable(Long.class), nullable(Long.class), nullable(Long.class))).thenReturn(true);
         when(dedicatedResourceDao.findByZoneId(anyLong())).thenReturn(null);
-        when(annotationDao.removeByEntityType(anyString(), anyString())).thenReturn(true);
+        lenient().when(annotationDao.removeByEntityType(anyString(), anyString())).thenReturn(true);
 
         configurationManagerImplSpy.deleteZone(deleteZoneCmd);
 
@@ -393,13 +384,13 @@ public void testCreateNetworkOfferingForNsx() {
         when(createNetworkOfferingCmd.getTraffictype()).thenReturn(Networks.TrafficType.Guest.name());
         when(createNetworkOfferingCmd.getGuestIpType()).thenReturn(Network.GuestType.Isolated.name());
         when(createNetworkOfferingCmd.getAvailability()).thenReturn(NetworkOffering.Availability.Optional.name());
-        when(configurationManagerImplSpy.createNetworkOffering(anyString(), anyString(), any(Networks.TrafficType.class), anyString(),
+        lenient().when(configurationManagerImplSpy.createNetworkOffering(anyString(), anyString(), any(Networks.TrafficType.class), anyString(),
                 anyBoolean(), any(NetworkOffering.Availability.class), anyInt(), anyMap(), anyBoolean(), any(Network.GuestType.class),
                 anyBoolean(), anyLong(), anyBoolean(), anyMap(), anyBoolean(), anyBoolean(), anyMap(), anyBoolean(), anyInt(),
                 anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyString(), anyList(), anyList(), anyBoolean(), any(NetUtils.InternetProtocol.class)))
                 .thenReturn(offeringVO);
         when(configDao.getValue(anyString())).thenReturn("1000");
-        when(networkOfferingDao.persist(any(NetworkOfferingVO.class), anyMap())).thenReturn(offeringVO);
+        lenient().when(networkOfferingDao.persist(any(NetworkOfferingVO.class), anyMap())).thenReturn(offeringVO);
         doNothing().when(networkService).validateIfServiceOfferingIsActiveAndSystemVmTypeIsDomainRouter(anyLong());
         doNothing().when(networkModel).canProviderSupportServices(anyMap());
 

server/src/test/java/com/cloud/network/router/NetworkHelperImplTest.java

@@ -20,45 +20,23 @@
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.Command;
 import com.cloud.agent.manager.Commands;
-import com.cloud.deploy.DeploymentPlan;
 import com.cloud.exception.AgentUnavailableException;
-import com.cloud.exception.InsufficientAddressCapacityException;
 import com.cloud.exception.OperationTimedoutException;
 import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.Network;
 import com.cloud.network.NetworkModel;
-import com.cloud.network.addr.PublicIp;
 import com.cloud.network.dao.NetworkDao;
-import com.cloud.network.dao.NetworkVO;
-import com.cloud.offering.NetworkOffering;
-import com.cloud.offerings.NetworkOfferingVO;
-import com.cloud.user.Account;
-import com.cloud.utils.net.Ip;
-import com.cloud.vm.NicProfile;
-import com.cloud.vm.NicVO;
 import com.cloud.vm.dao.NicDao;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
-import org.apache.cloudstack.network.router.deployment.RouterDeploymentDefinition;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Matchers;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;