Skip to content

Commit 5a23d33

Browse files
author
Stephan Krug
committed
Use CloudRuntimeException
1 parent 795dcb0 commit 5a23d33

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7152,7 +7152,7 @@ protected void executeStepsToChangeOwnershipOfVm(AssignVMCmd cmd, Account caller
71527152
try {
71537153
updateVmNetwork(cmd, caller, vm, newAccount, template);
71547154
} catch (InsufficientCapacityException | ResourceAllocationException e) {
7155-
throw new RuntimeException(String.format("Unable to update networks when assigning VM [%s] due to [%s].", vm, e.getMessage()), e);
7155+
throw new CloudRuntimeException(String.format("Unable to update networks when assigning VM [%s] due to [%s].", vm, e.getMessage()), e);
71567156
}
71577157

71587158
s_logger.trace(String.format("Incrementing new account [%s] resource count.", newAccount));

server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2359,7 +2359,7 @@ public void executeStepsToChangeOwnershipOfVmTestUpdateVmNetworkThrowsInsufficie
23592359
Mockito.doThrow(InsufficientAddressCapacityException.class).when(userVmManagerImpl).updateVmNetwork(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(),
23602360
Mockito.any());
23612361

2362-
Assert.assertThrows(RuntimeException.class, () -> userVmManagerImpl.executeStepsToChangeOwnershipOfVm(assignVmCmdMock, callerAccount, accountMock, accountMock,
2362+
Assert.assertThrows(CloudRuntimeException.class, () -> userVmManagerImpl.executeStepsToChangeOwnershipOfVm(assignVmCmdMock, callerAccount, accountMock, accountMock,
23632363
userVmVoMock, serviceOfferingVoMock, volumes, virtualMachineTemplateMock, 1l));
23642364

23652365
Mockito.verify(userVmManagerImpl).resourceCountDecrement(Mockito.anyLong(), Mockito.any(), Mockito.anyLong(), Mockito.anyLong());
@@ -2383,7 +2383,7 @@ public void executeStepsToChangeOwnershipOfVmTestUpdateVmNetworkThrowsResourceAl
23832383
Mockito.doThrow(ResourceAllocationException.class).when(userVmManagerImpl).updateVmNetwork(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(),
23842384
Mockito.any());
23852385

2386-
Assert.assertThrows(RuntimeException.class, () -> userVmManagerImpl.executeStepsToChangeOwnershipOfVm(assignVmCmdMock, callerAccount, accountMock, accountMock,
2386+
Assert.assertThrows(CloudRuntimeException.class, () -> userVmManagerImpl.executeStepsToChangeOwnershipOfVm(assignVmCmdMock, callerAccount, accountMock, accountMock,
23872387
userVmVoMock, serviceOfferingVoMock, volumes, virtualMachineTemplateMock, 1l));
23882388

23892389
Mockito.verify(userVmManagerImpl).resourceCountDecrement(Mockito.anyLong(), Mockito.any(), Mockito.anyLong(), Mockito.anyLong());

0 commit comments

Comments
 (0)