Vered Volansky has uploaded a new change for review. Change subject: core: Removed redundant storage allocation checks ......................................................................
core: Removed redundant storage allocation checks AddVmCommandTest contains storage allocation checks. StorageDomainValidator already has the necessary tests, no need for this redundancy. Therefore removing storage tests from AddVmCommandTest. Change-Id: Ia0e28f6cc8bd2834d6fe6ce6288a20946a69e9b3 Related-to: https://bugzilla.redhat.com/show_bug.cgi?id=917682 https://bugzilla.redhat.com/show_bug.cgi?id=1053742 Signed-off-by: Vered Volansky <vvola...@redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java 1 file changed, 0 insertions(+), 70 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/32/26732/1 diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java index 4a3777f..a7a19a5 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java @@ -142,55 +142,6 @@ } @Test - public void canAddVmFailSpaceThreshold() { - ArrayList<String> reasons = new ArrayList<String>(); - final int sizeRequired = 10; - final int domainSizeGB = 4; - AddVmCommand<VmManagementParametersBase> cmd = setupCanAddVmTests(domainSizeGB, sizeRequired); - doReturn(Collections.emptyList()).when(cmd).validateCustomProperties(any(VmStatic.class)); - assertFalse("vm could not be added", cmd.canAddVm(reasons, Arrays.asList(createStorageDomain(domainSizeGB)))); - assertTrue("canDoAction failed for the wrong reason", - cmd.getReturnValue() - .getCanDoActionMessages() - .contains(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW_ON_TARGET_STORAGE_DOMAIN.toString())); - } - - @Test - public void canAddThinVmFromTemplateWithManyDisks() { - ArrayList<String> reasons = new ArrayList<String>(); - final int domainSizeGB = 20; - final int sizeRequired = 10; - AddVmCommand<VmManagementParametersBase> cmd = setupCanAddVmTests(domainSizeGB, sizeRequired); - doReturn(Collections.emptyList()).when(cmd).validateCustomProperties(any(VmStatic.class)); - // Adding 10 disks, which each one should consume the default sparse size (which is 1GB). - setNewDisksForTemplate(10, cmd.getVmTemplate().getDiskTemplateMap()); - doReturn(createVmTemplate()).when(cmd).getVmTemplate(); - assertFalse("Thin vm could not be added due to storage sufficient", - cmd.canAddVm(reasons, Arrays.asList(createStorageDomain(domainSizeGB)))); - assertTrue("canDoAction failed for insufficient disk size", cmd.getReturnValue() - .getCanDoActionMessages() - .contains(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW_ON_TARGET_STORAGE_DOMAIN.toString())); - } - - @Test - public void canAddCloneVmFromTemplate() { - ArrayList<String> reasons = new ArrayList<String>(); - final int domainSizeGB = 15; - final int sizeRequired = 4; - AddVmFromTemplateCommand<AddVmFromTemplateParameters> cmd = - setupCanAddVmFromTemplateTests(domainSizeGB, sizeRequired); - - // Set new Disk Image map with 3GB. - setNewImageDiskMapForTemplate(cmd, 3000000000L, cmd.getVmTemplate().getDiskImageMap()); - assertFalse("Clone vm could not be added due to storage sufficient", - cmd.canAddVm(reasons, Arrays.asList(createStorageDomain(domainSizeGB)))); - assertTrue("canDoAction failed for insufficient disk size", - cmd.getReturnValue() - .getCanDoActionMessages() - .contains(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW_ON_TARGET_STORAGE_DOMAIN.toString())); - } - - @Test public void canAddCloneVmFromSnapshotSnapshotDoesNotExist() { final int domainSizeGB = 15; final int sizeRequired = 4; @@ -389,27 +340,6 @@ mockConfigSizeRequirements(sizeRequired); VM vm = createVm(); return vm; - } - - private static void setNewDisksForTemplate(int numberOfNewDisks, Map<Guid, DiskImage> disksMap) { - for (int newDiskInd = 0; newDiskInd < numberOfNewDisks; newDiskInd++) { - DiskImage diskImageTempalte = new DiskImage(); - diskImageTempalte.setImageId(Guid.newGuid()); - disksMap.put(Guid.newGuid(), diskImageTempalte); - } - } - - private static void setNewImageDiskMapForTemplate(AddVmFromTemplateCommand<AddVmFromTemplateParameters> cmd, - long diskSize, - Map<Guid, DiskImage> diskImageMap) { - DiskImage diskImage = new DiskImage(); - diskImage.setActualSizeInBytes(diskSize); - diskImage.setStorageIds(new ArrayList<Guid>(Arrays.asList(STORAGE_DOMAIN_ID))); - diskImageMap.put(Guid.newGuid(), diskImage); - cmd.storageToDisksMap = new HashMap<Guid, List<DiskImage>>(); - cmd.storageToDisksMap.put(STORAGE_DOMAIN_ID, - new ArrayList<DiskImage>(diskImageMap.values())); - doReturn(new VDSGroup()).when(cmd).getVdsGroup(); } private void mockBackend(AddVmCommand<?> cmd) { -- To view, visit http://gerrit.ovirt.org/26732 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia0e28f6cc8bd2834d6fe6ce6288a20946a69e9b3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vered Volansky <vvola...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
