Skip to content

Commit 3b53055

Browse files
fix tests
1 parent 57da8b5 commit 3b53055

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

engine/orchestration/src/test/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestratorTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,7 @@ private void configureTestConfigureNicProfileBasedOnRequestedIpTests(NicProfile
396396
when(testOrchestrator._ipAddressDao.acquireInLockTable(Mockito.anyLong())).thenReturn(ipVoSpy);
397397
when(testOrchestrator._ipAddressDao.update(Mockito.anyLong(), Mockito.any(IPAddressVO.class))).thenReturn(true);
398398
when(testOrchestrator._ipAddressDao.releaseFromLockTable(Mockito.anyLong())).thenReturn(true);
399+
when(testOrchestrator._networkModel.isMACUnique(Mockito.anyString(), Mockito.anyLong())).thenReturn(true);
399400
try {
400401
when(testOrchestrator._networkModel.getNextAvailableMacAddressInNetwork(Mockito.anyLong())).thenReturn(macAddress);
401402
} catch (InsufficientAddressCapacityException e) {

server/src/test/java/com/cloud/network/Ipv6AddressManagerTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,10 @@ public void setNICIPv6AddressTest() throws InsufficientAddressCapacityException
246246

247247
Mockito.when(network.getIp6Cidr()).thenReturn("2001:db8:100::/64");
248248
Mockito.when(network.getIp6Gateway()).thenReturn("2001:db8:100::1");
249+
Mockito.when(network.getId()).thenReturn(1L);
249250

250251
Mockito.when(networkModel.getNetworkIp6Dns(network, dc)).thenReturn(new Pair<>("2001:db8::53:1", "2001:db8::53:2"));
252+
Mockito.when(networkModel.isMACUnique("1e:00:b1:00:0a:f6", 1L)).thenReturn(true);
251253

252254
String expected = "2001:db8:100:0:1c00:b1ff:fe00:af6";
253255

0 commit comments

Comments
 (0)