From 880f8dd4d3708730eb11e499797b50d7bea80c28 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Wed, 27 Dec 2023 08:19:12 -0500 Subject: [PATCH] fix build failures due to unused imports --- .../ConfigurationManagerImplTest.java | 18 +++---- .../router/CommandSetupHelperTest.java | 1 - .../network/router/NetworkHelperImplTest.java | 47 ++----------------- 3 files changed, 15 insertions(+), 51 deletions(-) diff --git a/server/src/test/java/com/cloud/configuration/ConfigurationManagerImplTest.java b/server/src/test/java/com/cloud/configuration/ConfigurationManagerImplTest.java index 83b792dc303..4697daeafbf 100644 --- a/server/src/test/java/com/cloud/configuration/ConfigurationManagerImplTest.java +++ b/server/src/test/java/com/cloud/configuration/ConfigurationManagerImplTest.java @@ -17,9 +17,7 @@ package com.cloud.configuration; import com.cloud.capacity.dao.CapacityDao; -import com.cloud.dc.DataCenterIpAddressVO; import com.cloud.dc.DataCenterVO; -import com.cloud.dc.HostPodVO; import com.cloud.dc.VlanVO; import com.cloud.dc.dao.DataCenterDao; import com.cloud.dc.dao.DataCenterIpAddressDao; @@ -27,7 +25,6 @@ import com.cloud.dc.dao.DedicatedResourceDao; import com.cloud.dc.dao.HostPodDao; import com.cloud.dc.dao.VlanDao; import com.cloud.exception.InvalidParameterValueException; -import com.cloud.host.HostVO; import com.cloud.host.dao.HostDao; import com.cloud.network.Network; import com.cloud.network.NetworkModel; @@ -36,17 +33,14 @@ import com.cloud.network.Networks; import com.cloud.network.dao.IPAddressDao; import com.cloud.network.dao.NsxProviderDao; import com.cloud.network.dao.PhysicalNetworkDao; -import com.cloud.network.dao.PhysicalNetworkVO; import com.cloud.network.element.NsxProviderVO; import com.cloud.offering.NetworkOffering; import com.cloud.offerings.NetworkOfferingVO; import com.cloud.offerings.dao.NetworkOfferingDao; import com.cloud.storage.StorageManager; -import com.cloud.storage.VolumeVO; import com.cloud.storage.dao.VMTemplateZoneDao; import com.cloud.storage.dao.VolumeDao; import com.cloud.utils.net.NetUtils; -import com.cloud.vm.VMInstanceVO; import com.cloud.vm.dao.VMInstanceDao; import org.apache.cloudstack.annotation.dao.AnnotationDao; import org.apache.cloudstack.api.command.admin.network.CreateNetworkOfferingCmd; @@ -71,8 +65,16 @@ import java.util.List; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.*; - +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; @RunWith(MockitoJUnitRunner.class) public class ConfigurationManagerImplTest { diff --git a/server/src/test/java/com/cloud/network/router/CommandSetupHelperTest.java b/server/src/test/java/com/cloud/network/router/CommandSetupHelperTest.java index 8f68e7b6793..3dda7e1277e 100644 --- a/server/src/test/java/com/cloud/network/router/CommandSetupHelperTest.java +++ b/server/src/test/java/com/cloud/network/router/CommandSetupHelperTest.java @@ -32,7 +32,6 @@ import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkDetailsDao; import com.cloud.network.dao.NetworkVO; -import com.cloud.network.guru.PublicNetworkGuru; import com.cloud.network.vpc.VpcVO; import com.cloud.network.vpc.dao.VpcDao; import com.cloud.offering.NetworkOffering; diff --git a/server/src/test/java/com/cloud/network/router/NetworkHelperImplTest.java b/server/src/test/java/com/cloud/network/router/NetworkHelperImplTest.java index 71387510e6e..635ebd27075 100644 --- a/server/src/test/java/com/cloud/network/router/NetworkHelperImplTest.java +++ b/server/src/test/java/com/cloud/network/router/NetworkHelperImplTest.java @@ -48,16 +48,17 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; -import javax.inject.Inject; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; 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.*; +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; @@ -208,42 +209,4 @@ public class NetworkHelperImplTest { verify(answer1, times(0)).getResult(); assertFalse(result); } - - @Test - public void testConfigurePublicNicForNsxBroadcastDomainType() throws InsufficientAddressCapacityException { - nwHelper._networkDao = networkDao; - nwHelper._nicDao = nicDao; - networkOrchestrationService = mock(NetworkOrchestrationService.class); - RouterDeploymentDefinition deploymentDefinition = mock(RouterDeploymentDefinition.class); - PublicIp publicIp = mock(PublicIp.class); - NicProfile nicProfile = mock(NicProfile.class); - NetworkVO pubNetwork = mock(NetworkVO.class); - NicVO nicVO = mock(NicVO.class); - DeploymentPlan plan = mock(DeploymentPlan.class); - - - NetworkOfferingVO testOffering = new NetworkOfferingVO(); - final List offerings = new ArrayList(1); - offerings.add(testOffering); - - NetworkVO publicNetwork = new NetworkVO(); - - final List publicNetList = new ArrayList<>(1); - publicNetList.add(publicNetwork); - - when(deploymentDefinition.isPublicNetwork()).thenReturn(true); - when(deploymentDefinition.getSourceNatIP()).thenReturn(publicIp); - when(publicIp.getAddress()).thenReturn(Mockito.mock(Ip.class)); - when(networkDao.findById(anyLong())).thenReturn(Mockito.mock(NetworkVO.class)); - when(nicProfile.getIPv4Address()).thenReturn("10.10.10.10"); - when(pubNetwork.getId()).thenReturn(1L); - when(nicDao.findByIp4AddressAndNetworkId(anyString(), anyLong())).thenReturn(nicVO); - doReturn(offerings).when(networkModel).getSystemAccountNetworkOfferings(any()); - when(deploymentDefinition.getPlan()).thenReturn(plan); - doReturn(publicNetList).when(networkOrchestrationService).setupNetwork(nullable(Account.class), any(NetworkOffering.class), any(DeploymentPlan.class), nullable(String.class), nullable(String.class), anyBoolean()); - - LinkedHashMap> configuredNic = nwHelper.configurePublicNic(deploymentDefinition, false); - configuredNic.get(publicNetList.get(0)); - } - }