Skip to content

Commit 0229aa5

Browse files
Fix VM import test compilation
Declare the checked exceptions raised by importNic Mockito verifications and cover remote KVM duplicate-MAC forwarding when forced is omitted.
1 parent 0b7aa78 commit 0229aa5

1 file changed

Lines changed: 13 additions & 6 deletions

File tree

‎server/src/test/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImplTest.java‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ public void importUnmanagedInstanceTest() {
469469
}
470470

471471
@Test
472-
public void importUnmanagedVmwareInstanceForwardsDuplicateMacPolicy() {
472+
public void importUnmanagedVmwareInstanceForwardsDuplicateMacPolicy() throws Exception {
473473
ImportUnmanagedInstanceCmd cmd = Mockito.mock(ImportUnmanagedInstanceCmd.class);
474474
when(cmd.getName()).thenReturn("TestInstance");
475475
when(cmd.getDomainId()).thenReturn(null);
@@ -672,33 +672,40 @@ public void testListRemoteInstancesTestNonKVM() {
672672
unmanagedVMsManager.listVmsForImport(cmd);
673673
}
674674
@Test
675-
public void testImportFromExternalDefaultsToReplacingConflictingMac() throws InsufficientServerCapacityException {
675+
public void testImportFromExternalDefaultsToReplacingConflictingMac() throws Exception {
676676
ImportVmCmd cmd = createExternalImportCmd(null, false);
677677
importExternalKvmVm(cmd);
678678
verifyExternalKvmMacPolicy(true, false);
679679
}
680680

681681
@Test
682-
public void testImportFromExternalForwardsExplicitForcedTrue() throws InsufficientServerCapacityException {
682+
public void testImportFromExternalForwardsExplicitForcedTrue() throws Exception {
683683
ImportVmCmd cmd = createExternalImportCmd(true, false);
684684
importExternalKvmVm(cmd);
685685
verifyExternalKvmMacPolicy(true, false);
686686
}
687687

688688
@Test
689-
public void testImportFromExternalForwardsExplicitForcedFalse() throws InsufficientServerCapacityException {
689+
public void testImportFromExternalForwardsExplicitForcedFalse() throws Exception {
690690
ImportVmCmd cmd = createExternalImportCmd(false, false);
691691
importExternalKvmVm(cmd);
692692
verifyExternalKvmMacPolicy(false, false);
693693
}
694694

695695
@Test
696-
public void testImportFromExternalForwardsDuplicateMacAllowance() throws InsufficientServerCapacityException {
696+
public void testImportFromExternalForwardsDuplicateMacAllowance() throws Exception {
697697
ImportVmCmd cmd = createExternalImportCmd(false, true);
698698
importExternalKvmVm(cmd);
699699
verifyExternalKvmMacPolicy(false, true);
700700
}
701701

702+
@Test
703+
public void testImportFromExternalForwardsDuplicateMacAllowanceWhenForcedIsOmitted() throws Exception {
704+
ImportVmCmd cmd = createExternalImportCmd(null, true);
705+
importExternalKvmVm(cmd);
706+
verifyExternalKvmMacPolicy(false, true);
707+
}
708+
702709
@Test
703710
public void testImportFromExternalRejectsIncompatibleMacOptionsBeforeImportSideEffects() {
704711
ImportVmCmd cmd = createExternalImportCmd(true, true);
@@ -751,7 +758,7 @@ private void importExternalKvmVm(ImportVmCmd cmd) throws InsufficientServerCapac
751758
}
752759
}
753760

754-
private void verifyExternalKvmMacPolicy(boolean forced, boolean allowDuplicateMacAddresses) {
761+
private void verifyExternalKvmMacPolicy(boolean forced, boolean allowDuplicateMacAddresses) throws Exception {
755762
verify(networkOrchestrationService).importNic(Mockito.eq(instance.getNics().get(0).getMacAddress()), anyInt(),
756763
any(Network.class), anyBoolean(), any(VirtualMachine.class), nullable(Network.IpAddresses.class),
757764
any(DataCenter.class), Mockito.eq(forced), Mockito.eq(allowDuplicateMacAddresses));

0 commit comments

Comments
 (0)