fix build failures

Author: Pearl1594

plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxGuestNetworkGuru.java

@@ -39,7 +39,6 @@
 import com.cloud.network.guru.GuestNetworkGuru;
 import com.cloud.network.vpc.VpcVO;
 import com.cloud.offering.NetworkOffering;
-import com.cloud.offerings.dao.NetworkOfferingDao;
 import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
 import com.cloud.user.Account;
 import com.cloud.user.dao.AccountDao;

plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxElementTest.java

@@ -74,8 +74,14 @@
 import java.lang.reflect.Method;
 import java.util.List;
 
-import static org.junit.Assert.*;
-import static org.mockito.ArgumentMatchers.*;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxGuestNetworkGuruTest.java

@@ -71,7 +71,9 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.mock;
@@ -134,6 +136,7 @@ public void setUp() throws IllegalAccessException, NoSuchFieldException {
         ReflectionTestUtils.setField((GuestNetworkGuru) guru, "_ipAddrMgr", ipAddressManager);
         ReflectionTestUtils.setField((GuestNetworkGuru) guru, "_networkModel", networkModel);
         ReflectionTestUtils.setField((GuestNetworkGuru) guru, "networkOfferingDao", networkOfferingDao);
+        ReflectionTestUtils.setField((GuestNetworkGuru) guru, "_physicalNetworkDao", physicalNetworkDao);
 
         guru.networkOfferingServiceMapDao = networkOfferingServiceMapDao;
         guru.nsxControllerUtils = nsxControllerUtils;
@@ -246,10 +249,10 @@ public void testAllocateForUserVM() throws InsufficientVirtualNetworkCapacityExc
         when(network.getTrafficType()).thenReturn(Networks.TrafficType.Guest);
         when(vmProfile.getVirtualMachine()).thenReturn(virtualMachine);
         when(virtualMachine.getType()).thenReturn(VirtualMachine.Type.User);
-        when(network.getId()).thenReturn(2L);
-        when(offering.getId()).thenReturn(11L);
+//        when(network.getId()).thenReturn(2L);
+//        when(offering.getId()).thenReturn(11L);
         when(networkModel.getNetworkIp4Dns(any(Network.class), nullable(DataCenter.class))).thenReturn(dns);
-        when(networkModel.getNextAvailableMacAddressInNetwork(anyLong())).thenReturn(macAddress);
+//        when(networkModel.getNextAvailableMacAddressInNetwork(anyLong())).thenReturn(macAddress);
         when(nicProfile.getMacAddress()).thenReturn(macAddress);
         when(networkOfferingDao.isIpv6Supported(anyLong())).thenReturn(false);
 
@@ -271,15 +274,15 @@ public void testAllocateForDomainRouter() throws InsufficientVirtualNetworkCapac
         when(vmProfile.getVirtualMachine()).thenReturn(virtualMachine);
         when(virtualMachine.getType()).thenReturn(VirtualMachine.Type.DomainRouter);
         when(network.getId()).thenReturn(2L);
-        when(offering.getId()).thenReturn(11L);
-        when(networkModel.getNetworkIp4Dns(any(Network.class), nullable(DataCenter.class))).thenReturn(dns);
-        when(networkModel.getNextAvailableMacAddressInNetwork(anyLong())).thenReturn(macAddress);
+//        when(offering.getId()).thenReturn(11L);
+//        when(networkModel.getNetworkIp4Dns(any(Network.class), nullable(DataCenter.class))).thenReturn(dns);
+//        when(networkModel.getNextAvailableMacAddressInNetwork(anyLong())).thenReturn(macAddress);
         when(nicProfile.getMacAddress()).thenReturn(macAddress);
         when(networkOfferingDao.isIpv6Supported(anyLong())).thenReturn(false);
         when(network.getDataCenterId()).thenReturn(1L);
         when(network.getAccountId()).thenReturn(5L);
         when(network.getVpcId()).thenReturn(51L);
-        when(account.getDomainId()).thenReturn(2L);
+//        when(account.getDomainId()).thenReturn(2L);
         when(dcDao.findById(anyLong())).thenReturn(Mockito.mock(DataCenterVO.class));
         when(accountDao.findById(anyLong())).thenReturn(Mockito.mock(AccountVO.class));
         when(vpcDao.findById(anyLong())).thenReturn(Mockito.mock(VpcVO.class));

plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxProviderServiceImplTest.java

@@ -47,7 +47,10 @@
 import java.util.List;
 import java.util.UUID;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.anyMap;

plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxPublicNetworkGuruTest.java

@@ -37,7 +37,6 @@
 import com.cloud.vm.NicProfile;
 import com.cloud.vm.VirtualMachineProfile;
 import org.apache.cloudstack.NsxAnswer;
-import org.apache.cloudstack.agent.api.CreateNsxSegmentCommand;
 import org.apache.cloudstack.agent.api.CreateOrUpdateNsxTier1NatRuleCommand;
 import org.apache.cloudstack.agent.api.NsxCommand;
 import org.apache.cloudstack.api.ApiConstants;
@@ -53,8 +52,13 @@
 
 import java.util.List;
 
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.times;
 
 @RunWith(MockitoJUnitRunner.class)
 public class NsxPublicNetworkGuruTest {
@@ -115,7 +119,7 @@ public void testDesign() {
         Network network = Mockito.mock(Network.class);
         Account account = Mockito.mock(Account.class);
 
-        when(network.getTrafficType()).thenReturn(Networks.TrafficType.Public);
+//        when(network.getTrafficType()).thenReturn(Networks.TrafficType.Public);
 
         Network designedNetwork = guru.design(offering, plan, network, "net1", 1L, account);
         Assert.assertEquals(Networks.TrafficType.Public, designedNetwork.getTrafficType());