Daniel Erez has posted comments on this change. Change subject: core,webadmin: Move storage type checks to domain instead of pool ......................................................................
Patch Set 4: (6 comments) http://gerrit.ovirt.org/#/c/23294/4/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommand.java File backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommand.java: Line 112: !validate(diskImagesValidator.diskImagesNotIllegal())) { Line 113: return false; Line 114: } Line 115: Line 116: StorageDomainStatic sds = getStorageDomainStaticDAO().get(((DiskImage)getDisk()).getStorageIds().get(0)); formatter Line 117: if (!sds.getStorageType().isBlockDomain()) { Line 118: return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_ALIGNMENT_SCAN_STORAGE_TYPE); Line 119: } Line 120: } Line 113: return false; Line 114: } Line 115: Line 116: StorageDomainStatic sds = getStorageDomainStaticDAO().get(((DiskImage)getDisk()).getStorageIds().get(0)); Line 117: if (!sds.getStorageType().isBlockDomain()) { consider extracting to DiskImagesValidator Line 118: return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_ALIGNMENT_SCAN_STORAGE_TYPE); Line 119: } Line 120: } Line 121: http://gerrit.ovirt.org/#/c/23294/4/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java File backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java: Line 735: params.setEntityInfo(new EntityInfo(VdcObjectType.VM, getVm().getId())); Line 736: params.setParentParameters(getParameters()); Line 737: Line 738: StorageDomainStatic storageDomain = getStorageDomainStaticDAO().get(storageId); Line 739: if (storageDomain != null && storageDomain.getStorageType().isBlockDomain()) { is it possible for storageDomain to be null here? Line 740: params.setUseCopyCollapse(true); Line 741: params.setVolumeType(VolumeType.Preallocated); Line 742: params.setVolumeFormat(VolumeFormat.RAW); Line 743: } http://gerrit.ovirt.org/#/c/23294/4/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java File frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java: Line 647: return; Line 648: } Line 649: Line 650: VolumeType volumeType = (VolumeType) getVolumeType().getSelectedItem(); Line 651: StorageType storageType = ((StorageDomain) getStorageDomain().getSelectedItem()).getStorageType(); please check getStorageDomain().getSelectedItem() for nullity - iirc, can be null in case storage domain is in maintenance. Line 652: Line 653: updateVolumeFormat(volumeType, storageType); Line 654: updateShareable(volumeType, storageType); Line 655: } Line 722: } Line 723: } Line 724: Line 725: private void storageDomain_SelectedItemChanged() { Line 726: if (getStorageDomain().getSelectedItem() != null) { extract getStorageDomain().getSelectedItem() to a variable Line 727: updateVolumeType(((StorageDomain)getStorageDomain().getSelectedItem()).getStorageType()); Line 728: } Line 729: updateQuota((StoragePool) getDataCenter().getSelectedItem()); Line 730: } Line 723: } Line 724: Line 725: private void storageDomain_SelectedItemChanged() { Line 726: if (getStorageDomain().getSelectedItem() != null) { Line 727: updateVolumeType(((StorageDomain)getStorageDomain().getSelectedItem()).getStorageType()); formatter Line 728: } Line 729: updateQuota((StoragePool) getDataCenter().getSelectedItem()); Line 730: } Line 731: -- To view, visit http://gerrit.ovirt.org/23294 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3db80f1749d93444e9cdac8038859b7d0865f6e5 Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <[email protected]> Gerrit-Reviewer: Allon Mureinik <[email protected]> Gerrit-Reviewer: Ayal Baron <[email protected]> Gerrit-Reviewer: Daniel Erez <[email protected]> Gerrit-Reviewer: Federico Simoncelli <[email protected]> Gerrit-Reviewer: Liron Ar <[email protected]> Gerrit-Reviewer: Maor Lipchuk <[email protected]> Gerrit-Reviewer: Sergey Gotliv <[email protected]> Gerrit-Reviewer: Tal Nisan <[email protected]> Gerrit-Reviewer: Vered Volansky <[email protected]> Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
