Arik Hadas has uploaded a new change for review. Change subject: webadmin: remove volume format from disk model ......................................................................
webadmin: remove volume format from disk model Remove volume format from AbstractDiskModel. Currently the user can't set it explicitly and it is set according to the volume type. So there is no reason to store it in the model, but to compute it when needed according to the selected volume type. Change-Id: Id4a538d8adb2622caf4679a37318ada5933d8146 Signed-off-by: Arik Hadas <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/EditDiskModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewDiskModel.java 3 files changed, 1 insertion(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/75/38375/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java index a519869..d2a9efd 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java @@ -75,7 +75,6 @@ private ListModel<StoragePool> dataCenter; private SanStorageModel sanStorageModel; - private VolumeFormat volumeFormat; private boolean previousIsQuotaAvailable; private SystemTreeItemModel systemTreeSelectedItem; @@ -174,14 +173,6 @@ public void setSanStorageModel(SanStorageModel sanStorageModel) { this.sanStorageModel = sanStorageModel; - } - - public VolumeFormat getVolumeFormat() { - return volumeFormat; - } - - public void setVolumeFormat(VolumeFormat volumeFormat) { - this.volumeFormat = volumeFormat; } public SystemTreeItemModel getSystemTreeSelectedItem() { @@ -477,10 +468,6 @@ } } - private void updateVolumeFormat(VolumeType volumeType, StorageType storageType) { - setVolumeFormat(AsyncDataProvider.getInstance().getDiskVolumeFormat(volumeType, storageType)); - } - public void updateInterface(final Version clusterVersion) { if (getVm() != null) { AsyncDataProvider.getInstance().isVirtioScsiEnabledForVm(new AsyncQuery(this, new INewAsyncCallback() { @@ -643,7 +630,6 @@ VolumeType volumeType = getVolumeType().getSelectedItem(); StorageType storageType = getStorageDomain().getSelectedItem().getStorageType(); - updateVolumeFormat(volumeType, storageType); updateShareable(volumeType, storageType); } 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 1f16761..5060bd3 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 @@ -48,7 +48,6 @@ getDiskStorageType().setEntity(DiskStorageType.IMAGE); getSize().setEntity((int) diskImage.getSizeInGigabytes()); getVolumeType().setSelectedItem(diskImage.getVolumeType()); - setVolumeFormat(diskImage.getVolumeFormat()); boolean isExtendImageSizeEnabled = getVm() != null && !diskImage.isDiskSnapshot() && VdcActionUtils.canExecute(Arrays.asList(getVm()), VM.class, VdcActionType.ExtendImageSize); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewDiskModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewDiskModel.java index 04b2b74..3a12733 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewDiskModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewDiskModel.java @@ -149,7 +149,7 @@ DiskImage diskImage = (DiskImage) getDisk(); diskImage.setSizeInGigabytes(getSize().getEntity()); diskImage.setVolumeType(getVolumeType().getSelectedItem()); - diskImage.setvolumeFormat(getVolumeFormat()); + diskImage.setvolumeFormat(AsyncDataProvider.getInstance().getDiskVolumeFormat(diskImage.getVolumeType(), getStorageDomain().getSelectedItem().getStorageType())); } else { LunDisk lunDisk = (LunDisk) getDisk(); -- To view, visit https://gerrit.ovirt.org/38375 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id4a538d8adb2622caf4679a37318ada5933d8146 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
