mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-03 04:12:31 +01:00
[CLOUDSTACK-10230] User should not be able to use removed “Guest OS type” (#2404)
* [CLOUDSTACK-10230] User is able to change to “Guest OS type” that has been removed Users are able to change the OS type of VMs to “Guest OS type” that has been removed. This becomes a security issue when we try to force users to use HVM VMs (Meltdown/Spectre thing). A removed “guest os type” should not be usable by any users in the cloud.
This commit is contained in:
Rafael Weingärtner
dahn
parent
bbc9204665
commit
91d9821149
File diff suppressed because it is too large
Load Diff
@ -16,6 +16,7 @@
|
||||
// under the License.
|
||||
|
||||
package com.cloud.vm;
|
||||
|
||||
import static org.hamcrest.Matchers.instanceOf;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertFalse;
|
||||
@ -44,17 +45,6 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
import com.cloud.dc.VlanVO;
|
||||
import com.cloud.dc.dao.VlanDao;
|
||||
import com.cloud.network.dao.IPAddressVO;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.Mockito;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.mockito.Spy;
|
||||
|
||||
import org.apache.cloudstack.acl.ControlledEntity;
|
||||
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
|
||||
import org.apache.cloudstack.api.BaseCmd;
|
||||
@ -71,12 +61,23 @@ import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
|
||||
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
|
||||
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
|
||||
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.Mockito;
|
||||
import org.mockito.Spy;
|
||||
import org.mockito.runners.MockitoJUnitRunner;
|
||||
|
||||
import com.cloud.capacity.CapacityManager;
|
||||
import com.cloud.configuration.ConfigurationManager;
|
||||
import com.cloud.dc.DataCenter.NetworkType;
|
||||
import com.cloud.dc.DataCenterVO;
|
||||
import com.cloud.dc.VlanVO;
|
||||
import com.cloud.dc.dao.DataCenterDao;
|
||||
import com.cloud.dc.dao.VlanDao;
|
||||
import com.cloud.deploy.DeployDestination;
|
||||
import com.cloud.event.dao.UsageEventDao;
|
||||
import com.cloud.exception.ConcurrentOperationException;
|
||||
@ -93,6 +94,7 @@ import com.cloud.network.Network.GuestType;
|
||||
import com.cloud.network.Network.Service;
|
||||
import com.cloud.network.NetworkModel;
|
||||
import com.cloud.network.dao.IPAddressDao;
|
||||
import com.cloud.network.dao.IPAddressVO;
|
||||
import com.cloud.network.dao.NetworkDao;
|
||||
import com.cloud.network.dao.NetworkVO;
|
||||
import com.cloud.network.element.UserDataServiceProvider;
|
||||
@ -127,138 +129,107 @@ import com.cloud.vm.dao.VMInstanceDao;
|
||||
import com.cloud.vm.snapshot.VMSnapshotVO;
|
||||
import com.cloud.vm.snapshot.dao.VMSnapshotDao;
|
||||
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class UserVmManagerTest {
|
||||
|
||||
@Spy
|
||||
UserVmManagerImpl _userVmMgr = new UserVmManagerImpl();
|
||||
@InjectMocks
|
||||
private UserVmManagerImpl _userVmMgr;
|
||||
@Mock
|
||||
VirtualMachineManager _itMgr;
|
||||
private VirtualMachineManager _itMgr;
|
||||
@Mock
|
||||
VolumeOrchestrationService _storageMgr;
|
||||
private VolumeOrchestrationService _storageMgr;
|
||||
@Mock
|
||||
Account _account;
|
||||
private Account _account;
|
||||
@Mock
|
||||
AccountManager _accountMgr;
|
||||
private AccountManager _accountMgr;
|
||||
@Mock
|
||||
AccountService _accountService;
|
||||
private AccountService _accountService;
|
||||
@Mock
|
||||
ConfigurationManager _configMgr;
|
||||
private ConfigurationManager _configMgr;
|
||||
@Mock
|
||||
CapacityManager _capacityMgr;
|
||||
private CapacityManager _capacityMgr;
|
||||
@Mock
|
||||
AccountDao _accountDao;
|
||||
private AccountDao _accountDao;
|
||||
@Mock
|
||||
ConfigurationDao _configDao;
|
||||
private ConfigurationDao _configDao;
|
||||
@Mock
|
||||
UserDao _userDao;
|
||||
private UserDao _userDao;
|
||||
@Mock
|
||||
UserVmDao _vmDao;
|
||||
private UserVmDao _vmDao;
|
||||
@Mock
|
||||
VMInstanceDao _vmInstanceDao;
|
||||
private VMInstanceDao _vmInstanceDao;
|
||||
@Mock
|
||||
VMTemplateDao _templateDao;
|
||||
private VMTemplateDao _templateDao;
|
||||
@Mock
|
||||
TemplateDataStoreDao _templateStoreDao;
|
||||
private TemplateDataStoreDao _templateStoreDao;
|
||||
@Mock
|
||||
VolumeDao _volsDao;
|
||||
private VolumeDao _volsDao;
|
||||
@Mock
|
||||
RestoreVMCmd _restoreVMCmd;
|
||||
private RestoreVMCmd _restoreVMCmd;
|
||||
@Mock
|
||||
AccountVO _accountMock;
|
||||
private AccountVO _accountMock;
|
||||
@Mock
|
||||
UserVO _userMock;
|
||||
private UserVO _userMock;
|
||||
@Mock
|
||||
UserVmVO _vmMock;
|
||||
private UserVmVO _vmMock;
|
||||
@Mock
|
||||
VMInstanceVO _vmInstance;
|
||||
private VMInstanceVO _vmInstance;
|
||||
@Mock
|
||||
VMTemplateVO _templateMock;
|
||||
private VMTemplateVO _templateMock;
|
||||
@Mock
|
||||
TemplateDataStoreVO _templateDataStoreMock;
|
||||
private TemplateDataStoreVO _templateDataStoreMock;
|
||||
@Mock
|
||||
VolumeVO _volumeMock;
|
||||
private VolumeVO _volumeMock;
|
||||
@Mock
|
||||
List<VolumeVO> _rootVols;
|
||||
private List<VolumeVO> _rootVols;
|
||||
@Mock
|
||||
Account _accountMock2;
|
||||
private Account _accountMock2;
|
||||
@Mock
|
||||
ServiceOfferingDao _offeringDao;
|
||||
private ServiceOfferingDao _offeringDao;
|
||||
@Mock
|
||||
ServiceOfferingVO _offeringVo;
|
||||
private ServiceOfferingVO _offeringVo;
|
||||
@Mock
|
||||
EntityManager _entityMgr;
|
||||
private EntityManager _entityMgr;
|
||||
@Mock
|
||||
ResourceLimitService _resourceLimitMgr;
|
||||
private ResourceLimitService _resourceLimitMgr;
|
||||
@Mock
|
||||
PrimaryDataStoreDao _storagePoolDao;
|
||||
private PrimaryDataStoreDao _storagePoolDao;
|
||||
@Mock
|
||||
UsageEventDao _usageEventDao;
|
||||
private UsageEventDao _usageEventDao;
|
||||
@Mock
|
||||
VMSnapshotDao _vmSnapshotDao;
|
||||
private VMSnapshotDao _vmSnapshotDao;
|
||||
@Mock
|
||||
UpdateVmNicIpCmd _updateVmNicIpCmd;
|
||||
private UpdateVmNicIpCmd _updateVmNicIpCmd;
|
||||
@Mock
|
||||
NicDao _nicDao;
|
||||
private NicDao _nicDao;
|
||||
@Mock
|
||||
VlanDao _vlanDao;
|
||||
private VlanDao _vlanDao;
|
||||
@Mock
|
||||
NicVO _nicMock;
|
||||
private NicVO _nicMock;
|
||||
@Mock
|
||||
NetworkModel _networkModel;
|
||||
private NetworkModel _networkModel;
|
||||
@Mock
|
||||
NetworkDao _networkDao;
|
||||
private NetworkDao _networkDao;
|
||||
@Mock
|
||||
NetworkVO _networkMock;
|
||||
private NetworkVO _networkMock;
|
||||
@Mock
|
||||
DataCenterDao _dcDao;
|
||||
private DataCenterDao _dcDao;
|
||||
@Mock
|
||||
DataCenterVO _dcMock;
|
||||
private DataCenterVO _dcMock;
|
||||
@Mock
|
||||
IpAddressManager _ipAddrMgr;
|
||||
private IpAddressManager _ipAddrMgr;
|
||||
@Mock
|
||||
IPAddressDao _ipAddressDao;
|
||||
private IPAddressDao _ipAddressDao;
|
||||
@Mock
|
||||
NetworkOfferingDao _networkOfferingDao;
|
||||
private NetworkOfferingDao _networkOfferingDao;
|
||||
@Mock
|
||||
NetworkOfferingVO _networkOfferingMock;
|
||||
private NetworkOfferingVO _networkOfferingMock;
|
||||
@Mock
|
||||
NetworkOrchestrationService _networkMgr;
|
||||
private NetworkOrchestrationService _networkMgr;
|
||||
|
||||
@Before
|
||||
public void setup() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
|
||||
_userVmMgr._vmDao = _vmDao;
|
||||
_userVmMgr._vmInstanceDao = _vmInstanceDao;
|
||||
_userVmMgr._templateDao = _templateDao;
|
||||
_userVmMgr._templateStoreDao = _templateStoreDao;
|
||||
_userVmMgr._volsDao = _volsDao;
|
||||
_userVmMgr._usageEventDao = _usageEventDao;
|
||||
_userVmMgr._itMgr = _itMgr;
|
||||
_userVmMgr.volumeMgr = _storageMgr;
|
||||
_userVmMgr._accountDao = _accountDao;
|
||||
_userVmMgr._accountService = _accountService;
|
||||
_userVmMgr._userDao = _userDao;
|
||||
_userVmMgr._accountMgr = _accountMgr;
|
||||
_userVmMgr._configMgr = _configMgr;
|
||||
_userVmMgr._offeringDao = _offeringDao;
|
||||
_userVmMgr._capacityMgr = _capacityMgr;
|
||||
_userVmMgr._resourceLimitMgr = _resourceLimitMgr;
|
||||
_userVmMgr._scaleRetry = 2;
|
||||
_userVmMgr._entityMgr = _entityMgr;
|
||||
_userVmMgr._storagePoolDao = _storagePoolDao;
|
||||
_userVmMgr._vmSnapshotDao = _vmSnapshotDao;
|
||||
_userVmMgr._configDao = _configDao;
|
||||
_userVmMgr._nicDao = _nicDao;
|
||||
_userVmMgr._vlanDao = _vlanDao;
|
||||
_userVmMgr._networkModel = _networkModel;
|
||||
_userVmMgr._networkDao = _networkDao;
|
||||
_userVmMgr._dcDao = _dcDao;
|
||||
_userVmMgr._ipAddrMgr = _ipAddrMgr;
|
||||
_userVmMgr._ipAddressDao = _ipAddressDao;
|
||||
_userVmMgr._networkOfferingDao = _networkOfferingDao;
|
||||
_userVmMgr._networkMgr = _networkMgr;
|
||||
|
||||
doReturn(3L).when(_account).getId();
|
||||
doReturn(8L).when(_vmMock).getAccountId();
|
||||
when(_accountDao.findById(anyLong())).thenReturn(_accountMock);
|
||||
@ -267,43 +238,40 @@ public class UserVmManagerTest {
|
||||
when(_vmMock.getId()).thenReturn(314L);
|
||||
when(_vmInstance.getId()).thenReturn(1L);
|
||||
when(_vmInstance.getServiceOfferingId()).thenReturn(2L);
|
||||
List<VMSnapshotVO> mockList = mock(List.class);
|
||||
|
||||
List<VMSnapshotVO> mockList = new ArrayList<>();
|
||||
when(_vmSnapshotDao.findByVm(anyLong())).thenReturn(mockList);
|
||||
when(mockList.size()).thenReturn(0);
|
||||
when(_templateStoreDao.findByTemplateZoneReady(anyLong(),anyLong())).thenReturn(_templateDataStoreMock);
|
||||
when(_templateStoreDao.findByTemplateZoneReady(anyLong(), anyLong())).thenReturn(_templateDataStoreMock);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testValidateRootDiskResize()
|
||||
{
|
||||
public void testValidateRootDiskResize() {
|
||||
HypervisorType hypervisorType = HypervisorType.Any;
|
||||
Long rootDiskSize = Long.valueOf(10);
|
||||
UserVmVO vm = Mockito.mock(UserVmVO.class);
|
||||
UserVmVO vm = Mockito.mock(UserVmVO.class);
|
||||
VMTemplateVO templateVO = Mockito.mock(VMTemplateVO.class);
|
||||
Map<String, String> customParameters = new HashMap<String, String>();
|
||||
Map<String, String> vmDetals = new HashMap<String, String>();
|
||||
|
||||
|
||||
vmDetals.put("rootDiskController","ide");
|
||||
vmDetals.put("rootDiskController", "ide");
|
||||
when(vm.getDetails()).thenReturn(vmDetals);
|
||||
when(templateVO.getSize()).thenReturn((rootDiskSize<<30)+1);
|
||||
when(templateVO.getSize()).thenReturn((rootDiskSize << 30) + 1);
|
||||
//Case 1: >
|
||||
try{
|
||||
try {
|
||||
_userVmMgr.validateRootDiskResize(hypervisorType, rootDiskSize, templateVO, vm, customParameters);
|
||||
Assert.fail("Function should throw InvalidParameterValueException");
|
||||
}catch(Exception e){
|
||||
} catch (Exception e) {
|
||||
assertThat(e, instanceOf(InvalidParameterValueException.class));
|
||||
}
|
||||
|
||||
//Case 2: =
|
||||
when(templateVO.getSize()).thenReturn((rootDiskSize<<30));
|
||||
customParameters.put("rootdisksize","10");
|
||||
when(templateVO.getSize()).thenReturn((rootDiskSize << 30));
|
||||
customParameters.put("rootdisksize", "10");
|
||||
_userVmMgr.validateRootDiskResize(hypervisorType, rootDiskSize, templateVO, vm, customParameters);
|
||||
assert(!customParameters.containsKey("rootdisksize"));
|
||||
assert (!customParameters.containsKey("rootdisksize"));
|
||||
|
||||
when(templateVO.getSize()).thenReturn((rootDiskSize<<30)-1);
|
||||
when(templateVO.getSize()).thenReturn((rootDiskSize << 30) - 1);
|
||||
|
||||
//Case 3: <
|
||||
|
||||
@ -315,12 +283,12 @@ public class UserVmManagerTest {
|
||||
try {
|
||||
_userVmMgr.validateRootDiskResize(hypervisorType, rootDiskSize, templateVO, vm, customParameters);
|
||||
Assert.fail("Function should throw InvalidParameterValueException");
|
||||
}catch(Exception e) {
|
||||
} catch (Exception e) {
|
||||
assertThat(e, instanceOf(InvalidParameterValueException.class));
|
||||
}
|
||||
|
||||
//Case 3.3: 1->(rootDiskController==scsi)
|
||||
vmDetals.put("rootDiskController","scsi");
|
||||
vmDetals.put("rootDiskController", "scsi");
|
||||
_userVmMgr.validateRootDiskResize(hypervisorType, rootDiskSize, templateVO, vm, customParameters);
|
||||
}
|
||||
|
||||
@ -344,8 +312,7 @@ public class UserVmManagerTest {
|
||||
|
||||
// Test restoreVm when VM is in stopped state
|
||||
@Test
|
||||
public void testRestoreVMF2() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
|
||||
ResourceAllocationException {
|
||||
public void testRestoreVMF2() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException {
|
||||
|
||||
doReturn(VirtualMachine.State.Stopped).when(_vmMock).getState();
|
||||
when(_vmDao.findById(anyLong())).thenReturn(_vmMock);
|
||||
@ -381,8 +348,7 @@ public class UserVmManagerTest {
|
||||
|
||||
// Test restoreVM when VM is in running state
|
||||
@Test
|
||||
public void testRestoreVMF3() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
|
||||
ResourceAllocationException {
|
||||
public void testRestoreVMF3() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException {
|
||||
|
||||
doReturn(VirtualMachine.State.Running).when(_vmMock).getState();
|
||||
when(_vmDao.findById(anyLong())).thenReturn(_vmMock);
|
||||
@ -418,8 +384,7 @@ public class UserVmManagerTest {
|
||||
|
||||
// Test restoreVM on providing new template Id, when VM is in running state
|
||||
@Test
|
||||
public void testRestoreVMF4() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
|
||||
ResourceAllocationException {
|
||||
public void testRestoreVMF4() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException {
|
||||
doReturn(VirtualMachine.State.Running).when(_vmMock).getState();
|
||||
when(_vmDao.findById(anyLong())).thenReturn(_vmMock);
|
||||
when(_volsDao.findByInstanceAndType(314L, Volume.Type.ROOT)).thenReturn(_rootVols);
|
||||
@ -438,9 +403,9 @@ public class UserVmManagerTest {
|
||||
doNothing().when(_volsDao).attachVolume(anyLong(), anyLong(), anyLong());
|
||||
when(_volumeMock.getId()).thenReturn(3L);
|
||||
doNothing().when(_volsDao).detachVolume(anyLong());
|
||||
List<VMSnapshotVO> mockList = mock(List.class);
|
||||
|
||||
List<VMSnapshotVO> mockList = new ArrayList<>();
|
||||
when(_vmSnapshotDao.findByVm(anyLong())).thenReturn(mockList);
|
||||
when(mockList.size()).thenReturn(0);
|
||||
when(_templateMock.getUuid()).thenReturn("b1a3626e-72e0-4697-8c7c-a110940cc55d");
|
||||
|
||||
Account account = new AccountVO("testaccount", 1L, "networkdomain", (short)0, "uuid");
|
||||
@ -458,13 +423,12 @@ public class UserVmManagerTest {
|
||||
} finally {
|
||||
CallContext.unregister();
|
||||
}
|
||||
|
||||
verify(_vmMock, times(0)).setIsoId(Mockito.anyLong());
|
||||
}
|
||||
|
||||
// Test restoreVM on providing new ISO Id, when VM(deployed using ISO) is in running state
|
||||
@Test
|
||||
public void testRestoreVMF5() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
|
||||
ResourceAllocationException {
|
||||
public void testRestoreVMF5() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException {
|
||||
doReturn(VirtualMachine.State.Running).when(_vmMock).getState();
|
||||
when(_vmDao.findById(anyLong())).thenReturn(_vmMock);
|
||||
when(_volsDao.findByInstanceAndType(314L, Volume.Type.ROOT)).thenReturn(_rootVols);
|
||||
@ -485,9 +449,9 @@ public class UserVmManagerTest {
|
||||
doNothing().when(_volsDao).attachVolume(anyLong(), anyLong(), anyLong());
|
||||
when(_volumeMock.getId()).thenReturn(3L);
|
||||
doNothing().when(_volsDao).detachVolume(anyLong());
|
||||
List<VMSnapshotVO> mockList = mock(List.class);
|
||||
List<VMSnapshotVO> mockList = new ArrayList<>();
|
||||
when(_vmSnapshotDao.findByVm(anyLong())).thenReturn(mockList);
|
||||
when(mockList.size()).thenReturn(0);
|
||||
|
||||
when(_templateMock.getUuid()).thenReturn("b1a3626e-72e0-4697-8c7c-a110940cc55d");
|
||||
|
||||
Account account = new AccountVO("testaccount", 1L, "networkdomain", (short)0, "uuid");
|
||||
@ -512,7 +476,7 @@ public class UserVmManagerTest {
|
||||
|
||||
// Test scaleVm on incompatible HV.
|
||||
@Test(expected = InvalidParameterValueException.class)
|
||||
public void testScaleVMF1() throws Exception {
|
||||
public void testScaleVMF1() throws Exception {
|
||||
|
||||
ScaleVMCmd cmd = new ScaleVMCmd();
|
||||
Class<?> _class = cmd.getClass();
|
||||
@ -527,7 +491,7 @@ public class UserVmManagerTest {
|
||||
|
||||
when(_vmInstanceDao.findById(anyLong())).thenReturn(_vmInstance);
|
||||
|
||||
// UserContext.current().setEventDetails("Vm Id: "+getId());
|
||||
// UserContext.current().setEventDetails("Vm Id: "+getId());
|
||||
Account account = new AccountVO("testaccount", 1L, "networkdomain", (short)0, "uuid");
|
||||
UserVO user = new UserVO(1, "testuser", "password", "firstname", "lastName", "email", "timezone", UUID.randomUUID().toString(), User.Source.UNKNOWN);
|
||||
//AccountVO(String accountName, long domainId, String networkDomain, short type, int regionId)
|
||||
@ -544,7 +508,7 @@ public class UserVmManagerTest {
|
||||
|
||||
// Test scaleVm on equal service offerings.
|
||||
@Test(expected = InvalidParameterValueException.class)
|
||||
public void testScaleVMF2() throws Exception {
|
||||
public void testScaleVMF2() throws Exception {
|
||||
|
||||
ScaleVMCmd cmd = new ScaleVMCmd();
|
||||
Class<?> _class = cmd.getClass();
|
||||
@ -566,9 +530,7 @@ public class UserVmManagerTest {
|
||||
|
||||
doNothing().when(_itMgr).checkIfCanUpgrade(_vmMock, _offeringVo);
|
||||
|
||||
ServiceOffering so1 = getSvcoffering(512);
|
||||
ServiceOffering so2 = getSvcoffering(256);
|
||||
|
||||
ServiceOffering so1 = getSvcoffering(512);
|
||||
when(_offeringDao.findById(anyLong())).thenReturn((ServiceOfferingVO)so1);
|
||||
when(_offeringDao.findByIdIncludingRemoved(anyLong(), anyLong())).thenReturn((ServiceOfferingVO)so1);
|
||||
|
||||
@ -585,7 +547,7 @@ public class UserVmManagerTest {
|
||||
|
||||
// Test scaleVm for Stopped vm.
|
||||
//@Test(expected=InvalidParameterValueException.class)
|
||||
public void testScaleVMF3() throws Exception {
|
||||
public void testScaleVMF3() throws Exception {
|
||||
|
||||
ScaleVMCmd cmd = new ScaleVMCmd();
|
||||
Class<?> _class = cmd.getClass();
|
||||
@ -601,8 +563,8 @@ public class UserVmManagerTest {
|
||||
when(_vmInstanceDao.findById(anyLong())).thenReturn(_vmInstance);
|
||||
doReturn(Hypervisor.HypervisorType.XenServer).when(_vmInstance).getHypervisorType();
|
||||
|
||||
ServiceOffering so1 = getSvcoffering(512);
|
||||
ServiceOffering so2 = getSvcoffering(256);
|
||||
ServiceOffering so1 = getSvcoffering(512);
|
||||
ServiceOffering so2 = getSvcoffering(256);
|
||||
|
||||
when(_entityMgr.findById(eq(ServiceOffering.class), anyLong())).thenReturn(so2);
|
||||
when(_entityMgr.findById(ServiceOffering.class, 1L)).thenReturn(so1);
|
||||
@ -626,7 +588,7 @@ public class UserVmManagerTest {
|
||||
}
|
||||
|
||||
// Test scaleVm for Running vm. Full positive test.
|
||||
public void testScaleVMF4() throws Exception {
|
||||
public void testScaleVMF4() throws Exception {
|
||||
|
||||
ScaleVMCmd cmd = new ScaleVMCmd();
|
||||
Class<?> _class = cmd.getClass();
|
||||
@ -647,8 +609,8 @@ public class UserVmManagerTest {
|
||||
when(_vmInstanceDao.findById(anyLong())).thenReturn(_vmInstance);
|
||||
doReturn(Hypervisor.HypervisorType.XenServer).when(_vmInstance).getHypervisorType();
|
||||
|
||||
ServiceOffering so1 = getSvcoffering(512);
|
||||
ServiceOffering so2 = getSvcoffering(256);
|
||||
ServiceOffering so1 = getSvcoffering(512);
|
||||
ServiceOffering so2 = getSvcoffering(256);
|
||||
|
||||
when(_entityMgr.findById(eq(ServiceOffering.class), anyLong())).thenReturn(so2);
|
||||
when(_entityMgr.findById(ServiceOffering.class, 1L)).thenReturn(so1);
|
||||
@ -656,7 +618,7 @@ public class UserVmManagerTest {
|
||||
doReturn(VirtualMachine.State.Running).when(_vmInstance).getState();
|
||||
|
||||
//when(ApiDBUtils.getCpuOverprovisioningFactor()).thenReturn(3f);
|
||||
when(_capacityMgr.checkIfHostHasCapacity(anyLong(), anyInt(), anyLong(), anyBoolean(), anyFloat(), anyFloat(), anyBoolean())).thenReturn(false);
|
||||
when(_capacityMgr.checkIfHostHasCapacity(anyLong(), anyInt(), anyLong(), anyBoolean(), anyFloat(), anyFloat(), anyBoolean())).thenReturn(false);
|
||||
when(_itMgr.reConfigureVm(_vmInstance.getUuid(), so1, false)).thenReturn(_vmInstance);
|
||||
|
||||
doReturn(true).when(_itMgr).upgradeVmDb(anyLong(), anyLong());
|
||||
@ -675,8 +637,6 @@ public class UserVmManagerTest {
|
||||
}
|
||||
|
||||
private ServiceOfferingVO getSvcoffering(int ramSize) {
|
||||
|
||||
long id = 4L;
|
||||
String name = "name";
|
||||
String displayText = "displayText";
|
||||
int cpu = 1;
|
||||
@ -686,15 +646,14 @@ public class UserVmManagerTest {
|
||||
boolean ha = false;
|
||||
boolean useLocalStorage = false;
|
||||
|
||||
ServiceOfferingVO serviceOffering =
|
||||
new ServiceOfferingVO(name, cpu, ramSize, speed, null, null, ha, displayText, Storage.ProvisioningType.THIN,
|
||||
useLocalStorage, false, null, false, null, false);
|
||||
ServiceOfferingVO serviceOffering = new ServiceOfferingVO(name, cpu, ramSize, speed, null, null, ha, displayText, Storage.ProvisioningType.THIN, useLocalStorage, false, null, false, null,
|
||||
false);
|
||||
return serviceOffering;
|
||||
}
|
||||
|
||||
// Test Move VM b/w accounts where caller is not ROOT/Domain admin
|
||||
@Test(expected = InvalidParameterValueException.class)
|
||||
public void testMoveVmToUser1() throws Exception {
|
||||
public void testMoveVmToUser1() throws Exception {
|
||||
AssignVMCmd cmd = new AssignVMCmd();
|
||||
Class<?> _class = cmd.getClass();
|
||||
|
||||
@ -717,7 +676,7 @@ public class UserVmManagerTest {
|
||||
CallContext.register(user, caller);
|
||||
try {
|
||||
|
||||
_userVmMgr.moveVMToUser(cmd);
|
||||
_userVmMgr.moveVMToUser(cmd);
|
||||
} finally {
|
||||
CallContext.unregister();
|
||||
}
|
||||
@ -725,7 +684,7 @@ public class UserVmManagerTest {
|
||||
|
||||
// Test Move VM b/w accounts where caller doesn't have access to the old or new account
|
||||
@Test(expected = PermissionDeniedException.class)
|
||||
public void testMoveVmToUser2() throws Exception {
|
||||
public void testMoveVmToUser2() throws Exception {
|
||||
AssignVMCmd cmd = new AssignVMCmd();
|
||||
Class<?> _class = cmd.getClass();
|
||||
|
||||
@ -756,8 +715,7 @@ public class UserVmManagerTest {
|
||||
|
||||
when(_accountMgr.finalizeOwner(any(Account.class), anyString(), anyLong(), anyLong())).thenReturn(newAccount);
|
||||
|
||||
doThrow(new PermissionDeniedException("Access check failed")).when(_accountMgr).checkAccess(any(Account.class), any(AccessType.class), any(Boolean.class),
|
||||
any(ControlledEntity.class));
|
||||
doThrow(new PermissionDeniedException("Access check failed")).when(_accountMgr).checkAccess(any(Account.class), any(AccessType.class), any(Boolean.class), any(ControlledEntity.class));
|
||||
|
||||
CallContext.register(user, caller);
|
||||
|
||||
@ -805,7 +763,8 @@ public class UserVmManagerTest {
|
||||
when(_dcMock.getNetworkType()).thenReturn(NetworkType.Advanced);
|
||||
|
||||
when(_ipAddrMgr.allocateGuestIP(Mockito.eq(_networkMock), anyString())).thenReturn("10.10.10.10");
|
||||
doNothing().when(_networkMgr).implementNetworkElementsAndResources(Mockito.any(DeployDestination.class), Mockito.any(ReservationContext.class), Mockito.eq(_networkMock), Mockito.eq(_networkOfferingMock));
|
||||
doNothing().when(_networkMgr).implementNetworkElementsAndResources(Mockito.any(DeployDestination.class), Mockito.any(ReservationContext.class), Mockito.eq(_networkMock),
|
||||
Mockito.eq(_networkOfferingMock));
|
||||
when(_nicDao.persist(any(NicVO.class))).thenReturn(nic);
|
||||
|
||||
Account caller = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString());
|
||||
|
||||
224
server/test/com/cloud/vm/UserVmManagerImplTest.java
Normal file
224
server/test/com/cloud/vm/UserVmManagerImplTest.java
Normal file
@ -0,0 +1,224 @@
|
||||
// Licensed to the Apache Software Foundation (ASF) under one
|
||||
// or more contributor license agreements. See the NOTICE file
|
||||
// distributed with this work for additional information
|
||||
// regarding copyright ownership. The ASF licenses this file
|
||||
// to you under the Apache License, Version 2.0 (the
|
||||
// "License"); you may not use this file except in compliance
|
||||
// with the License. You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing,
|
||||
// software distributed under the License is distributed on an
|
||||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
// KIND, either express or implied. See the License for the
|
||||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
package com.cloud.vm;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
|
||||
import org.apache.cloudstack.api.BaseCmd.HTTPMethod;
|
||||
import org.apache.cloudstack.api.command.user.vm.UpdateVMCmd;
|
||||
import org.apache.cloudstack.context.CallContext;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.BDDMockito;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.Mockito;
|
||||
import org.mockito.Spy;
|
||||
import org.powermock.api.mockito.PowerMockito;
|
||||
import org.powermock.core.classloader.annotations.PrepareForTest;
|
||||
import org.powermock.modules.junit4.PowerMockRunner;
|
||||
|
||||
import com.cloud.exception.InsufficientCapacityException;
|
||||
import com.cloud.exception.InvalidParameterValueException;
|
||||
import com.cloud.exception.ResourceUnavailableException;
|
||||
import com.cloud.storage.GuestOSVO;
|
||||
import com.cloud.storage.dao.GuestOSDao;
|
||||
import com.cloud.user.Account;
|
||||
import com.cloud.user.AccountManager;
|
||||
import com.cloud.uservm.UserVm;
|
||||
import com.cloud.vm.dao.UserVmDao;
|
||||
import com.cloud.vm.dao.UserVmDetailsDao;
|
||||
|
||||
@RunWith(PowerMockRunner.class)
|
||||
public class UserVmManagerImplTest {
|
||||
|
||||
@Spy
|
||||
@InjectMocks
|
||||
private UserVmManagerImpl userVmManagerImpl = new UserVmManagerImpl();
|
||||
|
||||
@Mock
|
||||
private GuestOSDao guestOSDao;
|
||||
|
||||
@Mock
|
||||
private UserVmDao userVmDao;
|
||||
|
||||
@Mock
|
||||
private UpdateVMCmd updateVmCommand;
|
||||
|
||||
@Mock
|
||||
private AccountManager accountManager;
|
||||
|
||||
@Mock
|
||||
private UserVmDetailsDao userVmDetailVO;
|
||||
|
||||
@Mock
|
||||
private UserVmVO userVmVoMock;
|
||||
|
||||
private long vmId = 1l;
|
||||
|
||||
@Before
|
||||
public void beforeTest() {
|
||||
Mockito.when(updateVmCommand.getId()).thenReturn(vmId);
|
||||
|
||||
Mockito.when(userVmDao.findById(Mockito.eq(vmId))).thenReturn(userVmVoMock);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void validateGuestOsIdForUpdateVirtualMachineCommandTestOsTypeNull() {
|
||||
Mockito.when(updateVmCommand.getOsTypeId()).thenReturn(null);
|
||||
userVmManagerImpl.validateGuestOsIdForUpdateVirtualMachineCommand(updateVmCommand);
|
||||
}
|
||||
|
||||
@Test(expected = InvalidParameterValueException.class)
|
||||
public void validateGuestOsIdForUpdateVirtualMachineCommandTestOsTypeNotFound() {
|
||||
Mockito.when(updateVmCommand.getOsTypeId()).thenReturn(1l);
|
||||
|
||||
userVmManagerImpl.validateGuestOsIdForUpdateVirtualMachineCommand(updateVmCommand);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void validateGuestOsIdForUpdateVirtualMachineCommandTestOsTypeFound() {
|
||||
Mockito.when(updateVmCommand.getOsTypeId()).thenReturn(1l);
|
||||
Mockito.when(guestOSDao.findById(Mockito.eq(1l))).thenReturn(Mockito.mock(GuestOSVO.class));
|
||||
|
||||
userVmManagerImpl.validateGuestOsIdForUpdateVirtualMachineCommand(updateVmCommand);
|
||||
}
|
||||
|
||||
@Test(expected = InvalidParameterValueException.class)
|
||||
public void validateInputsAndPermissionForUpdateVirtualMachineCommandTestVmNotFound() {
|
||||
Mockito.when(userVmDao.findById(Mockito.eq(vmId))).thenReturn(null);
|
||||
|
||||
userVmManagerImpl.validateInputsAndPermissionForUpdateVirtualMachineCommand(updateVmCommand);
|
||||
}
|
||||
|
||||
@Test
|
||||
@PrepareForTest(CallContext.class)
|
||||
public void validateInputsAndPermissionForUpdateVirtualMachineCommandTest() {
|
||||
Mockito.doNothing().when(userVmManagerImpl).validateGuestOsIdForUpdateVirtualMachineCommand(updateVmCommand);
|
||||
|
||||
Account accountMock = Mockito.mock(Account.class);
|
||||
CallContext callContextMock = Mockito.mock(CallContext.class);
|
||||
|
||||
PowerMockito.mockStatic(CallContext.class);
|
||||
BDDMockito.given(CallContext.current()).willReturn(callContextMock);
|
||||
Mockito.when(callContextMock.getCallingAccount()).thenReturn(accountMock);
|
||||
|
||||
Mockito.doNothing().when(accountManager).checkAccess(accountMock, null, true, userVmVoMock);
|
||||
userVmManagerImpl.validateInputsAndPermissionForUpdateVirtualMachineCommand(updateVmCommand);
|
||||
|
||||
Mockito.verify(userVmManagerImpl).validateGuestOsIdForUpdateVirtualMachineCommand(updateVmCommand);
|
||||
Mockito.verify(accountManager).checkAccess(accountMock, null, true, userVmVoMock);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateVirtualMachineTestDisplayChanged() throws ResourceUnavailableException, InsufficientCapacityException {
|
||||
configureDoNothingForMethodsThatWeDoNotWantToTest();
|
||||
|
||||
Mockito.when(userVmVoMock.isDisplay()).thenReturn(true);
|
||||
Mockito.doNothing().when(userVmManagerImpl).updateDisplayVmFlag(false, vmId, userVmVoMock);
|
||||
|
||||
userVmManagerImpl.updateVirtualMachine(updateVmCommand);
|
||||
verifyMethodsThatAreAlwaysExecuted();
|
||||
|
||||
Mockito.verify(userVmManagerImpl).updateDisplayVmFlag(false, vmId, userVmVoMock);
|
||||
Mockito.verify(userVmDetailVO, Mockito.times(0)).removeDetails(vmId);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateVirtualMachineTestCleanUpTrue() throws ResourceUnavailableException, InsufficientCapacityException {
|
||||
configureDoNothingForMethodsThatWeDoNotWantToTest();
|
||||
|
||||
Mockito.when(updateVmCommand.isCleanupDetails()).thenReturn(true);
|
||||
|
||||
Mockito.doNothing().when(userVmManagerImpl).updateDisplayVmFlag(false, vmId, userVmVoMock);
|
||||
Mockito.doNothing().when(userVmDetailVO).removeDetails(vmId);
|
||||
|
||||
userVmManagerImpl.updateVirtualMachine(updateVmCommand);
|
||||
verifyMethodsThatAreAlwaysExecuted();
|
||||
Mockito.verify(userVmDetailVO).removeDetails(vmId);
|
||||
Mockito.verify(userVmManagerImpl, Mockito.times(0)).updateDisplayVmFlag(false, vmId, userVmVoMock);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateVirtualMachineTestCleanUpTrueAndDetailEmpty() throws ResourceUnavailableException, InsufficientCapacityException {
|
||||
prepareAndExecuteMethodDealingWithDetails(true, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateVirtualMachineTestCleanUpTrueAndDetailsNotEmpty() throws ResourceUnavailableException, InsufficientCapacityException {
|
||||
prepareAndExecuteMethodDealingWithDetails(true, false);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateVirtualMachineTestCleanUpFalseAndDetailsNotEmpty() throws ResourceUnavailableException, InsufficientCapacityException {
|
||||
prepareAndExecuteMethodDealingWithDetails(false, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateVirtualMachineTestCleanUpFalseAndDetailsEmpty() throws ResourceUnavailableException, InsufficientCapacityException {
|
||||
prepareAndExecuteMethodDealingWithDetails(false, false);
|
||||
}
|
||||
|
||||
private void prepareAndExecuteMethodDealingWithDetails(boolean cleanUpDetails, boolean isDetailsEmpty) throws ResourceUnavailableException, InsufficientCapacityException {
|
||||
configureDoNothingForMethodsThatWeDoNotWantToTest();
|
||||
|
||||
HashMap<String, String> details = new HashMap<>();
|
||||
if(!isDetailsEmpty) {
|
||||
details.put("", "");
|
||||
}
|
||||
Mockito.when(updateVmCommand.getDetails()).thenReturn(details);
|
||||
Mockito.when(updateVmCommand.isCleanupDetails()).thenReturn(cleanUpDetails);
|
||||
|
||||
configureDoNothingForDetailsMethod();
|
||||
|
||||
userVmManagerImpl.updateVirtualMachine(updateVmCommand);
|
||||
verifyMethodsThatAreAlwaysExecuted();
|
||||
|
||||
Mockito.verify(userVmVoMock, Mockito.times(cleanUpDetails || isDetailsEmpty ? 0 : 1)).setDetails(details);
|
||||
Mockito.verify(userVmDetailVO, Mockito.times(cleanUpDetails ? 1: 0)).removeDetails(vmId);
|
||||
Mockito.verify(userVmDao, Mockito.times(cleanUpDetails || isDetailsEmpty ? 0 : 1)).saveDetails(userVmVoMock);
|
||||
Mockito.verify(userVmManagerImpl, Mockito.times(0)).updateDisplayVmFlag(false, vmId, userVmVoMock);
|
||||
}
|
||||
|
||||
private void configureDoNothingForDetailsMethod() {
|
||||
Mockito.doNothing().when(userVmManagerImpl).updateDisplayVmFlag(false, vmId, userVmVoMock);
|
||||
Mockito.doNothing().when(userVmDetailVO).removeDetails(vmId);
|
||||
Mockito.doNothing().when(userVmDao).saveDetails(userVmVoMock);
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private void verifyMethodsThatAreAlwaysExecuted() throws ResourceUnavailableException, InsufficientCapacityException {
|
||||
Mockito.verify(userVmManagerImpl).validateInputsAndPermissionForUpdateVirtualMachineCommand(updateVmCommand);
|
||||
Mockito.verify(userVmManagerImpl).getSecurityGroupIdList(updateVmCommand);
|
||||
Mockito.verify(userVmManagerImpl).updateVirtualMachine(Mockito.anyLong(), Mockito.anyString(), Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyBoolean(), Mockito.anyLong(),
|
||||
Mockito.anyString(), Mockito.anyBoolean(), Mockito.any(HTTPMethod.class), Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyListOf(Long.class),
|
||||
Mockito.anyMap());
|
||||
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private void configureDoNothingForMethodsThatWeDoNotWantToTest() throws ResourceUnavailableException, InsufficientCapacityException {
|
||||
Mockito.doNothing().when(userVmManagerImpl).validateInputsAndPermissionForUpdateVirtualMachineCommand(updateVmCommand);
|
||||
Mockito.doReturn(new ArrayList<Long>()).when(userVmManagerImpl).getSecurityGroupIdList(updateVmCommand);
|
||||
Mockito.doReturn(Mockito.mock(UserVm.class)).when(userVmManagerImpl).updateVirtualMachine(Mockito.anyLong(), Mockito.anyString(), Mockito.anyString(), Mockito.anyBoolean(),
|
||||
Mockito.anyBoolean(), Mockito.anyLong(),
|
||||
Mockito.anyString(), Mockito.anyBoolean(), Mockito.any(HTTPMethod.class), Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyListOf(Long.class),
|
||||
Mockito.anyMap());
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user