Vered Volansky has posted comments on this change. Change subject: core: change import vm to be VmCommand - part 3 ......................................................................
Patch Set 4: (3 comments) http://gerrit.ovirt.org/#/c/34987/4/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/ImportValidator.java File backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/ImportValidator.java: Line 151: if (params.getCopyCollapse()) { Line 152: return sdValidator.allDomainsHaveSpaceForClonedDisks(diskImages); Line 153: } Line 154: Line 155: result = sdValidator.allDomainsHaveSpaceForDisksWithSnapshots(diskImages); At this point I would just return allDomainsHaveSpaceForDisksWithSnapshots. Line 156: if (!result.isValid()) { Line 157: return result; Line 158: } Line 159: http://gerrit.ovirt.org/#/c/34987/4/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVMFromConfigurationCommandTest.java File backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVMFromConfigurationCommandTest.java: Line 134: storageDomain.setStatus(StorageDomainStatus.Inactive); Line 135: Line 136: // Mock Storage Domain. Line 137: final StorageDomainDAO dao = mock(StorageDomainDAO.class); Line 138: when(validator.validateUnregisteredEntity(any(IVdcQueryable.class), any(OvfEntityData.class), any(List.class))).thenReturn(new ValidationResult(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_STATUS_ILLEGAL2)); s/any(List.class)/anyList() Line 139: when(dao.getForStoragePool(storageDomainId, storagePoolId)).thenReturn(storageDomain); Line 140: Line 141: CanDoActionTestUtils.runAndAssertCanDoActionFailure(cmd, Line 142: VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_STATUS_ILLEGAL2); Line 153: OvfEntityData ovfEntity = getOvfEntityData(); Line 154: ovfEntity.setOvfData("This is not a valid XML"); Line 155: initCommand(ovfEntity); Line 156: when(unregisteredOVFDataDao.getByEntityIdAndStorageDomain(vmId, storageDomainId)).thenReturn(ovfEntity); Line 157: when(validator.validateUnregisteredEntity(any(IVdcQueryable.class), any(OvfEntityData.class), any(List.class))).thenReturn(new ValidationResult(VdcBllMessages.ACTION_TYPE_FAILED_OVF_CONFIGURATION_NOT_SUPPORTED)); s/any(List.class)/anyList() Line 158: CanDoActionTestUtils.runAndAssertCanDoActionFailure(cmd, Line 159: VdcBllMessages.ACTION_TYPE_FAILED_OVF_CONFIGURATION_NOT_SUPPORTED); Line 160: } Line 161: -- To view, visit http://gerrit.ovirt.org/34987 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7fa61e7f493d196acdb40bfe461665d6668c6508 Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <aha...@redhat.com> Gerrit-Reviewer: Allon Mureinik <amure...@redhat.com> Gerrit-Reviewer: Liron Aravot <lara...@redhat.com> Gerrit-Reviewer: Omer Frenkel <ofren...@redhat.com> Gerrit-Reviewer: Vered Volansky <vvola...@redhat.com> Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
