Skip to content

Don't allow service offering change if encryption value would change #6776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 3 commits into from
Oct 7, 2022
Merged

Don't allow service offering change if encryption value would change #6776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc56e17
Don't change service offering if encryption value would change
Sep 19, 2022
aa3e71b
Add unit test for service offering encryption valudation
Sep 28, 2022
4363ef2
Merge branch 'main' into main-match-serviceoffering-encryption
mlsorensen Oct 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2092,14 +2092,21 @@ private boolean upgradeRunningVirtualMachine(Long vmId, Long newServiceOfferingI
return success;
}

private void validateDiskOfferingChecks(ServiceOfferingVO currentServiceOffering, ServiceOfferingVO newServiceOffering) {
protected void validateDiskOfferingChecks(ServiceOfferingVO currentServiceOffering, ServiceOfferingVO newServiceOffering) {
if (currentServiceOffering.getDiskOfferingStrictness() != newServiceOffering.getDiskOfferingStrictness()) {
throw new InvalidParameterValueException("Unable to Scale VM, since disk offering strictness flag is not same for new service offering and old service offering");
}

if (currentServiceOffering.getDiskOfferingStrictness() && currentServiceOffering.getDiskOfferingId() != newServiceOffering.getDiskOfferingId()) {
throw new InvalidParameterValueException("Unable to Scale VM, since disk offering id associated with the old service offering is not same for new service offering");
}

DiskOfferingVO currentRootDiskOffering = _diskOfferingDao.findByIdIncludingRemoved(currentServiceOffering.getDiskOfferingId());
DiskOfferingVO newRootDiskOffering = _diskOfferingDao.findById(newServiceOffering.getDiskOfferingId());

if (currentRootDiskOffering.getEncrypt() != newRootDiskOffering.getEncrypt()) {
throw new InvalidParameterValueException("Cannot change volume encryption type via service offering change");
}
}

private void changeDiskOfferingForRootVolume(Long vmId, DiskOfferingVO newDiskOffering, Map<String, String> customParameters) throws ResourceAllocationException {
Expand Down
42 changes: 42 additions & 0 deletions server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,34 @@ public void prepareResizeVolumeCmdTestNewOfferingSmaller() {
prepareAndRunResizeVolumeTest(2L, 10L, 20L, largerDisdkOffering, smallerDisdkOffering);
}

@Test
public void validateDiskOfferingCheckForEncryption1Test() {
ServiceOfferingVO currentOffering = prepareOfferingsForEncryptionValidation(1L, true);
ServiceOfferingVO newOffering = prepareOfferingsForEncryptionValidation(2L, true);
userVmManagerImpl.validateDiskOfferingChecks(currentOffering, newOffering);
}

@Test
public void validateDiskOfferingCheckForEncryption2Test() {
ServiceOfferingVO currentOffering = prepareOfferingsForEncryptionValidation(1L, false);
ServiceOfferingVO newOffering = prepareOfferingsForEncryptionValidation(2L, false);
userVmManagerImpl.validateDiskOfferingChecks(currentOffering, newOffering);
}

@Test (expected = InvalidParameterValueException.class)
public void validateDiskOfferingCheckForEncryptionFail1Test() {
ServiceOfferingVO currentOffering = prepareOfferingsForEncryptionValidation(1L, false);
ServiceOfferingVO newOffering = prepareOfferingsForEncryptionValidation(2L, true);
userVmManagerImpl.validateDiskOfferingChecks(currentOffering, newOffering);
}

@Test (expected = InvalidParameterValueException.class)
public void validateDiskOfferingCheckForEncryptionFail2Test() {
ServiceOfferingVO currentOffering = prepareOfferingsForEncryptionValidation(1L, true);
ServiceOfferingVO newOffering = prepareOfferingsForEncryptionValidation(2L, false);
userVmManagerImpl.validateDiskOfferingChecks(currentOffering, newOffering);
}

private void prepareAndRunResizeVolumeTest(Long expectedOfferingId, long expectedMinIops, long expectedMaxIops, DiskOfferingVO currentRootDiskOffering, DiskOfferingVO newRootDiskOffering) {
long rootVolumeId = 1l;
VolumeVO rootVolumeOfVm = Mockito.mock(VolumeVO.class);
Expand All @@ -588,6 +616,20 @@ private DiskOfferingVO prepareDiskOffering(long rootSize, long diskOfferingId, l
return newRootDiskOffering;
}

private ServiceOfferingVO prepareOfferingsForEncryptionValidation(long diskOfferingId, boolean encryption) {
ServiceOfferingVO svcOffering = Mockito.mock(ServiceOfferingVO.class);
DiskOfferingVO diskOffering = Mockito.mock(DiskOfferingVO.class);

Mockito.when(svcOffering.getDiskOfferingId()).thenReturn(diskOfferingId);
Mockito.when(diskOffering.getEncrypt()).thenReturn(encryption);

// Be aware - Multiple calls with the same disk offering ID could conflict
Mockito.when(diskOfferingDao.findByIdIncludingRemoved(diskOfferingId)).thenReturn(diskOffering);
Mockito.when(diskOfferingDao.findById(diskOfferingId)).thenReturn(diskOffering);

return svcOffering;
}

@Test (expected = CloudRuntimeException.class)
public void testUserDataDenyOverride() {
Long userDataId = 1L;
Expand Down