Tal Nisan has uploaded a new change for review. Change subject: webadmin: Allow changing a VM disk alias when the VM is not down ......................................................................
webadmin: Allow changing a VM disk alias when the VM is not down Change-Id: I4c5bd598986b7bdbc96893948dd22592c4c05908 Signed-off-by: Tal Nisan <tni...@redhat.com> Bug-url: https://bugzilla.redhat.com/849611 --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/EditDiskModel.java 2 files changed, 3 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/58/24058/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java index 1d94e42..7c28cc2 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java @@ -135,7 +135,7 @@ if (!vmsDiskOrSnapshotPluggedTo.isEmpty()) { // only virtual drive size can be updated when VMs is running - if (isAtLeastOneVmIsNotDown(vmsDiskOrSnapshotPluggedTo) && shouldUpdatePropertiesOtherThanSize()) { + if (isAtLeastOneVmIsNotDown(vmsDiskOrSnapshotPluggedTo) && shouldUpdatePropertiesOtherThanSizeAndAlias()) { return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_IS_NOT_DOWN); } @@ -523,7 +523,7 @@ vmDeviceForVm.getSnapshotId() == null && getNewDisk().getSize() != getOldDisk().getSize(); } - private boolean shouldUpdatePropertiesOtherThanSize() { + private boolean shouldUpdatePropertiesOtherThanSizeAndAlias() { return shouldUpdateDiskProperties() || shouldUpdateImageProperties(); } @@ -534,8 +534,7 @@ getOldDisk().isWipeAfterDelete() != getNewDisk().isWipeAfterDelete() || getOldDisk().isShareable() != getNewDisk().isShareable() || getOldDisk().getSgio() != getNewDisk().getSgio() || - !StringUtils.equals(getOldDisk().getDiskDescription(), getNewDisk().getDiskDescription()) || - !StringUtils.equals(getOldDisk().getDiskAlias(), getNewDisk().getDiskAlias()); + !StringUtils.equals(getOldDisk().getDiskDescription(), getNewDisk().getDiskDescription()); } private boolean shouldUpdateImageProperties() { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/EditDiskModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/EditDiskModel.java index e2ba125..0054cf4 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/EditDiskModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/EditDiskModel.java @@ -146,7 +146,6 @@ if (!isEditEnabled()) { getDescription().setIsChangable(false); - getAlias().setIsChangable(false); getIsShareable().setIsChangable(false); getIsBootable().setIsChangable(false); getIsWipeAfterDelete().setIsChangable(false); -- To view, visit http://gerrit.ovirt.org/24058 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c5bd598986b7bdbc96893948dd22592c4c05908 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <tni...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
