Skip to content

Commit 8389e45

Browse files
Pearl1594Pearl1594
committed
remove unused imports
1 parent 80d42d4 commit 8389e45

File tree

3 files changed

+191
-14
lines changed

3 files changed

+191
-14
lines changed

‎api/src/test/java/org/apache/cloudstack/api/command/admin/offering/CreateNetworkOfferingCmdTest.java‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,15 @@
1717

1818
package org.apache.cloudstack.api.command.admin.offering;
1919

20-
import com.cloud.configuration.ConfigurationService;
21-
import com.cloud.host.Host;
22-
import com.cloud.offering.NetworkOffering;
2320
import junit.framework.TestCase;
24-
import org.apache.cloudstack.api.ResponseGenerator;
2521
import org.apache.cloudstack.api.command.admin.network.CreateNetworkOfferingCmd;
26-
import org.apache.cloudstack.api.response.HostResponse;
27-
import org.apache.cloudstack.api.response.ListResponse;
28-
import org.apache.cloudstack.api.response.NetworkOfferingResponse;
2922
import org.junit.Assert;
30-
import org.junit.Before;
3123
import org.junit.Test;
3224
import org.mockito.InjectMocks;
33-
import org.mockito.Mock;
34-
import org.mockito.Mockito;
3525
import org.springframework.test.util.ReflectionTestUtils;
3626

37-
import java.util.Arrays;
38-
import java.util.List;
3927

40-
41-
public class CreateNetworkOfferingCmdTest extends TestCase {
28+
public class CreateNetworkOfferingCmdTest {
4229

4330
@InjectMocks
4431
private CreateNetworkOfferingCmd createNetworkOfferingCmd = new CreateNetworkOfferingCmd();

‎server/src/test/java/com/cloud/network/router/CommandSetupHelperTest.java‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,92 @@
1717
package com.cloud.network.router;
1818

1919
import com.cloud.agent.api.routing.VmDataCommand;
20+
import com.cloud.agent.manager.Commands;
21+
import com.cloud.configuration.ConfigurationManager;
22+
import com.cloud.dc.DataCenter;
23+
import com.cloud.dc.DataCenterVO;
24+
import com.cloud.dc.VlanVO;
25+
import com.cloud.dc.dao.DataCenterDao;
26+
import com.cloud.dc.dao.VlanDao;
27+
import com.cloud.network.NetworkModel;
28+
import com.cloud.network.PublicIpAddress;
29+
import com.cloud.network.addr.PublicIp;
30+
import com.cloud.network.dao.IPAddressDao;
31+
import com.cloud.network.dao.IPAddressVO;
32+
import com.cloud.network.dao.NetworkDao;
33+
import com.cloud.network.dao.NetworkDetailsDao;
34+
import com.cloud.network.dao.NetworkVO;
35+
import com.cloud.network.guru.PublicNetworkGuru;
36+
import com.cloud.network.vpc.VpcVO;
37+
import com.cloud.network.vpc.dao.VpcDao;
38+
import com.cloud.offering.NetworkOffering;
39+
import com.cloud.offerings.NetworkOfferingVO;
40+
import com.cloud.offerings.dao.NetworkOfferingDao;
41+
import com.cloud.offerings.dao.NetworkOfferingDetailsDao;
42+
import com.cloud.utils.net.Ip;
43+
import com.cloud.vm.NicVO;
44+
import com.cloud.vm.VirtualMachine;
45+
import com.cloud.vm.dao.NicDao;
2046
import org.junit.Assert;
47+
import org.junit.Before;
2148
import org.junit.Test;
2249
import org.junit.runner.RunWith;
50+
import org.mockito.ArgumentMatchers;
2351
import org.mockito.InjectMocks;
52+
import org.mockito.Mock;
53+
import org.mockito.Mockito;
2454
import org.mockito.junit.MockitoJUnitRunner;
55+
import org.springframework.test.util.ReflectionTestUtils;
2556

2657
import java.util.ArrayList;
58+
import java.util.HashMap;
2759
import java.util.List;
60+
import java.util.Map;
2861

2962
@RunWith(MockitoJUnitRunner.class)
3063
public class CommandSetupHelperTest {
3164

3265
@InjectMocks
3366
protected CommandSetupHelper commandSetupHelper = new CommandSetupHelper();
67+
@Mock
68+
NicDao nicDao;
69+
@Mock
70+
NetworkDao networkDao;
71+
@Mock
72+
IPAddressDao ipAddressDao;
73+
@Mock
74+
VlanDao vlanDao;
75+
@Mock
76+
NetworkModel networkModel;
77+
@Mock
78+
NetworkOfferingDao networkOfferingDao;
79+
@Mock
80+
ConfigurationManager configurationManager;
81+
@Mock
82+
NetworkOfferingDetailsDao networkOfferingDetailsDao;
83+
@Mock
84+
NetworkDetailsDao networkDetailsDao;
85+
@Mock
86+
VpcDao vpcDao;
87+
@Mock
88+
RouterControlHelper routerControlHelper;
89+
@Mock
90+
DataCenterDao dcDao;
91+
92+
@Before
93+
public void setUp() {
94+
ReflectionTestUtils.setField(commandSetupHelper, "_nicDao", nicDao);
95+
ReflectionTestUtils.setField(commandSetupHelper, "_networkDao", networkDao);
96+
ReflectionTestUtils.setField(commandSetupHelper, "_ipAddressDao", ipAddressDao);
97+
ReflectionTestUtils.setField(commandSetupHelper, "_vlanDao", vlanDao);
98+
ReflectionTestUtils.setField(commandSetupHelper, "_networkModel", networkModel);
99+
ReflectionTestUtils.setField(commandSetupHelper, "_networkOfferingDao", networkOfferingDao);
100+
ReflectionTestUtils.setField(commandSetupHelper, "networkOfferingDetailsDao", networkOfferingDetailsDao);
101+
ReflectionTestUtils.setField(commandSetupHelper, "networkDetailsDao", networkDetailsDao);
102+
ReflectionTestUtils.setField(commandSetupHelper, "_vpcDao", vpcDao);
103+
ReflectionTestUtils.setField(commandSetupHelper, "_routerControlHelper", routerControlHelper);
104+
ReflectionTestUtils.setField(commandSetupHelper, "_dcDao", dcDao);
105+
}
34106

35107
@Test
36108
public void testUserDataDetails() {
@@ -79,4 +151,45 @@ public void testUserDataDetailsWithWhiteSpaces() {
79151
Assert.assertEquals("value1", metadataFile1[2]);
80152
Assert.assertEquals("value2", metadataFile2[2]);
81153
}
154+
155+
@Test
156+
public void testCreateVpcAssociatePublicIP() {
157+
VirtualRouter router = Mockito.mock(VirtualRouter.class);
158+
Ip ip = new Ip("10.10.10.10");
159+
IPAddressVO ipAddressVO = new IPAddressVO(ip, 1L, 0x0ac00000L, 2L, true);
160+
VlanVO vlanVO = new VlanVO();
161+
vlanVO.setNetworkId(15L);
162+
PublicIpAddress publicIpAddress = new PublicIp(ipAddressVO, vlanVO, 0x0ac00000L);
163+
List<PublicIpAddress> pubIpList = new ArrayList<>(1);
164+
pubIpList.add(publicIpAddress);
165+
Commands commands = Mockito.mock(Commands.class);
166+
Map<String, String> vlanMacAddress = new HashMap<>();
167+
NicVO nicVO = new NicVO("nic", 1L, 2L, VirtualMachine.Type.User);
168+
NetworkVO networkVO = new NetworkVO();
169+
networkVO.setNetworkOfferingId(12L);
170+
List<IPAddressVO> userIps = List.of(ipAddressVO);
171+
NetworkOfferingVO networkOfferingVO = new NetworkOfferingVO();
172+
Map<NetworkOffering.Detail, String> details = new HashMap<>();
173+
VpcVO vpc = new VpcVO();
174+
DataCenterVO dc = new DataCenterVO(1L, null, null, null, null, null, null, null, null, null, DataCenter.NetworkType.Advanced, null, null);
175+
176+
Mockito.when(router.getId()).thenReturn(14L);
177+
Mockito.when(router.getDataCenterId()).thenReturn(4L);
178+
Mockito.when(nicDao.listByVmId(ArgumentMatchers.anyLong())).thenReturn(List.of(nicVO));
179+
Mockito.when(networkDao.findById(ArgumentMatchers.anyLong())).thenReturn(networkVO);
180+
Mockito.when(ipAddressDao.listByAssociatedVpc(ArgumentMatchers.anyLong(), ArgumentMatchers.nullable(Boolean.class))).thenReturn(userIps);
181+
Mockito.when(vlanDao.findById(ArgumentMatchers.anyLong())).thenReturn(vlanVO);
182+
Mockito.when(networkModel.getNetworkRate(ArgumentMatchers.anyLong(), ArgumentMatchers.anyLong())).thenReturn(1200);
183+
Mockito.when(networkModel.getNetwork(ArgumentMatchers.anyLong())).thenReturn(networkVO);
184+
Mockito.when(networkOfferingDao.findById(ArgumentMatchers.anyLong())).thenReturn(networkOfferingVO);
185+
Mockito.when(configurationManager.getNetworkOfferingNetworkRate(ArgumentMatchers.anyLong(), ArgumentMatchers.anyLong())).thenReturn(1200);
186+
Mockito.when(networkModel.isSecurityGroupSupportedInNetwork(networkVO)).thenReturn(false);
187+
Mockito.when(networkOfferingDetailsDao.getNtwkOffDetails(ArgumentMatchers.anyLong())).thenReturn(details);
188+
Mockito.when(networkDetailsDao.findDetail(ArgumentMatchers.anyLong(), ArgumentMatchers.anyString())).thenReturn(null);
189+
Mockito.when(vpcDao.findById(ArgumentMatchers.anyLong())).thenReturn(vpc);
190+
Mockito.when(routerControlHelper.getRouterControlIp(ArgumentMatchers.anyLong())).thenReturn("10.1.11.101");
191+
Mockito.when(dcDao.findById(ArgumentMatchers.anyLong())).thenReturn(dc);
192+
193+
commandSetupHelper.createVpcAssociatePublicIPCommands(router, pubIpList, commands, vlanMacAddress);
194+
}
82195
}

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

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,44 @@
2020
import com.cloud.agent.api.Answer;
2121
import com.cloud.agent.api.Command;
2222
import com.cloud.agent.manager.Commands;
23+
import com.cloud.deploy.DeploymentPlan;
2324
import com.cloud.exception.AgentUnavailableException;
25+
import com.cloud.exception.InsufficientAddressCapacityException;
2426
import com.cloud.exception.OperationTimedoutException;
2527
import com.cloud.exception.ResourceUnavailableException;
28+
import com.cloud.network.Network;
29+
import com.cloud.network.NetworkModel;
30+
import com.cloud.network.addr.PublicIp;
31+
import com.cloud.network.dao.NetworkDao;
32+
import com.cloud.network.dao.NetworkVO;
33+
import com.cloud.offering.NetworkOffering;
34+
import com.cloud.offerings.NetworkOfferingVO;
35+
import com.cloud.user.Account;
36+
import com.cloud.utils.net.Ip;
37+
import com.cloud.vm.NicProfile;
38+
import com.cloud.vm.NicVO;
39+
import com.cloud.vm.dao.NicDao;
40+
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
41+
import org.apache.cloudstack.network.router.deployment.RouterDeploymentDefinition;
42+
import org.junit.Before;
2643
import org.junit.Test;
2744
import org.junit.runner.RunWith;
2845
import org.mockito.InjectMocks;
2946
import org.mockito.Matchers;
3047
import org.mockito.Mock;
48+
import org.mockito.Mockito;
3149
import org.mockito.runners.MockitoJUnitRunner;
3250

51+
import javax.inject.Inject;
52+
import java.util.ArrayList;
53+
import java.util.Arrays;
54+
import java.util.Collections;
55+
import java.util.LinkedHashMap;
56+
import java.util.List;
57+
3358
import static org.junit.Assert.assertFalse;
3459
import static org.junit.Assert.assertTrue;
60+
import static org.mockito.ArgumentMatchers.*;
3561
import static org.mockito.Mockito.doReturn;
3662
import static org.mockito.Mockito.lenient;
3763
import static org.mockito.Mockito.mock;
@@ -51,6 +77,20 @@ public class NetworkHelperImplTest {
5177

5278
@InjectMocks
5379
protected NetworkHelperImpl nwHelper = new NetworkHelperImpl();
80+
@Mock
81+
NetworkOrchestrationService networkOrchestrationService;
82+
@Mock
83+
NetworkDao networkDao;
84+
@Mock
85+
NetworkModel networkModel;
86+
@Mock
87+
NicDao nicDao;
88+
89+
@Before
90+
public void setUp() {
91+
nwHelper._networkDao = networkDao;
92+
nwHelper._networkModel = networkModel;
93+
}
5494

5595
@Test(expected=ResourceUnavailableException.class)
5696
public void testSendCommandsToRouterWrongRouterVersion()
@@ -169,4 +209,41 @@ public void testSendCommandsToRouterWithNoAnswers()
169209
assertFalse(result);
170210
}
171211

212+
@Test
213+
public void testConfigurePublicNicForNsxBroadcastDomainType() throws InsufficientAddressCapacityException {
214+
nwHelper._networkDao = networkDao;
215+
nwHelper._nicDao = nicDao;
216+
networkOrchestrationService = mock(NetworkOrchestrationService.class);
217+
RouterDeploymentDefinition deploymentDefinition = mock(RouterDeploymentDefinition.class);
218+
PublicIp publicIp = mock(PublicIp.class);
219+
NicProfile nicProfile = mock(NicProfile.class);
220+
NetworkVO pubNetwork = mock(NetworkVO.class);
221+
NicVO nicVO = mock(NicVO.class);
222+
DeploymentPlan plan = mock(DeploymentPlan.class);
223+
224+
225+
NetworkOfferingVO testOffering = new NetworkOfferingVO();
226+
final List<NetworkOfferingVO> offerings = new ArrayList<NetworkOfferingVO>(1);
227+
offerings.add(testOffering);
228+
229+
NetworkVO publicNetwork = new NetworkVO();
230+
231+
final List<NetworkVO> publicNetList = new ArrayList<>(1);
232+
publicNetList.add(publicNetwork);
233+
234+
when(deploymentDefinition.isPublicNetwork()).thenReturn(true);
235+
when(deploymentDefinition.getSourceNatIP()).thenReturn(publicIp);
236+
when(publicIp.getAddress()).thenReturn(Mockito.mock(Ip.class));
237+
when(networkDao.findById(anyLong())).thenReturn(Mockito.mock(NetworkVO.class));
238+
when(nicProfile.getIPv4Address()).thenReturn("10.10.10.10");
239+
when(pubNetwork.getId()).thenReturn(1L);
240+
when(nicDao.findByIp4AddressAndNetworkId(anyString(), anyLong())).thenReturn(nicVO);
241+
doReturn(offerings).when(networkModel).getSystemAccountNetworkOfferings(any());
242+
when(deploymentDefinition.getPlan()).thenReturn(plan);
243+
doReturn(publicNetList).when(networkOrchestrationService).setupNetwork(nullable(Account.class), any(NetworkOffering.class), any(DeploymentPlan.class), nullable(String.class), nullable(String.class), anyBoolean());
244+
245+
LinkedHashMap<Network, List<? extends NicProfile>> configuredNic = nwHelper.configurePublicNic(deploymentDefinition, false);
246+
configuredNic.get(publicNetList.get(0));
247+
}
248+
172249
}

0 commit comments

Comments
 (0)