Tal Nisan has uploaded a new change for review. Change subject: webadmin: Allow alignment scan on multiple disks of the same VM ......................................................................
webadmin: Allow alignment scan on multiple disks of the same VM Change-Id: I6a430fc790979b7d6237511dd4c7adbffb1ab9eb Signed-off-by: Tal Nisan <[email protected]> Bug-url: https://bugzilla.redhat.com/1006439 --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java 1 file changed, 14 insertions(+), 51 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/47/24047/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java index f8f960b..b761acf 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java @@ -191,22 +191,6 @@ } } - private boolean isScanAlignmentEnabled; - - public boolean getIsScanAlignmentEnabled() - { - return isScanAlignmentEnabled; - } - - private void setIsScanAlignmentEnabled(boolean value) - { - if (isScanAlignmentEnabled != value) - { - isScanAlignmentEnabled = value; - onPropertyChanged(new PropertyChangedEventArgs("IsScanAlignmentEnabled")); //$NON-NLS-1$ - } - } - public boolean isExtendImageSizeEnabled() { return (getEntity() != null) ? VdcActionUtils.canExecute(Arrays.asList(getEntity()), VM.class, VdcActionType.ExtendImageSize) : false; @@ -575,9 +559,7 @@ getMoveCommand().setIsExecutionAllowed(atLeastOneDiskSelected() && (isMoveCommandAvailable() || isLiveMoveCommandAvailable())); - updateGetAlignmentCommandAvailability(); - - updateScanAlignmentEnabled(); + updateScanAlignmentCommandAvailability(); getPlugCommand().setIsExecutionAllowed(isPlugCommandAvailable(true)); @@ -701,33 +683,23 @@ return true; } - private void updateGetAlignmentCommandAvailability() { - getScanAlignmentCommand().setIsExecutionAllowed(false); + private void updateScanAlignmentCommandAvailability() { + boolean isExecutionAllowed = true; + if (getSelectedItems() != null && getEntity() != null) { + ArrayList<Disk> disks = Linq.<Disk> cast(getSelectedItems()); + for (Disk disk : disks) { - if (!getIsScanAlignmentEnabled()) { - return; - } - - if (getSelectedItems() == null || getSelectedItems().size() != 1) { - return; // leave the command disabled - } - - ArrayList<Disk> disks = - getSelectedItems() != null ? Linq.<Disk> cast(getSelectedItems()) : new ArrayList<Disk>(); - - for (Disk disk : disks) - { - if (!isImageDiskOK(disk)) { - return; // leave the command disabled + if (!(disk instanceof LunDisk) && !isDiskOnBlockDevice(disk)) { + isExecutionAllowed = false; + break; + } } } - - final VM vm = getEntity(); - if (vm == null) { - return; // leave the command disabled + else { + isExecutionAllowed = false; } - - getScanAlignmentCommand().setIsExecutionAllowed(true); + getScanAlignmentCommand().setIsExecutionAllowed(isExecutionAllowed); + //onPropertyChanged(new PropertyChangedEventArgs("IsScanAlignmentEnabled")); //$NON-NLS-1$ } @Override @@ -815,15 +787,6 @@ dcCompatibilityVersion); } }), vm.getStoragePoolId()); - } - - private void updateScanAlignmentEnabled() { - if (getSelectedItem() == null) { - setIsScanAlignmentEnabled(false); - return; - } - - setIsScanAlignmentEnabled((getSelectedItem() instanceof LunDisk || isDiskOnBlockDevice((Disk) getSelectedItem()))); } private boolean isDiskOnBlockDevice(Disk disk) { -- To view, visit http://gerrit.ovirt.org/24047 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6a430fc790979b7d6237511dd4c7adbffb1ab9eb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
