mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
revert changes made
This commit is contained in:
Pearl Dsilva
parent
8fbe8b410b
commit
49b76c9d26
@ -44,7 +44,6 @@ import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.ScheduledExecutorService;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import java.util.stream.Collectors;
|
||||
@ -55,7 +54,6 @@ import javax.naming.ConfigurationException;
|
||||
import javax.xml.parsers.DocumentBuilder;
|
||||
import javax.xml.parsers.ParserConfigurationException;
|
||||
|
||||
import com.cloud.utils.db.TransactionLegacy;
|
||||
import org.apache.cloudstack.acl.ControlledEntity;
|
||||
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
|
||||
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
|
||||
@ -7447,12 +7445,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
|
||||
logger.trace("Verifying if the new account [{}] has access to the specified domain [{}].", newAccount, domain);
|
||||
_accountMgr.checkAccess(newAccount, domain);
|
||||
|
||||
Transaction.execute(new TransactionCallbackNoReturn() {
|
||||
@Override
|
||||
public void doInTransactionWithoutResult(TransactionStatus status) {
|
||||
executeStepsToChangeOwnershipOfVm(cmd, caller, oldAccount, newAccount, vm, offering, volumes, template, domainId);
|
||||
}
|
||||
});
|
||||
executeStepsToChangeOwnershipOfVm(cmd, caller, oldAccount, newAccount, vm, offering, volumes, template, domainId);
|
||||
|
||||
logger.info("VM [{}] now belongs to account [{}].", vm.getInstanceName(), newAccountName);
|
||||
return vm;
|
||||
@ -7581,40 +7574,35 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
|
||||
protected void executeStepsToChangeOwnershipOfVm(AssignVMCmd cmd, Account caller, Account oldAccount, Account newAccount, UserVmVO vm, ServiceOfferingVO offering,
|
||||
List<VolumeVO> volumes, VirtualMachineTemplate template, Long domainId) {
|
||||
|
||||
logger.trace("Generating destroy event for VM [{}].", vm);
|
||||
UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_DESTROY, vm.getAccountId(), vm.getDataCenterId(), vm.getId(), vm.getHostName(), vm.getServiceOfferingId(),
|
||||
vm.getTemplateId(), vm.getHypervisorType().toString(), VirtualMachine.class.getName(), vm.getUuid(), vm.isDisplayVm());
|
||||
|
||||
logger.trace("Decrementing old account [{}] resource count.", oldAccount);
|
||||
resourceCountDecrement(oldAccount.getAccountId(), vm.isDisplayVm(), offering, template);
|
||||
|
||||
logger.trace("Removing VM [{}] from its instance group.", vm);
|
||||
removeInstanceFromInstanceGroup(vm.getId());
|
||||
|
||||
Long newAccountId = newAccount.getAccountId();
|
||||
AtomicBoolean isNetworkAutoCreated = new AtomicBoolean(false);
|
||||
updateVmOwner(newAccount, vm, domainId, newAccountId);
|
||||
|
||||
updateVolumesOwner(volumes, oldAccount, newAccount, newAccountId);
|
||||
|
||||
try {
|
||||
updateVmNetwork(cmd, caller, vm, newAccount, template, isNetworkAutoCreated);
|
||||
|
||||
logger.trace("Generating destroy event for VM [{}].", vm);
|
||||
UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_DESTROY, vm.getAccountId(), vm.getDataCenterId(), vm.getId(), vm.getHostName(), vm.getServiceOfferingId(),
|
||||
vm.getTemplateId(), vm.getHypervisorType().toString(), VirtualMachine.class.getName(), vm.getUuid(), vm.isDisplayVm());
|
||||
|
||||
logger.trace("Decrementing old account [{}] resource count.", oldAccount);
|
||||
resourceCountDecrement(oldAccount.getAccountId(), vm.isDisplayVm(), offering, template);
|
||||
|
||||
logger.trace("Removing VM [{}] from its instance group.", vm);
|
||||
removeInstanceFromInstanceGroup(vm.getId());
|
||||
|
||||
updateVmOwner(newAccount, vm, domainId, newAccountId);
|
||||
|
||||
updateVolumesOwner(volumes, oldAccount, newAccount, newAccountId);
|
||||
|
||||
logger.trace(String.format("Incrementing new account [%s] resource count.", newAccount));
|
||||
if (!isResourceCountRunningVmsOnlyEnabled()) {
|
||||
resourceCountIncrement(newAccountId, vm.isDisplayVm(), offering, template);
|
||||
}
|
||||
|
||||
logger.trace(String.format("Generating create event for VM [%s].", vm));
|
||||
UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_CREATE, vm.getAccountId(), vm.getDataCenterId(), vm.getId(), vm.getHostName(), vm.getServiceOfferingId(),
|
||||
vm.getTemplateId(), vm.getHypervisorType().toString(), VirtualMachine.class.getName(), vm.getUuid(), vm.isDisplayVm());
|
||||
updateVmNetwork(cmd, caller, vm, newAccount, template);
|
||||
} catch (InsufficientCapacityException | ResourceAllocationException e) {
|
||||
List<NetworkVO> networkVOS = _networkDao.listByAccountIdNetworkName(newAccountId, newAccount.getAccountName() + "-network");
|
||||
if (networkVOS.size() == 1 && isNetworkAutoCreated.get()) {
|
||||
_networkDao.remove(networkVOS.get(0).getId());
|
||||
}
|
||||
throw new CloudRuntimeException(String.format("Unable to update networks when assigning VM [%s] due to [%s].", vm, e.getMessage()), e);
|
||||
}
|
||||
|
||||
logger.trace(String.format("Incrementing new account [%s] resource count.", newAccount));
|
||||
if (!isResourceCountRunningVmsOnlyEnabled()) {
|
||||
resourceCountIncrement(newAccountId, vm.isDisplayVm(), offering, template);
|
||||
}
|
||||
|
||||
logger.trace(String.format("Generating create event for VM [%s].", vm));
|
||||
UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_CREATE, vm.getAccountId(), vm.getDataCenterId(), vm.getId(), vm.getHostName(), vm.getServiceOfferingId(),
|
||||
vm.getTemplateId(), vm.getHypervisorType().toString(), VirtualMachine.class.getName(), vm.getUuid(), vm.isDisplayVm());
|
||||
}
|
||||
|
||||
protected void updateVmOwner(Account newAccount, UserVmVO vm, Long domainId, Long newAccountId) {
|
||||
@ -7667,7 +7655,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
|
||||
* @throws InsufficientCapacityException
|
||||
* @throws ResourceAllocationException
|
||||
*/
|
||||
protected void updateVmNetwork(AssignVMCmd cmd, Account caller, UserVmVO vm, Account newAccount, VirtualMachineTemplate template, AtomicBoolean isNetworkAutoCreated)
|
||||
protected void updateVmNetwork(AssignVMCmd cmd, Account caller, UserVmVO vm, Account newAccount, VirtualMachineTemplate template)
|
||||
throws InsufficientCapacityException, ResourceAllocationException {
|
||||
|
||||
logger.trace("Updating network for VM [{}].", vm);
|
||||
@ -7685,7 +7673,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
|
||||
return;
|
||||
}
|
||||
|
||||
updateAdvancedTypeNetworkForVm(cmd, caller, vm, newAccount, template, vmOldProfile, zone, networkIdList, securityGroupIdList, isNetworkAutoCreated);
|
||||
updateAdvancedTypeNetworkForVm(cmd, caller, vm, newAccount, template, vmOldProfile, zone, networkIdList, securityGroupIdList);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -7796,7 +7784,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
|
||||
* @throws InvalidParameterValueException
|
||||
*/
|
||||
protected void updateAdvancedTypeNetworkForVm(AssignVMCmd cmd, Account caller, UserVmVO vm, Account newAccount, VirtualMachineTemplate template,
|
||||
VirtualMachineProfileImpl vmOldProfile, DataCenterVO zone, List<Long> networkIdList, List<Long> securityGroupIdList, AtomicBoolean isNetworkAutoCreated)
|
||||
VirtualMachineProfileImpl vmOldProfile, DataCenterVO zone, List<Long> networkIdList, List<Long> securityGroupIdList)
|
||||
throws InsufficientCapacityException, ResourceAllocationException, InvalidParameterValueException {
|
||||
|
||||
LinkedHashSet<NetworkVO> applicableNetworks = new LinkedHashSet<>();
|
||||
@ -7829,7 +7817,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
|
||||
addNetworksToNetworkIdList(vm, newAccount, vmOldProfile, networkIdList, applicableNetworks, requestedIPv4ForNics, requestedIPv6ForNics);
|
||||
|
||||
if (applicableNetworks.isEmpty()) {
|
||||
selectApplicableNetworkToCreateVm(caller, newAccount, zone, applicableNetworks, isNetworkAutoCreated);
|
||||
selectApplicableNetworkToCreateVm(caller, newAccount, zone, applicableNetworks);
|
||||
}
|
||||
|
||||
addNicsToApplicableNetworksAndReturnDefaultNetwork(applicableNetworks, requestedIPv4ForNics, requestedIPv6ForNics, networks);
|
||||
@ -7952,7 +7940,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
|
||||
* @throws ResourceAllocationException
|
||||
*/
|
||||
protected void selectApplicableNetworkToCreateVm(Account caller, Account newAccount, DataCenterVO zone,
|
||||
Set<NetworkVO> applicableNetworks, AtomicBoolean isNetworkAutoCreated)
|
||||
Set<NetworkVO> applicableNetworks)
|
||||
throws InsufficientCapacityException, ResourceAllocationException {
|
||||
|
||||
logger.trace("Selecting the applicable network to create the VM.");
|
||||
@ -7972,11 +7960,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
|
||||
NetworkVO defaultNetwork;
|
||||
List<? extends Network> virtualNetworks = _networkModel.listNetworksForAccount(newAccount.getId(), zone.getId(), Network.GuestType.Isolated);
|
||||
if (virtualNetworks.isEmpty()) {
|
||||
try (TransactionLegacy txn = TransactionLegacy.open("CreateNetworkTxn")) {
|
||||
defaultNetwork = createApplicableNetworkToCreateVm(caller, newAccount, zone, firstRequiredOffering);
|
||||
isNetworkAutoCreated.set(true);
|
||||
txn.commit();
|
||||
}
|
||||
defaultNetwork = createApplicableNetworkToCreateVm(caller, newAccount, zone, firstRequiredOffering);
|
||||
} else if (virtualNetworks.size() > 1) {
|
||||
throw new InvalidParameterValueException(String.format("More than one default isolated network has been found for account [%s]; please specify networkIDs.",
|
||||
newAccount));
|
||||
|
||||
@ -140,8 +140,6 @@ import java.util.HashSet;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.LinkedList;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
|
||||
import com.cloud.domain.DomainVO;
|
||||
import com.cloud.domain.dao.DomainDao;
|
||||
import com.cloud.event.UsageEventUtils;
|
||||
@ -611,7 +609,7 @@ public class UserVmManagerImplTest {
|
||||
|
||||
Mockito.doNothing().when(userVmManagerImpl).updateVmOwner(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
|
||||
Mockito.doNothing().when(userVmManagerImpl).updateVolumesOwner(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
|
||||
Mockito.doNothing().when(userVmManagerImpl).updateVmNetwork(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
|
||||
Mockito.doNothing().when(userVmManagerImpl).updateVmNetwork(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
|
||||
|
||||
Mockito.doNothing().when(userVmManagerImpl).resourceCountIncrement(Mockito.anyLong(), Mockito.any(), Mockito.any(), Mockito.any());
|
||||
}
|
||||
@ -1975,8 +1973,7 @@ public class UserVmManagerImplTest {
|
||||
Mockito.doNothing().when(userVmManagerImpl).updateBasicTypeNetworkForVm(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(),
|
||||
Mockito.any(), Mockito.any());
|
||||
|
||||
AtomicBoolean isNetworkCreated = Mockito.mock(AtomicBoolean.class);
|
||||
userVmManagerImpl.updateVmNetwork(assignVmCmdMock, callerAccount, userVmVoMock, accountMock, virtualMachineTemplateMock, isNetworkCreated);
|
||||
userVmManagerImpl.updateVmNetwork(assignVmCmdMock, callerAccount, userVmVoMock, accountMock, virtualMachineTemplateMock);
|
||||
|
||||
Mockito.verify(userVmManagerImpl).updateBasicTypeNetworkForVm(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(),
|
||||
Mockito.any(), Mockito.any());
|
||||
@ -1987,14 +1984,12 @@ public class UserVmManagerImplTest {
|
||||
Mockito.doReturn(_dcMock).when(_dcDao).findById(Mockito.anyLong());
|
||||
Mockito.doReturn(DataCenter.NetworkType.Advanced).when(_dcMock).getNetworkType();
|
||||
Mockito.doNothing().when(userVmManagerImpl).updateAdvancedTypeNetworkForVm(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(),
|
||||
Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
|
||||
Mockito.any(), Mockito.any(), Mockito.any());
|
||||
|
||||
AtomicBoolean isNetworkCreated = Mockito.mock(AtomicBoolean.class);
|
||||
|
||||
userVmManagerImpl.updateVmNetwork(assignVmCmdMock, callerAccount, userVmVoMock, accountMock, virtualMachineTemplateMock, isNetworkCreated);
|
||||
userVmManagerImpl.updateVmNetwork(assignVmCmdMock, callerAccount, userVmVoMock, accountMock, virtualMachineTemplateMock);
|
||||
|
||||
Mockito.verify(userVmManagerImpl).updateAdvancedTypeNetworkForVm(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(),
|
||||
Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
|
||||
Mockito.any(), Mockito.any(), Mockito.any());
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -2083,12 +2078,11 @@ public class UserVmManagerImplTest {
|
||||
NetworkOffering.Availability.Required);
|
||||
HashSet<NetworkVO> applicableNetworks = new HashSet<NetworkVO>();
|
||||
LinkedList<NetworkOfferingVO> requiredOfferings = new LinkedList<NetworkOfferingVO>();
|
||||
AtomicBoolean isNetworkCreated = Mockito.mock(AtomicBoolean.class);
|
||||
|
||||
Mockito.doReturn(requiredOfferings).when(networkOfferingDaoMock).listByAvailability(NetworkOffering.Availability.Required, false);
|
||||
|
||||
InvalidParameterValueException assertThrows = Assert.assertThrows(expectedInvalidParameterValueException, () -> {
|
||||
userVmManagerImpl.selectApplicableNetworkToCreateVm(callerAccount, accountMock, _dcMock, applicableNetworks, isNetworkCreated);
|
||||
userVmManagerImpl.selectApplicableNetworkToCreateVm(callerAccount, accountMock, _dcMock, applicableNetworks);
|
||||
});
|
||||
|
||||
Assert.assertEquals(expectedMessage, assertThrows.getMessage());
|
||||
@ -2106,9 +2100,8 @@ public class UserVmManagerImplTest {
|
||||
|
||||
Mockito.doReturn(1l).when(networkOfferingVoMock).getId();
|
||||
|
||||
AtomicBoolean isNetworkCreated = Mockito.mock(AtomicBoolean.class);
|
||||
InvalidParameterValueException assertThrows = Assert.assertThrows(expectedInvalidParameterValueException, () -> {
|
||||
userVmManagerImpl.selectApplicableNetworkToCreateVm(callerAccount, accountMock, _dcMock, applicableNetworks, isNetworkCreated);
|
||||
userVmManagerImpl.selectApplicableNetworkToCreateVm(callerAccount, accountMock, _dcMock, applicableNetworks);
|
||||
});
|
||||
|
||||
Assert.assertEquals(expectedMessage, assertThrows.getMessage());
|
||||
@ -2129,8 +2122,7 @@ public class UserVmManagerImplTest {
|
||||
|
||||
Mockito.doReturn(networkMock).when(userVmManagerImpl).createApplicableNetworkToCreateVm(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
|
||||
|
||||
AtomicBoolean isNetworkCreated = Mockito.mock(AtomicBoolean.class);
|
||||
userVmManagerImpl.selectApplicableNetworkToCreateVm(callerAccount, accountMock, _dcMock, applicableNetworks, isNetworkCreated);
|
||||
userVmManagerImpl.selectApplicableNetworkToCreateVm(callerAccount, accountMock, _dcMock, applicableNetworks);
|
||||
|
||||
Mockito.verify(userVmManagerImpl).createApplicableNetworkToCreateVm(callerAccount, accountMock, _dcMock, networkOfferingVoMock);
|
||||
}
|
||||
@ -2150,9 +2142,8 @@ public class UserVmManagerImplTest {
|
||||
virtualNetworks.add(networkMock);
|
||||
virtualNetworks.add(networkMock);
|
||||
|
||||
AtomicBoolean isNetworkCreated = Mockito.mock(AtomicBoolean.class);
|
||||
InvalidParameterValueException assertThrows = Assert.assertThrows(expectedInvalidParameterValueException, () -> {
|
||||
userVmManagerImpl.selectApplicableNetworkToCreateVm(callerAccount, accountMock, _dcMock, applicableNetworks, isNetworkCreated);
|
||||
userVmManagerImpl.selectApplicableNetworkToCreateVm(callerAccount, accountMock, _dcMock, applicableNetworks);
|
||||
});
|
||||
|
||||
Assert.assertEquals(expectedMessage, assertThrows.getMessage());
|
||||
@ -2172,8 +2163,7 @@ public class UserVmManagerImplTest {
|
||||
Mockito.doReturn(1).when(networkVoListMock).size();
|
||||
Mockito.doReturn(networkMock).when(networkVoListMock).get(0);
|
||||
|
||||
AtomicBoolean isNetworkCreated = Mockito.mock(AtomicBoolean.class);
|
||||
userVmManagerImpl.selectApplicableNetworkToCreateVm(callerAccount, accountMock, _dcMock, applicableNetworks, isNetworkCreated);
|
||||
userVmManagerImpl.selectApplicableNetworkToCreateVm(callerAccount, accountMock, _dcMock, applicableNetworks);
|
||||
|
||||
Mockito.verify(_networkDao).findById(Mockito.anyLong());
|
||||
}
|
||||
@ -2734,10 +2724,9 @@ public class UserVmManagerImplTest {
|
||||
|
||||
Mockito.doReturn(true).when(networkModel).checkSecurityGroupSupportForNetwork(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
|
||||
|
||||
AtomicBoolean isNetworkCreated = Mockito.mock(AtomicBoolean.class);
|
||||
InvalidParameterValueException assertThrows = Assert.assertThrows(expectedInvalidParameterValueException, () -> {
|
||||
userVmManagerImpl.updateAdvancedTypeNetworkForVm(assignVmCmdMock, callerAccount, userVmVoMock, accountMock, virtualMachineTemplateMock, virtualMachineProfileMock,
|
||||
_dcMock, networkIdList, securityGroupIdList, isNetworkCreated);
|
||||
_dcMock, networkIdList, securityGroupIdList);
|
||||
});
|
||||
|
||||
Mockito.verify(securityGroupManagerMock).removeInstanceFromGroups(Mockito.any());
|
||||
@ -2757,9 +2746,8 @@ public class UserVmManagerImplTest {
|
||||
|
||||
Mockito.doReturn(true).when(networkModel).checkSecurityGroupSupportForNetwork(accountMock, _dcMock, networkIdList, securityGroupIdList);
|
||||
|
||||
AtomicBoolean isNetworkCreated = Mockito.mock(AtomicBoolean.class);
|
||||
userVmManagerImpl.updateAdvancedTypeNetworkForVm(assignVmCmdMock, callerAccount, userVmVoMock, accountMock, virtualMachineTemplateMock, virtualMachineProfileMock, _dcMock,
|
||||
networkIdList, securityGroupIdList, isNetworkCreated);
|
||||
networkIdList, securityGroupIdList);
|
||||
|
||||
Mockito.verify(securityGroupManagerMock).removeInstanceFromGroups(Mockito.any());
|
||||
Mockito.verify(userVmManagerImpl).allocateNetworksForVm(Mockito.any(), Mockito.any());
|
||||
@ -2776,10 +2764,9 @@ public class UserVmManagerImplTest {
|
||||
|
||||
Mockito.doReturn(false).when(networkModel).checkSecurityGroupSupportForNetwork(accountMock, _dcMock, networkIdList, securityGroupIdList);
|
||||
|
||||
AtomicBoolean isNetworkCreated = Mockito.mock(AtomicBoolean.class);
|
||||
InvalidParameterValueException assertThrows = Assert.assertThrows(expectedInvalidParameterValueException, () -> {
|
||||
userVmManagerImpl.updateAdvancedTypeNetworkForVm(assignVmCmdMock, callerAccount, userVmVoMock, accountMock, virtualMachineTemplateMock, virtualMachineProfileMock,
|
||||
_dcMock, networkIdList, securityGroupIdList, isNetworkCreated);
|
||||
_dcMock, networkIdList, securityGroupIdList);
|
||||
});
|
||||
|
||||
Assert.assertEquals(expectedMessage, assertThrows.getMessage());
|
||||
@ -2793,17 +2780,16 @@ public class UserVmManagerImplTest {
|
||||
LinkedList<Long> networkIdList = new LinkedList<Long>();
|
||||
|
||||
Mockito.doReturn(networkMock).when(userVmManagerImpl).addNicsToApplicableNetworksAndReturnDefaultNetwork(Mockito.any(), Mockito.anyMap(), Mockito.anyMap(), Mockito.any());
|
||||
Mockito.doNothing().when(userVmManagerImpl).selectApplicableNetworkToCreateVm(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
|
||||
Mockito.doNothing().when(userVmManagerImpl).selectApplicableNetworkToCreateVm(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
|
||||
|
||||
Mockito.doReturn(false).when(networkModel).checkSecurityGroupSupportForNetwork(accountMock, _dcMock, networkIdList, securityGroupIdList);
|
||||
Mockito.doReturn(true).when(securityGroupIdList).isEmpty();
|
||||
|
||||
AtomicBoolean isNetworkCreated = Mockito.mock(AtomicBoolean.class);
|
||||
userVmManagerImpl.updateAdvancedTypeNetworkForVm(assignVmCmdMock, callerAccount, userVmVoMock, accountMock, virtualMachineTemplateMock, virtualMachineProfileMock, _dcMock,
|
||||
networkIdList, securityGroupIdList, isNetworkCreated);
|
||||
networkIdList, securityGroupIdList);
|
||||
|
||||
Mockito.verify(userVmManagerImpl).addNetworksToNetworkIdList(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.anyMap(), Mockito.anyMap());
|
||||
Mockito.verify(userVmManagerImpl).selectApplicableNetworkToCreateVm(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
|
||||
Mockito.verify(userVmManagerImpl).selectApplicableNetworkToCreateVm(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
|
||||
Mockito.verify(userVmManagerImpl).addNicsToApplicableNetworksAndReturnDefaultNetwork(Mockito.any(), Mockito.anyMap(), Mockito.anyMap(), Mockito.any());
|
||||
Mockito.verify(userVmManagerImpl).allocateNetworksForVm(Mockito.any(), Mockito.any());
|
||||
}
|
||||
@ -2822,12 +2808,11 @@ public class UserVmManagerImplTest {
|
||||
Mockito.doReturn(networkMock).when(_networkDao).findById(Mockito.anyLong());
|
||||
Mockito.doReturn(true).when(userVmManagerImpl).canAccountUseNetwork(accountMock, networkMock);
|
||||
|
||||
AtomicBoolean isNetworkCreated = Mockito.mock(AtomicBoolean.class);
|
||||
userVmManagerImpl.updateAdvancedTypeNetworkForVm(assignVmCmdMock, callerAccount, userVmVoMock, accountMock, virtualMachineTemplateMock, virtualMachineProfileMock, _dcMock,
|
||||
networkIdList, securityGroupIdList, isNetworkCreated);
|
||||
networkIdList, securityGroupIdList);
|
||||
|
||||
Mockito.verify(userVmManagerImpl).addNetworksToNetworkIdList(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.anyMap(), Mockito.anyMap());
|
||||
Mockito.verify(userVmManagerImpl, Mockito.never()).selectApplicableNetworkToCreateVm(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
|
||||
Mockito.verify(userVmManagerImpl, Mockito.never()).selectApplicableNetworkToCreateVm(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
|
||||
Mockito.verify(userVmManagerImpl).addNicsToApplicableNetworksAndReturnDefaultNetwork(Mockito.any(), Mockito.anyMap(), Mockito.anyMap(), Mockito.any());
|
||||
Mockito.verify(userVmManagerImpl).allocateNetworksForVm(Mockito.any(), Mockito.any());
|
||||
}
|
||||
@ -3055,13 +3040,19 @@ public class UserVmManagerImplTest {
|
||||
LinkedList<VolumeVO> volumes = new LinkedList<VolumeVO>();
|
||||
|
||||
try (MockedStatic<UsageEventUtils> ignored = Mockito.mockStatic(UsageEventUtils.class)) {
|
||||
Mockito.doReturn(Hypervisor.HypervisorType.KVM).when(userVmVoMock).getHypervisorType();
|
||||
|
||||
configureDoNothingForMethodsThatWeDoNotWantToTest();
|
||||
|
||||
Mockito.doThrow(InsufficientAddressCapacityException.class).when(userVmManagerImpl).updateVmNetwork(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(),
|
||||
Mockito.any(), Mockito.any());
|
||||
Mockito.any());
|
||||
|
||||
Assert.assertThrows(CloudRuntimeException.class, () -> userVmManagerImpl.executeStepsToChangeOwnershipOfVm(assignVmCmdMock, callerAccount, accountMock, accountMock,
|
||||
userVmVoMock, serviceOfferingVoMock, volumes, virtualMachineTemplateMock, 1l));
|
||||
|
||||
Mockito.verify(userVmManagerImpl).resourceCountDecrement(Mockito.anyLong(), Mockito.any(), Mockito.any(), Mockito.any());
|
||||
Mockito.verify(userVmManagerImpl).updateVmOwner(Mockito.any(), Mockito.any(), Mockito.anyLong(), Mockito.anyLong());
|
||||
Mockito.verify(userVmManagerImpl).updateVolumesOwner(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.anyLong());
|
||||
}
|
||||
}
|
||||
|
||||
@ -3072,14 +3063,19 @@ public class UserVmManagerImplTest {
|
||||
LinkedList<VolumeVO> volumes = new LinkedList<VolumeVO>();
|
||||
|
||||
try (MockedStatic<UsageEventUtils> ignored = Mockito.mockStatic(UsageEventUtils.class)) {
|
||||
Mockito.doReturn(Hypervisor.HypervisorType.KVM).when(userVmVoMock).getHypervisorType();
|
||||
|
||||
configureDoNothingForMethodsThatWeDoNotWantToTest();
|
||||
|
||||
Mockito.doThrow(ResourceAllocationException.class).when(userVmManagerImpl).updateVmNetwork(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(),
|
||||
Mockito.any(), Mockito.any());
|
||||
Mockito.any());
|
||||
|
||||
Assert.assertThrows(CloudRuntimeException.class, () -> userVmManagerImpl.executeStepsToChangeOwnershipOfVm(assignVmCmdMock, callerAccount, accountMock, accountMock,
|
||||
userVmVoMock, serviceOfferingVoMock, volumes, virtualMachineTemplateMock, 1l));
|
||||
|
||||
Mockito.verify(userVmManagerImpl).resourceCountDecrement(Mockito.anyLong(), Mockito.any(), Mockito.any(), Mockito.any());
|
||||
Mockito.verify(userVmManagerImpl).updateVmOwner(Mockito.any(), Mockito.any(), Mockito.anyLong(), Mockito.anyLong());
|
||||
Mockito.verify(userVmManagerImpl).updateVolumesOwner(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.anyLong());
|
||||
}
|
||||
}
|
||||
|
||||
@ -3102,7 +3098,7 @@ public class UserVmManagerImplTest {
|
||||
Mockito.verify(userVmManagerImpl).resourceCountDecrement(Mockito.anyLong(), Mockito.any(), Mockito.any(), Mockito.any());
|
||||
Mockito.verify(userVmManagerImpl).updateVmOwner(Mockito.any(), Mockito.any(), Mockito.anyLong(), Mockito.anyLong());
|
||||
Mockito.verify(userVmManagerImpl).updateVolumesOwner(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.anyLong());
|
||||
Mockito.verify(userVmManagerImpl).updateVmNetwork(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
|
||||
Mockito.verify(userVmManagerImpl).updateVmNetwork(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
|
||||
Mockito.verify(userVmManagerImpl).resourceCountIncrement(Mockito.anyLong(), Mockito.any(), Mockito.any(), Mockito.any());
|
||||
}
|
||||
}
|
||||
@ -3125,7 +3121,7 @@ public class UserVmManagerImplTest {
|
||||
Mockito.verify(userVmManagerImpl).resourceCountDecrement(Mockito.anyLong(), Mockito.any(), Mockito.any(), Mockito.any());
|
||||
Mockito.verify(userVmManagerImpl).updateVmOwner(Mockito.any(), Mockito.any(), Mockito.anyLong(), Mockito.anyLong());
|
||||
Mockito.verify(userVmManagerImpl).updateVolumesOwner(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.anyLong());
|
||||
Mockito.verify(userVmManagerImpl).updateVmNetwork(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
|
||||
Mockito.verify(userVmManagerImpl).updateVmNetwork(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
|
||||
Mockito.verify(userVmManagerImpl, Mockito.never()).resourceCountIncrement(Mockito.anyLong(), Mockito.any(), Mockito.any(), Mockito.any());
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user