Allon Mureinik has uploaded a new change for review. Change subject: core: ImportVm test: activate insufficientDiskSpace ......................................................................
core: ImportVm test: activate insufficientDiskSpace Reactivated the insufficientDiskSpace() test (i.e., removed the @Ignore annotation). In order to make this test work again, disks were added to the mocked VM object, and some additional validations (e.g., image existence) were mocked away. Change-Id: I6745d17255e5a692d6b3b8f545e4807f25823628 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java 2 files changed, 35 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/28/9628/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java index 13f0ced..2a13daf 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java @@ -460,7 +460,7 @@ return true; } - private boolean checkImagesGUIDsLegal() { + protected boolean checkImagesGUIDsLegal() { for (DiskImage image : getVm().getImages()) { Guid imageGUID = image.getImageId(); Guid storagePoolId = image.getstorage_pool_id() != null ? image.getstorage_pool_id().getValue() diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java index beee638..4c4ef87 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java @@ -3,19 +3,23 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; +import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.Set; import javax.validation.ConstraintViolation; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.ovirt.engine.core.common.action.ImportVmParameters; import org.ovirt.engine.core.common.businessentities.BusinessEntitiesDefinitions; +import org.ovirt.engine.core.common.businessentities.Disk; +import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.core.common.businessentities.VM; @@ -34,7 +38,6 @@ public static MockConfigRule mcr = new MockConfigRule(); @Test - @Ignore public void insufficientDiskSpace() { final int lotsOfSpace = 1073741824; final int diskSpacePct = 0; @@ -63,7 +66,10 @@ doReturn(true).when(cmd).validateVdsCluster(); doReturn(true).when(cmd).validateUsbPolicy(); doReturn(true).when(cmd).canAddVm(); + doReturn(true).when(cmd).checkTemplateInStorageDomain(); + doReturn(true).when(cmd).checkImagesGUIDsLegal(); doReturn(createSourceDomain()).when(cmd).getSourceDomain(); + doReturn(createStorageDomain()).when(cmd).getStorageDomain(any(Guid.class)); doReturn(Collections.<VM> singletonList(createVM())).when(cmd).getVmsFromExportDomain(); doReturn(new VmTemplate()).when(cmd).getVmTemplate(); doReturn(new storage_pool()).when(cmd).getStoragePool(); @@ -82,7 +88,24 @@ protected VM createVM() { final VM v = new VM(); v.setId(Guid.NewGuid()); - v.setDiskSize(2); + + Guid imageGroupId = Guid.NewGuid(); + DiskImage baseImage = new DiskImage(); + baseImage.setId(imageGroupId); + baseImage.setImageId(Guid.NewGuid()); + baseImage.setSizeInGigabytes(1); + baseImage.setactive(false); + + DiskImage activeImage = new DiskImage(); + activeImage.setId(imageGroupId); + activeImage.setImageId(Guid.NewGuid()); + activeImage.setSizeInGigabytes(1); + activeImage.setactive(true); + activeImage.setParentId(baseImage.getImageId()); + + v.setDiskMap(Collections.<Guid, Disk> singletonMap(activeImage.getId(), activeImage)); + v.setImages(new ArrayList<DiskImage>(Arrays.asList(baseImage, activeImage))); + return v; } @@ -93,6 +116,14 @@ return sd; } + protected storage_domains createStorageDomain() { + storage_domains sd = new storage_domains(); + sd.setstorage_domain_type(StorageDomainType.Data); + sd.setstatus(StorageDomainStatus.Active); + sd.setavailable_disk_size(2); + return sd; + } + private static final String string100 = "0987654321" + "0987654321" + "0987654321" + -- To view, visit http://gerrit.ovirt.org/9628 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6745d17255e5a692d6b3b8f545e4807f25823628 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
