Skip to content

Commit f9dec0b

Browse files
Pearl1594Pearl1594
committed
fix tests
1 parent d5f7798 commit f9dec0b

File tree

8 files changed

+64
-23
lines changed

8 files changed

+64
-23
lines changed

‎engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@
3737

3838
import com.cloud.agent.api.to.VirtualMachineTO;
3939
import com.cloud.api.query.vo.UserVmJoinVO;
40+
import com.cloud.dc.DataCenterVO;
41+
import com.cloud.dc.dao.DataCenterDao;
42+
import com.cloud.domain.DomainVO;
43+
import com.cloud.domain.dao.DomainDao;
4044
import com.cloud.network.dao.NetworkDao;
4145
import com.cloud.network.dao.NetworkVO;
4246
import com.cloud.network.vpc.VpcVO;
@@ -168,6 +172,10 @@ public class VirtualMachineManagerImplTest {
168172
@Mock
169173
private AccountDao accountDao;
170174
@Mock
175+
private DomainDao domainDao;
176+
@Mock
177+
private DataCenterDao dcDao;
178+
@Mock
171179
private VpcDao vpcDao;
172180

173181
@Before
@@ -920,6 +928,9 @@ public void checkIfVmNetworkDetailsReturnedIsCorrect() {
920928
UserVmJoinVO userVm = new UserVmJoinVO();
921929
NetworkVO networkVO = new NetworkVO();
922930
AccountVO accountVO = new AccountVO();
931+
DomainVO domainVO = new DomainVO();
932+
domainVO.setName("testDomain");
933+
DataCenterVO dataCenterVO = mock(DataCenterVO.class);
923934
VpcVO vpcVO = new VpcVO();
924935

925936
networkVO.setAccountId(1L);
@@ -935,9 +946,12 @@ public void checkIfVmNetworkDetailsReturnedIsCorrect() {
935946
Mockito.when(userVmJoinDaoMock.searchByIds(anyLong())).thenReturn(userVms);
936947
Mockito.when(networkDao.findById(anyLong())).thenReturn(networkVO);
937948
Mockito.when(accountDao.findById(anyLong())).thenReturn(accountVO);
949+
Mockito.when(domainDao.findById(anyLong())).thenReturn(domainVO);
950+
Mockito.when(dcDao.findById(anyLong())).thenReturn(dataCenterVO);
938951
Mockito.when(vpcDao.findById(anyLong())).thenReturn(vpcVO);
952+
Mockito.when(dataCenterVO.getName()).thenReturn("testZone");
939953
virtualMachineManagerImpl.setVmNetworkDetails(vm, vmTO);
940954
assertEquals(vmTO.getNetworkIdToNetworkNameMap().size(), 1);
941-
assertEquals(vmTO.getNetworkIdToNetworkNameMap().get(0L), "testAcc-VPC1-testNet");
955+
assertEquals(vmTO.getNetworkIdToNetworkNameMap().get(0L), "testDomain-testAcc-testZone-VPC1-testNet");
942956
}
943957
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public class NsxElement extends AdapterBase implements DhcpServiceProvider, DnsS
100100
@Inject
101101
NetworkModel networkModel;
102102
@Inject
103-
private DomainDao domainDao;
103+
DomainDao domainDao;
104104

105105
private static final Logger LOGGER = Logger.getLogger(NsxElement.class);
106106

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import static java.util.Objects.nonNull;
2121

2222
import com.cloud.dc.DataCenter;
23-
import com.cloud.dc.dao.DataCenterDao;
2423
import com.cloud.deploy.DeployDestination;
2524
import com.cloud.deploy.DeploymentPlan;
2625
import com.cloud.domain.DomainVO;
@@ -68,7 +67,7 @@ public class NsxGuestNetworkGuru extends GuestNetworkGuru implements NetworkMigr
6867
@Inject
6968
AccountDao accountDao;
7069
@Inject
71-
private DomainDao domainDao;
70+
DomainDao domainDao;
7271

7372
public NsxGuestNetworkGuru() {
7473
super();

‎plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/resource/NsxResourceTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,17 +105,17 @@ public void testConfigure_MissingParameter() throws ConfigurationException {
105105

106106
@Test
107107
public void testCreateNsxTier1Gateway() {
108-
NsxCommand command = new CreateNsxTier1GatewayCommand("ZoneA", 1L,
109-
"testAcc", 1L, "VPC01");
108+
NsxCommand command = new CreateNsxTier1GatewayCommand("testDomain", "testAcc",
109+
"ZoneNSX", "VPC01");
110110

111111
NsxAnswer answer = (NsxAnswer) nsxResource.executeRequest(command);
112112
assertTrue(answer.getResult());
113113
}
114114

115115
@Test
116116
public void testDeleteTier1Gateway() {
117-
NsxCommand command = new DeleteNsxTier1GatewayCommand("ZoneA", 1L,
118-
"testAcc", 1L, "VPC01");
117+
NsxCommand command = new DeleteNsxTier1GatewayCommand("testDomain", "testAcc",
118+
"ZoneNSX", "VPC01");
119119

120120
NsxAnswer answer = (NsxAnswer) nsxResource.executeRequest(command);
121121
assertTrue(answer.getResult());
@@ -133,8 +133,8 @@ public void testCreateNsxSegment() {
133133
List<EnforcementPoint> enforcementPointList = List.of(enforcementPoint);
134134
List<TransportZone> transportZoneList = List.of(new TransportZone.Builder().setDisplayName("Overlay").build());
135135

136-
NsxCommand command = new CreateNsxSegmentCommand("ZoneA", 1L,
137-
"testAcc", 1L, "VPC01", tierNetwork);
136+
NsxCommand command = new CreateNsxSegmentCommand("testDomain", "testAcc",
137+
"ZoneNSX", "VPC01", "Web", "10.10.10.1", "10.10.10.0/24");
138138

139139
when(nsxApi.getSites()).thenReturn(siteListResult);
140140
when(siteListResult.getResults()).thenReturn(siteList);
@@ -155,7 +155,7 @@ public void testCreateNsxSegment() {
155155
public void testDeleteNsxSegment() {
156156
NetworkVO tierNetwork = new NetworkVO();
157157
tierNetwork.setName("tier1");
158-
DeleteNsxSegmentCommand command = new DeleteNsxSegmentCommand("testAcc", "VPC01", tierNetwork);
158+
DeleteNsxSegmentCommand command = new DeleteNsxSegmentCommand("testDomain", "testAcc", "ZoneA", "VPC01", "Web");
159159

160160
NsxAnswer answer = (NsxAnswer) nsxResource.executeRequest(command);
161161
assertTrue(answer.getResult());

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

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import com.cloud.dc.DataCenterVO;
2020
import com.cloud.dc.dao.DataCenterDao;
2121
import com.cloud.deploy.DeployDestination;
22+
import com.cloud.domain.DomainVO;
23+
import com.cloud.domain.dao.DomainDao;
2224
import com.cloud.exception.InsufficientCapacityException;
2325
import com.cloud.exception.ResourceUnavailableException;
2426
import com.cloud.network.NetworkModel;
@@ -65,13 +67,19 @@ public class NsxElementTest {
6567
@Mock
6668
Vpc vpc;
6769
@Mock
70+
DataCenterVO zone;
71+
@Mock
6872
DataCenterVO dataCenterVO;
6973
@Mock
7074
Account account;
75+
@Mock
76+
DomainVO domain;
7177

7278
NsxElement nsxElement;
7379
ReservationContext reservationContext;
7480
DeployDestination deployDestination;
81+
@Mock
82+
DomainDao domainDao;
7583

7684
@Before
7785
public void setup() {
@@ -83,19 +91,23 @@ public void setup() {
8391
nsxElement.networkDao = networkDao;
8492
nsxElement.resourceManager = resourceManager;
8593
nsxElement.physicalNetworkDao = physicalNetworkDao;
94+
nsxElement.domainDao = domainDao;
8695
nsxElement.networkModel = networkModel;
8796
reservationContext = mock(ReservationContext.class);
8897
deployDestination = mock(DeployDestination.class);
8998

9099
when(vpc.getZoneId()).thenReturn(1L);
91100
when(vpc.getAccountId()).thenReturn(2L);
92101
when(dataCenterVO.getId()).thenReturn(1L);
93-
when(dataCenterVO.getName()).thenReturn("zone-NSX");
94-
when(account.getAccountId()).thenReturn(1L);
102+
when(dataCenterVO.getName()).thenReturn("zoneNSX");
95103
when(account.getName()).thenReturn("testAcc");
96104
when(vpc.getName()).thenReturn("VPC01");
97105
when(accountManager.getAccount(2L)).thenReturn(account);
98106
when(dataCenterDao.findById(anyLong())).thenReturn(dataCenterVO);
107+
when(domainDao.findById(anyLong())).thenReturn(domain);
108+
when(vpc.getZoneId()).thenReturn(1L);
109+
when(domain.getName()).thenReturn("testDomain");
110+
when(vpc.getName()).thenReturn("testVPC");
99111

100112
PhysicalNetworkVO physicalNetworkVO = new PhysicalNetworkVO();
101113
physicalNetworkVO.setIsolationMethods(List.of("NSX"));
@@ -106,14 +118,14 @@ public void setup() {
106118

107119
@Test
108120
public void testImplementVpc() throws ResourceUnavailableException, InsufficientCapacityException {
109-
when(nsxService.createVpcNetwork(anyLong(), anyString(), anyLong(), anyString(), anyString())).thenReturn(true);
121+
when(nsxService.createVpcNetwork(anyLong(), anyString(), anyString(), anyString(), anyString())).thenReturn(true);
110122

111123
assertTrue(nsxElement.implementVpc(vpc, deployDestination, reservationContext));
112124
}
113125

114126
@Test
115127
public void testShutdownVpc() {
116-
when(nsxService.deleteVpcNetwork(anyLong(), anyString(), anyLong(), anyString(), anyString())).thenReturn(true);
128+
when(nsxService.deleteVpcNetwork(anyLong(), anyString(), anyString(), anyString(), anyString())).thenReturn(true);
117129

118130
assertTrue(nsxElement.shutdownVpc(vpc, reservationContext));
119131
}

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

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import com.cloud.dc.dao.DataCenterDao;
2222
import com.cloud.deploy.DeployDestination;
2323
import com.cloud.deploy.DeploymentPlan;
24+
import com.cloud.domain.DomainVO;
25+
import com.cloud.domain.dao.DomainDao;
2426
import com.cloud.network.Network;
2527
import com.cloud.network.NetworkModel;
2628
import com.cloud.network.Networks;
@@ -51,10 +53,18 @@
5153

5254
import java.util.List;
5355

54-
import static org.junit.Assert.*;
56+
import static org.junit.Assert.assertTrue;
57+
import static org.junit.Assert.assertEquals;
58+
import static org.junit.Assert.assertSame;
59+
import static org.junit.Assert.assertFalse;
60+
import static org.junit.Assert.assertNotNull;
5561
import static org.mockito.ArgumentMatchers.any;
5662
import static org.mockito.ArgumentMatchers.anyLong;
57-
import static org.mockito.Mockito.*;
63+
import static org.mockito.Mockito.when;
64+
import static org.mockito.Mockito.verify;
65+
import static org.mockito.Mockito.mock;
66+
import static org.mockito.Mockito.times;
67+
import static org.mockito.Mockito.lenient;
5868

5969
@RunWith(MockitoJUnitRunner.class)
6070
public class NsxGuestNetworkGuruTest {
@@ -89,6 +99,8 @@ public class NsxGuestNetworkGuruTest {
8999
VpcVO vpcVO;
90100
@Mock
91101
NetworkModel networkModel;
102+
@Mock
103+
DomainDao domainDao;
92104

93105
NsxGuestNetworkGuru guru;
94106
AutoCloseable closeable;
@@ -105,6 +117,7 @@ public void setUp() {
105117
guru.networkOfferingServiceMapDao = networkOfferingServiceMapDao;
106118
guru.nsxControllerUtils = nsxControllerUtils;
107119
guru.accountDao = accountDao;
120+
guru.domainDao = domainDao;
108121

109122
Mockito.when(dataCenterVO.getNetworkType()).thenReturn(DataCenter.NetworkType.Advanced);
110123

@@ -123,6 +136,7 @@ public void setUp() {
123136

124137
when(account.getAccountId()).thenReturn(1L);
125138
when(accountDao.findById(anyLong())).thenReturn(mock(AccountVO.class));
139+
when(domainDao.findById(anyLong())).thenReturn(mock(DomainVO.class));
126140

127141
Mockito.when(networkOfferingServiceMapDao.isProviderForNetworkOffering(offering.getId(), Network.Provider.Nsx)).thenReturn(
128142
true);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
import org.mockito.Mock;
3232
import org.mockito.MockitoAnnotations;
3333
import org.mockito.junit.MockitoJUnitRunner;
34-
import org.springframework.test.util.ReflectionTestUtils;
3534

3635
import static org.junit.Assert.assertTrue;
37-
import static org.mockito.ArgumentMatchers.*;
36+
import static org.mockito.ArgumentMatchers.any;
37+
import static org.mockito.ArgumentMatchers.anyLong;
3838
import static org.mockito.Mockito.mock;
3939
import static org.mockito.Mockito.when;
4040

@@ -67,7 +67,7 @@ public void testCreateVpcNetwork() {
6767
when(nsxControllerUtils.sendNsxCommand(any(CreateNsxTier1GatewayCommand.class), anyLong())).thenReturn(createNsxTier1GatewayAnswer);
6868
when(createNsxTier1GatewayAnswer.getResult()).thenReturn(true);
6969

70-
assertTrue(nsxService.createVpcNetwork(1L, "ZoneNSX", 1L, "testAcc", "VPC01"));
70+
assertTrue(nsxService.createVpcNetwork(1L, "ZoneNSX", "testAcc", "testAcc", "VPC01"));
7171
}
7272

7373
@Test
@@ -76,7 +76,7 @@ public void testDeleteVpcNetwork() {
7676
when(nsxControllerUtils.sendNsxCommand(any(DeleteNsxTier1GatewayCommand.class), anyLong())).thenReturn(deleteNsxTier1GatewayAnswer);
7777
when(deleteNsxTier1GatewayAnswer.getResult()).thenReturn(true);
7878

79-
assertTrue(nsxService.deleteVpcNetwork(1L, "ZoneNSX", 1L, "testAcc", "VPC01"));
79+
assertTrue(nsxService.deleteVpcNetwork(1L, "ZoneNSX", "testAcc", "testAcc", "VPC01"));
8080
}
8181

8282
@Test
@@ -89,6 +89,6 @@ public void testDelete() {
8989
when(nsxControllerUtils.sendNsxCommand(any(DeleteNsxSegmentCommand.class), anyLong())).thenReturn(deleteNsxSegmentAnswer);
9090
when(deleteNsxSegmentAnswer.getResult()).thenReturn(true);
9191

92-
assertTrue(nsxService.deleteNetwork("testAcc", network));
92+
assertTrue(nsxService.deleteNetwork("ZoneNSX", "testAcc", "testDomain", network));
9393
}
9494
}

‎vmware-base/src/test/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelperTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
import static org.junit.Assert.assertFalse;
2121
import static org.junit.Assert.assertNull;
2222
import static org.junit.Assert.assertTrue;
23-
import static org.mockito.ArgumentMatchers.*;
23+
import static org.mockito.ArgumentMatchers.any;
24+
import static org.mockito.ArgumentMatchers.nullable;
25+
import static org.mockito.ArgumentMatchers.anyList;
2426
import static org.mockito.Mockito.never;
2527
import static org.mockito.Mockito.verify;
2628
import static org.mockito.Mockito.verifyNoInteractions;

0 commit comments

Comments
 (0)